diff --git a/.bazelrc b/.bazelrc index cda867ff953d5..bc969bf61589b 100644 --- a/.bazelrc +++ b/.bazelrc @@ -18,14 +18,21 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" +build --features=external_include_paths + +build --per_file_copt=grpc+//@-Wno-private-header +build --copt=-Wno-private-header +build --cxxopt=-Wno-private-header +build --host_copt=-Wno-private-header +build --host_cxxopt=-Wno-private-header + +# The project requires C++ >= 17. +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 +# Protobuf and gRPC require C++17 to compile the "host" # targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -47,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):).)*$' @@ -70,6 +74,8 @@ build:sanitizer --strip=never build:sanitizer --copt=-Og build:sanitizer --copt=-g build:sanitizer --copt=-fno-omit-frame-pointer +#build:sanitizer --features=external_include_paths + # --config asan: Address Sanitizer build:asan --config=sanitizer @@ -102,6 +108,8 @@ build:ubsan --copt=-DCURL_STRICTER build:ubsan --linkopt=-fsanitize=undefined build:ubsan --linkopt=-fsanitize-link-c++-runtime build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1 +#build:ubsan --features=external_include_paths + # --config xsan: Runs misc. sanitizers that aren't covered elsewhere. build:xsan --config=sanitizer diff --git a/.bazelversion b/.bazelversion index e8be68404bcb3..e7fdef7e2e635 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.6.1 +8.4.2 diff --git a/.clang-tidy b/.clang-tidy index 9dd40ccb9bb1f..2a8ade0ec8e20 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -85,6 +85,7 @@ Checks: > performance-*, portability-*, readability-*, + -bugprone-exception-escape, -google-readability-braces-around-statements, -google-readability-namespace-comments, -google-runtime-references, diff --git a/.github/workflows/macos-cmake.yml b/.github/workflows/macos-cmake.yml index a0507155c37dd..265a4b4de208b 100644 --- a/.github/workflows/macos-cmake.yml +++ b/.github/workflows/macos-cmake.yml @@ -70,7 +70,7 @@ jobs: - uses: actions/setup-python@v5 id: py311 with: - python-version: '3.11' + python-version: '3.13' - uses: google-github-actions/setup-gcloud@v2 env: CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }} @@ -84,8 +84,6 @@ jobs: spanner ) core2_features=( - pubsub - pubsublite storage storage_grpc ) diff --git a/.github/workflows/windows-cmake.yml b/.github/workflows/windows-cmake.yml index 9edfda6ef5b5b..e4df0d5868dcd 100644 --- a/.github/workflows/windows-cmake.yml +++ b/.github/workflows/windows-cmake.yml @@ -76,7 +76,7 @@ jobs: - uses: actions/setup-python@v5 id: py311 with: - python-version: '3.11' + python-version: '3.13' - uses: google-github-actions/setup-gcloud@v2 env: CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }} diff --git a/BUILD.bazel b/BUILD.bazel index c7142d44ec3ff..69b20b3e9e1d8 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -254,8 +254,3 @@ cc_library( "//google/cloud:google_cloud_cpp_universe_domain", ], ) - -bool_flag( - name = "enable_opentelemetry", - build_setting_default = False, -) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76da31633d948..5c43724d12628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**NOTE**: Please refer to the [V3 Migration Guide](/doc/v3-migration-guide.md) +for details on updating existing applications using v1.x.y or v2.x.y. + **NOTE**: [Future Breaking Changes](/doc/deprecated.md) lists anticipated breaking changes in the upcoming 3.x release. This release is scheduled for 2024-12 or 2025-01. diff --git a/CMakeLists.txt b/CMakeLists.txt index 6126eba9b3097..156cf8a2ef011 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,16 +14,16 @@ # limitations under the License. # ~~~ -cmake_minimum_required(VERSION 3.13...3.24) +cmake_minimum_required(VERSION 3.16...3.31) # Define the project name and where to report bugs. set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues") project( google-cloud-cpp - VERSION 2.46.0 + VERSION 3.0.0 LANGUAGES CXX) -set(PROJECT_VERSION_PRE_RELEASE "rc") +set(PROJECT_VERSION_PRE_RELEASE "rc1") if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "") set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}") diff --git a/MODULE.bazel b/MODULE.bazel index 88bc2ee6a2b7d..e035aece942be 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -16,35 +16,40 @@ module( name = "google_cloud_cpp", - version = "2.46.0-rc", # Updated by CMake - compatibility_level = 2, # Updated by CMake + version = "3.0.0-rc1", # Updated by CMake + compatibility_level = 3, # Updated by CMake ) bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "bazel_skylib", version = "1.8.2") -bazel_dep(name = "rules_cc", version = "0.1.4") -bazel_dep(name = "abseil-cpp", version = "20240722.1", repo_name = "com_google_absl") -bazel_dep(name = "protobuf", version = "29.4", repo_name = "com_google_protobuf") -bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014") -bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc") -bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json") -bazel_dep(name = "curl", version = "8.8.0.bcr.3", repo_name = "com_github_curl_curl") -bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c") -bazel_dep(name = "opentelemetry-cpp", version = "1.19.0", repo_name = "io_opentelemetry_cpp") +bazel_dep(name = "rules_cc", version = "0.2.14") +bazel_dep(name = "abseil-cpp", version = "20250814.1") + +# For backwards compatibility with WORKSPACE. +# The name "com_google_protobuf" is internally used by @bazel_tools, +# a native repository we cannot override. +# See https://github.com/googleapis/google-cloud-cpp/issues/15393 +bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf") +bazel_dep(name = "boringssl", version = "0.20241024.0") +bazel_dep(name = "nlohmann_json", version = "3.11.3") +bazel_dep(name = "curl", version = "8.8.0.bcr.3") +bazel_dep(name = "crc32c", version = "1.1.0") +bazel_dep(name = "opentelemetry-cpp", version = "1.22.0") bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_python", version = "1.6.3") +bazel_dep(name = "rules_apple", version = "4.3.2") +bazel_dep(name = "googletest", version = "1.17.0") -bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True, repo_name = "com_google_googletest") -bazel_dep(name = "google_benchmark", version = "1.9.2", dev_dependency = True, repo_name = "com_google_benchmark") +bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_google_benchmark") bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp") bazel_dep(name = "pugixml", version = "1.15", dev_dependency = True, repo_name = "com_github_zeux_pugixml") # Our `curl.BUILD` file uses these. bazel_dep(name = "zlib", version = "1.3.1.bcr.7") -bazel_dep(name = "c-ares", version = "1.19.1.bcr.1", repo_name = "com_github_cares_cares") +bazel_dep(name = "c-ares", version = "1.34.5.bcr.2", repo_name = "com_github_cares_cares") # Pin this to fix a break in bazel/deps-cache.py -bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate") +bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.2", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate") python = use_extension("@rules_python//python/extensions:python.bzl", "python") python.toolchain( @@ -52,21 +57,7 @@ python.toolchain( python_version = "3.11", ) -bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis") -archive_override( - module_name = "googleapis", - integrity = "sha256-p8PXzb1U5D3cfETzVxpx4ATLpRnCBdoui5N0gNYIroY=", - patch_strip = 1, - patches = ["//bazel:googleapis.modules.patch"], - strip_prefix = "googleapis-05f65958eb7f2a8bc59db87ad40487f0fb093097", - urls = [ - "https://github.com/googleapis/googleapis/archive/05f65958eb7f2a8bc59db87ad40487f0fb093097.tar.gz", - ], -) - -switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") -switched_rules.use_languages( - cc = True, - grpc = True, -) -use_repo(switched_rules, "com_google_googleapis_imports") +bazel_dep(name = "grpc", version = "1.76.0.bcr.1") +bazel_dep(name = "googleapis", version = "0.0.0-20251211-05f65958") +bazel_dep(name = "googleapis-cc", version = "1.0.0") +bazel_dep(name = "googleapis-grpc-cc", version = "1.0.0") diff --git a/README.md b/README.md index 9914634f5fcb0..a4803943add63 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ This repository contains idiomatic C++ client libraries for the following [Google Cloud Platform](https://cloud.google.com/) services. +> Please refer to the [V3 Migration Guide](/doc/v3-migration-guide.md) for +> details on updating existing applications using v1.x.y or v2.x.y. + > Please check the [CHANGELOG] for important announcements and upcoming changes. ## Quickstart diff --git a/bazel/gapic.bzl b/bazel/gapic.bzl index ef02cb7d259d6..e78adf9ce5cc7 100644 --- a/bazel/gapic.bzl +++ b/bazel/gapic.bzl @@ -38,23 +38,23 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d native.filegroup( name = "srcs", - srcs = native.glob(sources_glob), + srcs = native.glob(sources_glob, allow_empty = True), ) native.filegroup( name = "hdrs", - srcs = native.glob(include = code_glob, exclude = sources_glob), + srcs = native.glob(include = code_glob, exclude = sources_glob, allow_empty = True), ) native.filegroup( name = "public_hdrs", - srcs = native.glob([d + "*.h" for d in service_dirs]), + srcs = native.glob([d + "*.h" for d in service_dirs], allow_empty = True), visibility = ["//:__pkg__"], ) native.filegroup( name = "mocks", - srcs = native.glob([d + "mocks/*.h" for d in service_dirs]), + srcs = native.glob([d + "mocks/*.h" for d in service_dirs], allow_empty = True), visibility = ["//:__pkg__"], ) @@ -72,7 +72,7 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d visibility = ["//:__pkg__"], deps = [ ":google_cloud_cpp_" + name, - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -85,4 +85,4 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d "//:universe_domain", "//google/cloud/testing_util:google_cloud_cpp_testing_private", ], - ) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs])] + ) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs], allow_empty = True)] diff --git a/bazel/googleapis.modules.patch b/bazel/googleapis.modules.patch deleted file mode 100644 index 51f110379f4a5..0000000000000 --- a/bazel/googleapis.modules.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/BUILD.bazel b/BUILD.bazel -index 026553f5c7..f3c6b6925c 100644 ---- a/BUILD.bazel -+++ b/BUILD.bazel -@@ -1,11 +1,13 @@ -+package(default_visibility = ["//visibility:public"]) -+ -+licenses(["notice"]) # Apache 2.0 -+ - genrule( -- name = "build_gen", -- srcs = glob( -- ["run_build_gen.sh"], -- allow_empty = True, -- ), -- outs = ["build_gen.sh"], -- cmd = """ -+ name = "build_gen", -+ outs = ["build_gen.sh"], -+ executable = True, -+ srcs = glob(["run_build_gen.sh"], allow_empty=True), -+ cmd = """ - if test -z \"$(SRCS)\"; then - cat < $@ - #!/bin/sh -@@ -17,5 +19,17 @@ EOD - cp $(SRCS) $@ - fi - """, -- executable = True, - ) -+ -+# This build file overlays on top of the BUILD files for the googleapis repo, -+# and it adds a target that lets us include their header files using -+# angle-brackets, thus treating their headers as system includes. This allows -+# us to dial-up the warnings in our own code, without seeing compiler warnings -+# from their headers, which we do not own. -+cc_library( -+ name = "googleapis_system_includes", -+ includes = [ -+ ".", -+ ], -+) -+ -diff --git a/MODULE.bazel b/MODULE.bazel -new file mode 100644 -index 000000000..169133e43 ---- /dev/null -+++ b/MODULE.bazel -@@ -0,0 +1,14 @@ -+module( -+ name = "googleapis", -+ version = "0.0.0-20240326-1c8d509c5", -+ repo_name = "com_google_googleapis", -+) -+ -+bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc") -+bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") -+bazel_dep(name = "rules_proto", version = "5.3.0-21.7") -+ -+switched_rules = use_extension("//:extensions.bzl", "switched_rules") -+ -+switched_rules.use_languages() -+use_repo(switched_rules, "com_google_googleapis_imports") -diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod -new file mode 100644 -index 000000000..8cf3fe396 ---- /dev/null -+++ b/WORKSPACE.bzlmod -@@ -0,0 +1,2 @@ -+workspace(name = "com_google_googleapis") -+ -diff --git a/extensions.bzl b/extensions.bzl -new file mode 100644 -index 000000000..9aa161841 ---- /dev/null -+++ b/extensions.bzl -@@ -0,0 +1,59 @@ -+load(":repository_rules.bzl", "switched_rules_by_language") -+ -+_use_languages_tag = tag_class( -+ attrs = { -+ "cc": attr.bool(default = False), -+ "csharp": attr.bool(default = False), -+ "gapic": attr.bool(default = False), -+ "go": attr.bool(default = False), -+ "go_test": attr.bool(default = False), -+ "grpc": attr.bool(default = False), -+ "java": attr.bool(default = False), -+ "nodejs": attr.bool(default = False), -+ "php": attr.bool(default = False), -+ "python": attr.bool(default = False), -+ "ruby": attr.bool(default = False), -+ }, -+) -+ -+def _switched_rules_impl(ctx): -+ attrs = {} -+ for module in ctx.modules: -+ if not module.is_root: -+ continue -+ -+ is_tag_set = False -+ set_tag_name = "" -+ -+ for t in module.tags.use_languages: -+ if is_tag_set: -+ fail("Multiple use_language tags are set in the root module: '{}' and '{}'. Only one is allowed.".format(set_tag_name, module.name)) -+ -+ is_tag_set = True -+ set_tag_name = module.name -+ -+ attrs = { -+ "cc": t.cc, -+ "csharp": t.csharp, -+ "gapic": t.gapic, -+ "go": t.go, -+ "go_test": t.go_test, -+ "grpc": t.grpc, -+ "java": t.java, -+ "nodejs": t.nodejs, -+ "php": t.php, -+ "python": t.python, -+ "ruby": t.ruby, -+ } -+ -+ switched_rules_by_language( -+ name = "com_google_googleapis_imports", -+ **attrs -+ ) -+ -+switched_rules = module_extension( -+ implementation = _switched_rules_impl, -+ tag_classes = { -+ "use_languages": _use_languages_tag, -+ }, -+) diff --git a/bazel/googleapis.workspace.patch b/bazel/googleapis.workspace.patch new file mode 100644 index 0000000000000..d86dce95b3251 --- /dev/null +++ b/bazel/googleapis.workspace.patch @@ -0,0 +1,13 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 95e4c12e5..83838d3f0 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -2,7 +2,7 @@ genrule( + name = "build_gen", + outs = ["build_gen.sh"], + executable = True, +- srcs = glob(["run_build_gen.sh"]), ++ srcs = glob(["run_build_gen.sh"], allow_empty=True), + cmd = """ + if test -z \"$(SRCS)\"; then + cat < $@ diff --git a/bazel/remove_upb_c_rules.patch b/bazel/remove_upb_c_rules.patch new file mode 100644 index 0000000000000..43b077224c29d --- /dev/null +++ b/bazel/remove_upb_c_rules.patch @@ -0,0 +1,124 @@ +diff --git google/api/expr/v1alpha1/BUILD.bazel google/api/expr/v1alpha1/BUILD.bazel +index 9bed46809..197e5249c 100644 +--- google/api/expr/v1alpha1/BUILD.bazel ++++ google/api/expr/v1alpha1/BUILD.bazel +@@ -233,32 +233,32 @@ cc_proto_library( + ############################################################################## + # upb + ############################################################################## +-load( +- "@com_google_googleapis_imports//:imports.bzl", +- "upb_c_proto_library", +-) +- +-upb_c_proto_library( +- name = "checked_upb_proto", +- deps = [":checked_proto"], +-) +- +-upb_c_proto_library( +- name = "eval_upb_proto", +- deps = [":eval_proto"], +-) +- +-upb_c_proto_library( +- name = "explain_upb_proto", +- deps = [":explain_proto"], +-) +- +-upb_c_proto_library( +- name = "syntax_upb_proto", +- deps = [":syntax_proto"], +-) +- +-upb_c_proto_library( +- name = "value_upb_proto", +- deps = [":value_proto"], +-) ++#load( ++ #"@com_google_googleapis_imports//:imports.bzl", ++ #"upb_c_proto_library", ++#) ++# ++#upb_c_proto_library( ++ #name = "checked_upb_proto", ++ #deps = [":checked_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "eval_upb_proto", ++ #deps = [":eval_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "explain_upb_proto", ++ #deps = [":explain_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "syntax_upb_proto", ++ #deps = [":syntax_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "value_upb_proto", ++ #deps = [":value_proto"], ++#) +diff --git google/rpc/BUILD.bazel google/rpc/BUILD.bazel +index 31fd6457d..c38f00c46 100644 +--- google/rpc/BUILD.bazel ++++ google/rpc/BUILD.bazel +@@ -11,7 +11,7 @@ load( + "php_proto_library", + "py_gapic_assembly_pkg", + "py_proto_library", +- "upb_c_proto_library", ++ #"upb_c_proto_library", + ) + load("@rules_proto//proto:defs.bzl", "proto_library") + +@@ -104,15 +104,15 @@ cc_proto_library( + deps = [":status_proto"], + ) + +-upb_c_proto_library( +- name = "code_upb_proto", +- deps = [":code_proto"], +-) ++#upb_c_proto_library( ++ #name = "code_upb_proto", ++ #deps = [":code_proto"], ++#) + +-upb_c_proto_library( +- name = "status_upb_proto", +- deps = [":status_proto"], +-) ++#upb_c_proto_library( ++ #name = "status_upb_proto", ++ #deps = [":status_proto"], ++#) + + py_proto_library( + name = "code_py_proto", +diff --git repository_rules.bzl repository_rules.bzl +index 2f87ad682..2ab3bd054 100644 +--- repository_rules.bzl ++++ repository_rules.bzl +@@ -224,11 +224,11 @@ def switched_rules_by_language( + # + # upb + # +- rules["upb_c_proto_library"] = _switch( +- upb, +- "@com_google_protobuf//bazel:upb_c_proto_library.bzl", +- "upb_c_proto_library", +- ) ++ #rules["upb_c_proto_library"] = _switch( ++ # upb, ++ # "@com_google_protobuf//bazel:upb_c_proto_library.bzl", ++ # "upb_c_proto_library", ++ #) + + # + # PHP diff --git a/bazel/workspace0.bzl b/bazel/workspace0.bzl index 6cc3d14608504..fac199676a56c 100644 --- a/bazel/workspace0.bzl +++ b/bazel/workspace0.bzl @@ -77,6 +77,16 @@ def gl_cpp_workspace0(name = None): strip_prefix = "rules_cc-0.1.4", ) + maybe( + http_archive, + name = "com_envoyproxy_protoc_gen_validate", + urls = [ + "https://github.com/bufbuild/protoc-gen-validate/archive/v1.2.1.tar.gz", + ], + strip_prefix = "protoc-gen-validate-1.2.1", + integrity = "sha256-5HGDUnVN8Tk7h5K2MTOKqFYvOQ6BYHg+NlRUvBHZYyg=", + ) + # protobuf requires this maybe( http_archive, @@ -101,19 +111,19 @@ def gl_cpp_workspace0(name = None): # Load Abseil maybe( http_archive, - name = "com_google_absl", + name = "abseil-cpp", urls = [ - "https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20250512.1.tar.gz", ], - sha256 = "b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811", - strip_prefix = "abseil-cpp-20250127.1", + sha256 = "9b7a064305e9fd94d124ffa6cc358592eb42b5da588fb4e07d09254aa40086db", + strip_prefix = "abseil-cpp-20250512.1", ) # Load a version of googletest that we know works. This is needed to create # //:.*mocks targets, which are public. maybe( http_archive, - name = "com_google_googletest", + name = "googletest", urls = [ "https://github.com/google/googletest/archive/v1.16.0.tar.gz", ], @@ -124,7 +134,7 @@ def gl_cpp_workspace0(name = None): # Load the googleapis dependency. maybe( http_archive, - name = "com_google_googleapis", + name = "googleapis", urls = [ "https://github.com/googleapis/googleapis/archive/05f65958eb7f2a8bc59db87ad40487f0fb093097.tar.gz", ], @@ -132,24 +142,39 @@ def gl_cpp_workspace0(name = None): strip_prefix = "googleapis-05f65958eb7f2a8bc59db87ad40487f0fb093097", build_file = Label("//bazel:googleapis.BUILD"), # Scaffolding for patching googleapis after download. For example: - # patches = ["googleapis.patch"] - # NOTE: This should only be used while developing with a new - # protobuf message. No changes to `patches` should ever be - # committed to the main branch. + patches = [ + + # NOTE: This should only be used while developing with a new + # protobuf message. No changes to `patches` should ever be + # committed to the main branch. + #"googleapis.patch", + + # Mirrors the patch from the current bazel module + "//bazel:remove_upb_c_rules.patch", + ], patch_tool = "patch", - patch_args = ["-p1"], - patches = [], + + # Use the following args when developing with a new proto message + # patch_args = ["-p1", "-l", "-n"], + repo_mapping = { + "@com_github_grpc_grpc": "@grpc", + }, ) # Load protobuf. + # The name "com_google_protobuf" is internally used by @bazel_tools, + # a native repository we cannot override. + # We will revert this to @protobuf once @bazel_tools is deprecated + # and libraries have strayed away from it. + # See https://github.com/googleapis/google-cloud-cpp/issues/15393 maybe( http_archive, name = "com_google_protobuf", urls = [ - "https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz", ], - sha256 = "6bd9dcc91b17ef25c26adf86db71c67ec02431dc92e9589eaf82e22889230496", - strip_prefix = "protobuf-29.4", + sha256 = "c3a0a9ece8932e31c3b736e2db18b1c42e7070cd9b881388b26d01aa71e24ca2", + strip_prefix = "protobuf-31.1", ) # Load BoringSSL. This could be automatically loaded by gRPC. But as of @@ -167,45 +192,65 @@ def gl_cpp_workspace0(name = None): strip_prefix = "boringssl-82a53d8c902f940eb1310f76a0b96c40c67f632f", ) + # This is a transitive dependency of grpc + maybe( + http_archive, + name = "io_bazel_rules_go", + sha256 = "d93ef02f1e72c82d8bb3d5169519b36167b33cf68c252525e3b9d3d5dd143de7", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip", + ], + patch_args = ["-p1"], + ) + # Load gRPC and its dependencies, using a similar pattern to this function. maybe( http_archive, - name = "com_github_grpc_grpc", + name = "grpc", urls = [ - "https://github.com/grpc/grpc/archive/v1.69.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.74.1.tar.gz", ], - sha256 = "cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc", - strip_prefix = "grpc-1.69.0", + repo_mapping = { + "@com_google_absl": "@abseil-cpp", + "@com_github_grpc_grpc": "@grpc", + }, + sha256 = "7bf97c11cf3808d650a3a025bbf9c5f922c844a590826285067765dfd055d228", + strip_prefix = "grpc-1.74.1", + ) + + native.bind( + name = "protocol_compiler", + actual = "@com_google_protobuf//:protoc", ) # We use the cc_proto_library() rule from @com_google_protobuf, which # assumes that grpc_cpp_plugin and grpc_lib are in the //external: module native.bind( name = "grpc_cpp_plugin", - actual = "@com_github_grpc_grpc//src/compiler:grpc_cpp_plugin", + actual = "@grpc//src/compiler:grpc_cpp_plugin", ) native.bind( name = "grpc_lib", - actual = "@com_github_grpc_grpc//:grpc++", + actual = "@grpc//:grpc++", ) # We need libcurl for the Google Cloud Storage client. - maybe( - http_archive, + http_archive( name = "com_github_curl_curl", urls = [ - "https://curl.haxx.se/download/curl-7.69.1.tar.gz", + "https://curl.haxx.se/download/curl-7.74.0.tar.gz", ], - sha256 = "01ae0c123dee45b01bbaef94c0bc00ed2aec89cb2ee0fd598e0d302a6b5e0a98", - strip_prefix = "curl-7.69.1", + sha256 = "e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7", + strip_prefix = "curl-7.74.0", build_file = Label("//bazel:curl.BUILD"), ) # We need the nlohmann_json library maybe( http_archive, - name = "com_github_nlohmann_json", + name = "nlohmann_json", urls = [ "https://github.com/nlohmann/json/archive/v3.11.3.tar.gz", ], @@ -216,7 +261,7 @@ def gl_cpp_workspace0(name = None): # Load google/crc32c, a library to efficiently compute CRC32C checksums. maybe( http_archive, - name = "com_github_google_crc32c", + name = "crc32c", urls = [ "https://github.com/google/crc32c/archive/1.1.2.tar.gz", ], @@ -229,9 +274,8 @@ def gl_cpp_workspace0(name = None): ) # Open Telemetry - maybe( - http_archive, - name = "io_opentelemetry_cpp", + http_archive( + name = "opentelemetry-cpp", urls = [ "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz", ], diff --git a/bazel/workspace2.bzl b/bazel/workspace2.bzl index a155449661177..97c90aab0f01a 100644 --- a/bazel/workspace2.bzl +++ b/bazel/workspace2.bzl @@ -15,11 +15,11 @@ """Load dependencies needed for google-cloud-cpp development / Phase 2.""" load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") -load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") load( - "@com_google_googleapis//:repository_rules.bzl", + "@googleapis//:repository_rules.bzl", "switched_rules_by_language", ) +load("@grpc//bazel:grpc_deps.bzl", "grpc_deps") load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies") def gl_cpp_workspace2(name = None): @@ -38,9 +38,9 @@ def gl_cpp_workspace2(name = None): rules_cc_dependencies() - # Configure @com_google_googleapis to only compile C++ and gRPC libraries. + # Configure @googleapis to only compile C++ and gRPC libraries. switched_rules_by_language( - name = "com_google_googleapis_imports", + name = "googleapis_imports", cc = True, grpc = True, ) diff --git a/bazel/workspace3.bzl b/bazel/workspace3.bzl index 33d2454a4d9b6..38b1fd970d698 100644 --- a/bazel/workspace3.bzl +++ b/bazel/workspace3.bzl @@ -14,10 +14,10 @@ """Load dependencies needed for google-cloud-cpp development / Phase 3.""" -load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") -load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps") load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") -load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps") +load("@googletest//:googletest_deps.bzl", "googletest_deps") +load("@grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") +load("@opentelemetry-cpp//bazel:repository.bzl", "opentelemetry_cpp_deps") def gl_cpp_workspace3(name = None): """Loads dependencies needed to use the google-cloud-cpp libraries. diff --git a/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz index 5c514fe576efa..2ca3928c9c0ab 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz index f0a33fbda5e3f..412f6ba563e3e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz index 053c547d5aeda..ccf558461452b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz index 13ebeeb5d3d1e..d05445b65174a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz index f8f1a8336a618..7848d11cd5936 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz index 39bfbd742b7c6..89290a3591023 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz index 671b5f6b0ee70..849accb6b9905 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz index 54276dc02f5bd..fb91ffc89c275 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz index cd2220de84d18..1c7f152673a2a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz index 396216377db24..0f43dbad71a63 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz index 431546d231639..cbbb74767d90c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz index 741be98a816bc..e53b697cbedef 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz index 2ac58aa904c2c..fe4d3fc94c9a1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz index f9b8bd84df968..9b5ca2e8442a5 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz index 8648d0226ab69..763e3ec4dff40 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz index dba4605676350..6bcb56ba28fd1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz index bc72211397061..1513b7b3bfb18 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz index 3c79c3300ae57..f6d10845a1344 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz index fc6247b293dbf..1eb4b66b115fb 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz index b45dade537f49..adc2002a804f3 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz index 2a8204a1db52a..7f3b818685b39 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz index 079c9e9b6b1a3..c0e982d4e5205 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz index 763c00cddbf17..561bf52b5c72c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz index 43298b747ade3..f5b843a85a74b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz index 2f7115628f1c1..10ae67511971d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz index b28ac655958be..9c612357e4b04 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz index 3a3dd31df2158..572971536cb3e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz index cecc7e7046fc3..34b0018da852e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz index 8223d4244fad1..f247d3515eb0e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz index 245119bd99758..3889fdd432360 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz index 26dc2f1bea3ac..0ceb4f1c700e6 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz index 64f1b33335590..8ef777eadcf44 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz index 4e4ca6f6f6f09..46ba24e3d09ab 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz index a22730e753d4a..1e0685b0b6811 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz index 0f7760159a496..40703b88c3293 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz index 6392db327e5c6..ff61ed228f99f 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz index fd73b4f07e3ac..fe665dd2c5a0a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz index eba2af5ad644a..f16d8c9fd3cf7 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz index 3aa4b401b0bfc..50cbdbf67a953 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz index d3e6d851496a9..9e7cd1fcbaddb 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz index 40aa234b59949..113d7d2e70de1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz index af62381f6c3a2..15c31521f5707 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz index b405a1b4af55c..c575454db6a5b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz index d5beeee9978cb..1d6cc6a75590e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz index 98028d9787c9b..3b915055b3ccd 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz index c27d2a764bf36..b7ebb05f07723 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz index e956fc70191ee..123abef845c70 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz index e8ce0d1e62f84..4dd27167a20bd 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz index 6b771262b7658..36f94f8ece84a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz index da22db656a461..beca8b11fe0d8 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz index 61c6e8895f6e6..bd59123bb1d8d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz index b0c42bfd3f086..7038c87d82379 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz index 7f936125d3544..fd723d583eaaf 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz index 6558b3c0909e4..3b69c4604d405 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz index 3f513340ac33e..144802a788b7b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz index 9dc6ec666e7ba..b3dec228d9a08 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz index d9f0ba81999ac..cb6acd549e241 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz index 44d7164fd30bb..0921396bf3c05 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz index 12b5c04dbea2c..d3730246f10e2 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz index 17653450ca1eb..80873d5ed032e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz index ca09fa8258f87..7cced851fbea1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz index 80cd8203c6b2e..58f9c87287563 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz index e4a3f3ba2f588..2516310f36311 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz index 3e662513dffd9..1f3b2b8180d88 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz index abfc5062c06c1..7143c3dd36535 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz index 4cd6c6f7a0e2e..d5533ff1c7418 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz index 9edf1f4444355..28f5ea7e4f97a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz index 5f60369b3ab53..66633c13a406b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz index d74acd533236c..515914b9194e9 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz index 4c29aaac65b4a..bf073ca79b465 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_profiles.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_profiles.expected.abi.dump.gz deleted file mode 100644 index fda6ae395b354..0000000000000 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_profiles.expected.abi.dump.gz and /dev/null differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz index 704bbc31c9aa3..7207bdf8b522b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz index 5475f13f225f0..691af80fd9e7c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz index 1f25d94f08697..5d4d67c1c95a2 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz index 3629a99f79a40..a28ed25f6f9a3 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz index 9f0d5487d4b13..2ac5d81e0ea82 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz index 14072db08e37c..fc0d754c3b724 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz index 9baf01f0cf7fe..3da7ed3465c3a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz index db05343d07d23..941738e463799 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz index 4207468b686a7..c284c45cc5fda 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz index c134ae33d0955..4840e68120148 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz index 758e2047497f1..c09d86d154aed 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz index e5d92878ed104..56d4a004de846 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz index 08e36bcfcbfa0..7b4377ed05005 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz index c202bf44879af..66c5403e6aab7 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz index 41e42639f10c7..13ea21cdfde36 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz index ccc8fcf0b7773..bfc2738dfb854 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz index 70646c134bcd3..d17d3f254ecca 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz index ab2a8e4952e59..dbf836df7fcf4 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz index 4822c3338f337..32b9694fa92d7 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz index 36deaefb455f3..458530ac06000 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz index 3cbdc7f6fd91b..645d8ca6eb589 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz index a193b4b640665..27c57ef36837c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz index 2468231f5679b..cf836637ce6ad 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz index e2b5fd9e23cba..2a1171abae69d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz index 25622f08b8f0e..eef8ac73e54b6 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_reservation_sub_blocks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_reservation_sub_blocks.expected.abi.dump.gz deleted file mode 100644 index f4592ac4b773c..0000000000000 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_reservation_sub_blocks.expected.abi.dump.gz and /dev/null differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz index ed8b29633185a..eea36f632d25c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz index 37837a34553de..1c8a6c1362f0f 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz index 54a791b60a070..75939ff173b45 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz index 2056d39b71fdf..0d45022f0ec8a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz index 022522fe6c194..d1cf6bb5a1ada 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz index 46d7616bf4471..1a4e36b45b2c5 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz index 26ca205448fbe..f7543e27ad242 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz index bb0133f630dc8..b076ce83a6945 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz index 0dcfd4d9a9019..a1334956abe08 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz index f49c63205bed8..edf6ad2351b39 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz index 8697ab5f5bfa8..0bb915814e8a0 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz index bedde40448e20..a931350800cfd 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz index d6e7702d87e2e..9a66f91fb194d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz index ec341189d6927..995980119d0b4 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz index a7ec054300d03..944cec1d52454 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz index 7b37487f5c184..b7866eb88b1ec 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz index c1f892d054138..93b685948e6d3 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz index 06cb58e5d01ef..df546812bcc83 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz index dc06a7dcdafa6..fce285e1e8de4 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz index 1039c36432794..cfe2e78702824 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz index 84ba79442d373..306c0be874dc1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz index ab9c13d4ba24a..efbbf9972e804 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz index 300110ba8266f..3bae3b45db9b1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz index 1738fe4f5b3e1..d5e26cdf652c3 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz index f1b4fd451d276..2fcdb41006d06 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz index a4db6e0f82be5..98e13fea6252c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz index 1b6b35e46d12c..e5b349e031384 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz index d65bd872daec7..6bf4fb44951c6 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz index 4e5a76245a702..549e5ae653515 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz index 01a3a75495f40..6b33e30e95153 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz index 4d89c5b525b04..5a731e90e4555 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz index 8cbd6255ad859..95c710eae3749 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz index 8edf5e2e0133d..725c041015933 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz index d4eb1b077d9f4..ce9a3473647fb 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz index acc661f312666..a6366d4b68760 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz index 4ead8b806cda1..4c4b5cb8615ae 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz index 734b87d7cceff..b1dc7fc8c7405 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz index 944b943f44f22..53af7664b5587 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz index 1c0963e2edf84..2c23e06004ee8 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz index 344d0e723bced..72cf7ad27beae 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz index 2679678f2a9ff..82aa8e152ee1b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz index b44bffd52644a..b4eb41564cf8e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz index bfc9d5ea9753f..f1708dd07dbcc 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz index 3f643f8f2b22a..2a84206313ca1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz index 925fe4d369e4b..233533903435c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz index 08bc2b41a7261..d48446c4fa218 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz index 3516f058c4cd9..2186cba777000 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz index 63ab3558f7154..595fcec13f506 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz index 05bc68f6f90d2..152c82c24c3b4 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz index e3367d43cc1d5..6d102cee09a3d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz index 4476ffbd1f6c4..2765beae2042d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz index e356f16839bdc..1216f783da694 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz index 14a18dafe2b9f..fd70586862cc9 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz index 603f78c63d51c..a447aad26814e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz index 4211328d7e9b9..4ffef9ded93fe 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz index 11670610ab4f9..49a0677900623 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz index 91bbb783b1fcd..e86cda84b4093 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz index 744192a0db566..0007d2941827d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz index 2749809e6df94..a663c4d726a48 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz index c46ae24b92379..941d26119d305 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz index fcdcdeeaeb34b..18c6362d2208e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz index b2f1549589ebe..6fe6cfc96d2a5 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz index 5dcef322bd448..a76972fe16613 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz index ebf124261fe4f..75ec7df6f9372 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz index 0a46822de9792..2d6dff5090c6e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz index 4f17772bdb441..b54a31673ed08 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz index fdb2cf7f72ef4..ad9a9bb79a794 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz index 670cdf0dfcd05..940f10d49e980 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz index 810d895bb60ba..52d8fa64a2896 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz index e2dc27a22e4ff..57eef98c6ca7d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz index d24b98b4b93e6..ccca680f5b19a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz index b005f35963470..735bb61d76b94 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz index 923e82980a866..74816c8ee3ef9 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz index f2163dff72207..8bcac14c68700 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz index 904134cc02404..6388a2cc74176 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz index faaec1a552d98..326d41d8199aa 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz index 0489252711cc0..246c7a9b781a2 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz index c7ecd17f6fbce..64c9635be06a3 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz index fe49e31617b29..0bf1355469662 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz index b7d4fd416914d..6e910cf6f0201 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz index d6723e4f6f9fe..4a4146ccd3987 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz index b09fd16a99775..5468bdedc2d57 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz index bf29397ca6a4e..a0ffd9d7b6e2d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz index 5a2ea09990384..75702d399c883 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz index 92093a5cc675a..238b7c05548ae 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz index d2eb104960141..b024fd2308251 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz index af72f36143074..b8e2db6e262bf 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz index b235f790372bc..5173f4af92ac4 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz index 9798d5f52858c..22e5f6e28d91f 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz index 15a771c44d396..4f852ad25debf 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz index 1bbffd62447b9..6ab4cd9cb2fce 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz index 76a87697bcf6b..132b4f6677f98 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz index f9d18e19c8d3e..10934a09ee873 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz index fce33c5be2d60..3fad383c3fdea 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz index 245a42b68baa4..40dca528f64c1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz index 26e8ea82684f6..a39e8d68b4ce6 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz index 7b7125f068883..49597479ae7a0 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz index 325dc9e9ce01c..8db4db4c1947a 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz index 1ecbc8362d408..2dc7e9fd49cbe 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz index 7cc50fe3d97c5..b0db2e9eb332e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz index 762b8d0807dff..ca737fe6f67ef 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz index 879ac841bc861..83b9651b017ae 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz index 71eacbe5611ce..4f0ee18b31eb9 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz index b971129f4d0c0..1063f3fbf906e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz index 29c9244d686be..4b08ec5f7acf6 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz index f4e61b450fe45..6e10837a26e4b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz index f483565868e0e..e109b6eac7ac4 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz index 6d4836864efd6..4d506e0668d0e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz index ab5aa1a18b257..a4bc5dfbe4a87 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz index 22ce800da2e5a..7f5001b032e0c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz index 9d5221ee6b347..5332776c6f1bf 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz index 5858d7a285854..fb09695e3244b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz index 12aa2d87a9ae0..b2a7317b27a8d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz index 9ac7bcac711fd..b9dc104ab551b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz index 507a668e9cfcd..45ab351fb3f64 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz index eab16d2ebc4cb..976f85b414df2 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz index 6ed894923fde6..af1739acd9ab1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz index e0e80257cecf8..85f6c068ec8d1 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz index 18094049f5e76..0d236ded47083 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz index 706fbd70c57a0..37886a15713ca 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz index 5f195b151f352..a89c404d4c94e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz index d2267d04874a8..c95ca265a131e 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz index 48df01808cae8..e02ebf68e0142 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz index 3b58267363f14..5869f636ab258 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz index 7bcc44240b54d..88dd1b443480c 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz index 64de410accdc8..0e8c3a318554b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz index 2ac479a7041cf..869ad4039c097 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz index 55f72754da124..3422632363a6d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz index 88e6c6f3d2c35..e794f1650e467 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz index 712d0ef31ef31..e1c6b6f613ca5 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz index 2801c812bf05e..5baf593a45352 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz index 3b063a8e202bd..1556e1a6d2795 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz index cfab725827e67..ea6f8bd1eb17d 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz index 07a90916da691..d7bb993492b6f 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz index 9dcf557d6bcea..2934fbefe9973 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz index ebc31dd5c37dc..db23060840fbf 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz differ diff --git a/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz index 9950afaf6a1bb..d5eb38ab5123b 100644 Binary files a/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz differ diff --git a/ci/bzlmod_tests/consumer-test/BUILD.bazel b/ci/bzlmod_tests/consumer-test/BUILD.bazel new file mode 100644 index 0000000000000..f2d6d030954e2 --- /dev/null +++ b/ci/bzlmod_tests/consumer-test/BUILD.bazel @@ -0,0 +1,9 @@ +load("@rules_cc//cc:defs.bzl", "cc_test") + +cc_test( + name = "main_test", + srcs = ["main.cc"], + deps = [ + "@google_cloud_cpp//google/cloud/storage:storage_client_testing", + ], +) diff --git a/ci/bzlmod_tests/consumer-test/MODULE.bazel b/ci/bzlmod_tests/consumer-test/MODULE.bazel new file mode 100644 index 0000000000000..3ebfa7a79f844 --- /dev/null +++ b/ci/bzlmod_tests/consumer-test/MODULE.bazel @@ -0,0 +1,5 @@ +module(name = "bzlmod-consumer-test") + +bazel_dep(name = "google_cloud_cpp", version = "3.0.0-rc1") +bazel_dep(name = "googletest", version = "1.15.2") +bazel_dep(name = "rules_cc", version = "0.1.1") diff --git a/ci/bzlmod_tests/consumer-test/main.cc b/ci/bzlmod_tests/consumer-test/main.cc new file mode 100644 index 0000000000000..8a6e907ba3c95 --- /dev/null +++ b/ci/bzlmod_tests/consumer-test/main.cc @@ -0,0 +1,16 @@ +#include "google/cloud/storage/client.h" +#include "google/cloud/storage/testing/mock_client.h" +#include +#include + +TEST(BzlmodTest, CanCreateMockClient) { + // Create a mock client. + auto mock = std::make_shared(); + + // Use the mock to construct a Client object. This verifies that the + // necessary symbols are linked correctly. + google::cloud::storage::Client client(mock); + + // A simple assertion to make it a valid test. + ASSERT_TRUE(true); +} diff --git a/ci/cloudbuild/builds/bazel-oldest.sh b/ci/cloudbuild/builds/bazel-oldest.sh index 907dd70fd13b7..c1697dde77971 100755 --- a/ci/cloudbuild/builds/bazel-oldest.sh +++ b/ci/cloudbuild/builds/bazel-oldest.sh @@ -16,21 +16,22 @@ set -euo pipefail -export USE_BAZEL_VERSION=6.4.0 +export USE_BAZEL_VERSION=7.7.1 source "$(dirname "$0")/../../lib/init.sh" source module ci/cloudbuild/builds/lib/bazel.sh source module ci/cloudbuild/builds/lib/cloudcxxrc.sh +source module ci/lib/io.sh export CC=clang export CXX=clang++ mapfile -t args < <(bazel::common_args) args+=( - # For now, we continue to test Bazel 6.x without bzlmod. Once the minimum - # supported version of Bazel is 7.x we can decide how to test without bzlmod. + # Test without bzlmod as WORKSPACE is still supported in bazel 7 LTS. --noenable_bzlmod + --enable_workspace # Only run the unit tests, no need to waste time running everything. --test_tag_filters=-integration-test ) -bazel test "${args[@]}" -- "${BAZEL_TARGETS[@]}" +io::run bazel test "${args[@]}" -- "${BAZEL_TARGETS[@]}" diff --git a/ci/cloudbuild/builds/check-api.sh b/ci/cloudbuild/builds/check-api.sh index ef6a0b21b5ed4..937944db782ec 100755 --- a/ci/cloudbuild/builds/check-api.sh +++ b/ci/cloudbuild/builds/check-api.sh @@ -45,6 +45,7 @@ fi # https://github.com/googleapis/google-cloud-cpp/issues/6313 io::run cmake "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_MESSAGE=NEVER \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Debug \ diff --git a/ci/cloudbuild/builds/clang-7.0.sh b/ci/cloudbuild/builds/clang-7.0.sh index 55fbd3edfcc85..0db406fca54f7 100755 --- a/ci/cloudbuild/builds/clang-7.0.sh +++ b/ci/cloudbuild/builds/clang-7.0.sh @@ -32,6 +32,7 @@ ENABLED_FEATURES="${ENABLED_FEATURES},compute" readonly ENABLED_FEATURES io::run cmake -GNinja -S . -B cmake-out \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \ -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=ON \ -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON \ diff --git a/ci/cloudbuild/builds/clang-tidy-compute.sh b/ci/cloudbuild/builds/clang-tidy-compute.sh index 4bda9c60f390a..78c1826f06f2d 100755 --- a/ci/cloudbuild/builds/clang-tidy-compute.sh +++ b/ci/cloudbuild/builds/clang-tidy-compute.sh @@ -35,7 +35,7 @@ readonly ENABLED_FEATURES="compute" io::run cmake "${cmake_args[@]}" \ -DCMAKE_CXX_CLANG_TIDY=/usr/local/bin/clang-tidy-wrapper \ -DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \ -DGOOGLE_CLOUD_CPP_INTERNAL_DOCFX=ON io::run cmake --build cmake-out diff --git a/ci/cloudbuild/builds/clang-tidy.sh b/ci/cloudbuild/builds/clang-tidy.sh index 111c919e6d7ee..2c4782120075c 100755 --- a/ci/cloudbuild/builds/clang-tidy.sh +++ b/ci/cloudbuild/builds/clang-tidy.sh @@ -47,7 +47,7 @@ fi io::run cmake "${cmake_args[@]}" \ -DCMAKE_CXX_CLANG_TIDY=/usr/local/bin/clang-tidy-wrapper \ -DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=ON \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \ -DGOOGLE_CLOUD_CPP_INTERNAL_DOCFX="${enable_docfx}" diff --git a/ci/cloudbuild/builds/cmake-gcs-rest.sh b/ci/cloudbuild/builds/cmake-gcs-rest.sh index 7abceadae6351..1c058e87748f9 100755 --- a/ci/cloudbuild/builds/cmake-gcs-rest.sh +++ b/ci/cloudbuild/builds/cmake-gcs-rest.sh @@ -30,7 +30,7 @@ mapfile -t cmake_args < <(cmake::common_args) read -r ENABLED_FEATURES < <(features::always_build_cmake) readonly ENABLED_FEATURES -io::run cmake "${cmake_args[@]}" -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" +io::run cmake "${cmake_args[@]}" -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" -DCMAKE_CXX_STANDARD=17 io::run cmake --build cmake-out mapfile -t ctest_args < <(ctest::common_args) io::run env -C cmake-out GOOGLE_CLOUD_CPP_STORAGE_HAVE_REST_CLIENT=yes \ diff --git a/ci/cloudbuild/builds/cmake-install.sh b/ci/cloudbuild/builds/cmake-install.sh index ea830d7ad9989..7de7f89fcb4c3 100755 --- a/ci/cloudbuild/builds/cmake-install.sh +++ b/ci/cloudbuild/builds/cmake-install.sh @@ -35,6 +35,7 @@ readonly ENABLED_FEATURES # Compiles and installs all libraries and headers. cmake "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_MESSAGE=NEVER \ -DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \ -DBUILD_TESTING=OFF \ diff --git a/ci/cloudbuild/builds/cmake-oldest-deps.sh b/ci/cloudbuild/builds/cmake-oldest-deps.sh index 7ffaf56dae058..b22347005ac0f 100755 --- a/ci/cloudbuild/builds/cmake-oldest-deps.sh +++ b/ci/cloudbuild/builds/cmake-oldest-deps.sh @@ -36,6 +36,7 @@ readonly ENABLED_FEATURES io::log_h2 "Configuring" vcpkg_root="$(vcpkg::root_dir)" cmake -GNinja -S . -B cmake-out/build \ + "-DCMAKE_CXX_STANDARD=17" \ "-DCMAKE_TOOLCHAIN_FILE=${vcpkg_root}/scripts/buildsystems/vcpkg.cmake" \ "-DVCPKG_MANIFEST_DIR=ci/etc/oldest-deps" \ "-DVCPKG_FEATURE_FLAGS=versions,manifest" \ diff --git a/ci/cloudbuild/builds/cmake-single-feature.sh b/ci/cloudbuild/builds/cmake-single-feature.sh index 68ac4a6814723..9e0c9aab07adf 100755 --- a/ci/cloudbuild/builds/cmake-single-feature.sh +++ b/ci/cloudbuild/builds/cmake-single-feature.sh @@ -61,11 +61,13 @@ done for feature in "${features[@]}"; do io::run cmake -S . -B cmake-out/test-only-"${feature}" \ -DGOOGLE_CLOUD_CPP_ENABLE="${feature}" \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_TESTING=OFF io::run check_pkgconfig_relative cmake-out/test-only-"${feature}" io::run cmake -S . -B cmake-out/test-only-"${feature}"-absolute-cmake-install \ -DGOOGLE_CLOUD_CPP_ENABLE="${feature}" \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_INCLUDEDIR=/test-only/include \ -DCMAKE_INSTALL_LIBDIR=/test-only/lib \ -DBUILD_TESTING=OFF diff --git a/ci/cloudbuild/builds/cmake-split-install.sh b/ci/cloudbuild/builds/cmake-split-install.sh index 4c4a10f923e06..99340bcf3dc07 100755 --- a/ci/cloudbuild/builds/cmake-split-install.sh +++ b/ci/cloudbuild/builds/cmake-split-install.sh @@ -42,6 +42,7 @@ io::log_h2 "Building and installing common libraries" # We need a custom build directory mapfile -t core_cmake_args < <(cmake::common_args cmake-out/common-libraries) io::run cmake "${core_cmake_args[@]}" "${install_args[@]}" \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="__common__" io::run cmake --build cmake-out/common-libraries io::run cmake --install cmake-out/common-libraries --prefix "${INSTALL_PREFIX}" @@ -50,6 +51,7 @@ io::log_h2 "Building and installing popular libraries" mapfile -t core_cmake_args < <(cmake::common_args cmake-out/popular-libraries) io::run cmake "${core_cmake_args[@]}" "${install_args[@]}" \ -DCMAKE_PREFIX_PATH="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="bigtable,pubsub,spanner,storage,storage_grpc,iam,policytroubleshooter" \ -DGOOGLE_CLOUD_CPP_USE_INSTALLED_COMMON=ON io::run cmake --build cmake-out/popular-libraries @@ -60,6 +62,7 @@ io::log_h2 "Building and installing Compute" mapfile -t feature_cmake_args < <(cmake::common_args cmake-out/compute) io::run cmake "${feature_cmake_args[@]}" "${install_args[@]}" \ -DCMAKE_PREFIX_PATH="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_USE_INSTALLED_COMMON=ON \ -DGOOGLE_CLOUD_CPP_ENABLE="compute" io::run cmake --build cmake-out/compute @@ -70,6 +73,7 @@ io::log_h2 "Building and installing all features" mapfile -t feature_cmake_args < <(cmake::common_args cmake-out/features) io::run cmake "${feature_cmake_args[@]}" "${install_args[@]}" \ -DCMAKE_PREFIX_PATH="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_USE_INSTALLED_COMMON=ON \ -DGOOGLE_CLOUD_CPP_ENABLE="__ga_libraries__,-bigtable,-pubsub,-storage,-storage_grpc,-spanner,-iam,-policytroubleshooter,-compute" io::run cmake --build cmake-out/features diff --git a/ci/cloudbuild/builds/cxx14.sh b/ci/cloudbuild/builds/cxx14.sh deleted file mode 100755 index aa2b7d3136e39..0000000000000 --- a/ci/cloudbuild/builds/cxx14.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -euo pipefail - -source "$(dirname "$0")/../../lib/init.sh" -source module ci/cloudbuild/builds/lib/cmake.sh -source module ci/cloudbuild/builds/lib/ctest.sh -source module ci/cloudbuild/builds/lib/features.sh -source module ci/cloudbuild/builds/lib/integration.sh -source module ci/lib/io.sh - -export CC=gcc -export CXX=g++ - -mapfile -t cmake_args < <(cmake::common_args) -read -r ENABLED_FEATURES < <(features::always_build_cmake) -# We should test all the GA libraries -ENABLED_FEATURES="${ENABLED_FEATURES},__ga_libraries__" -readonly ENABLED_FEATURES - -io::run cmake "${cmake_args[@]}" \ - -DCMAKE_CXX_STANDARD=14 \ - -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" -io::run cmake --build cmake-out -mapfile -t ctest_args < <(ctest::common_args) -io::run env -C cmake-out ctest "${ctest_args[@]}" -LE "integration-test" - -integration::ctest_with_emulators "cmake-out" diff --git a/ci/cloudbuild/builds/demo-install.sh b/ci/cloudbuild/builds/demo-install.sh index baf0e86030c57..ce889020b2dfb 100755 --- a/ci/cloudbuild/builds/demo-install.sh +++ b/ci/cloudbuild/builds/demo-install.sh @@ -48,6 +48,7 @@ PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ "${cmake_config_testing_details[@]}" \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ diff --git a/ci/cloudbuild/builds/development.sh b/ci/cloudbuild/builds/development.sh index 357fb04abb10d..a039434f963a0 100755 --- a/ci/cloudbuild/builds/development.sh +++ b/ci/cloudbuild/builds/development.sh @@ -40,7 +40,7 @@ io::run cmake "${cmake_args[@]}" \ -DCMAKE_CXX_CLANG_TIDY=/usr/local/bin/clang-tidy-wrapper \ -DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" io::run cmake --build cmake-out diff --git a/ci/cloudbuild/builds/gcc-oldest.sh b/ci/cloudbuild/builds/gcc-oldest.sh index a781b2295d4a3..fa837b97a6485 100755 --- a/ci/cloudbuild/builds/gcc-oldest.sh +++ b/ci/cloudbuild/builds/gcc-oldest.sh @@ -32,6 +32,8 @@ ENABLED_FEATURES="${ENABLED_FEATURES},compute" readonly ENABLED_FEATURES io::run cmake "${cmake_args[@]}" \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_CXX_FLAGS="-Wno-error=conversion" \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" io::run cmake --build cmake-out mapfile -t ctest_args < <(ctest::common_args) diff --git a/ci/cloudbuild/builds/generate-libraries.sh b/ci/cloudbuild/builds/generate-libraries.sh index f24f299b39581..5a6b503ed77c1 100755 --- a/ci/cloudbuild/builds/generate-libraries.sh +++ b/ci/cloudbuild/builds/generate-libraries.sh @@ -24,6 +24,11 @@ source module ci/lib/io.sh bazel_output_base="$(bazel info output_base)" +# As we support both WORKSPACE and MODULE modes for bazel, we need to determine +# the path to these dependencies dynamically. +read -r protobuf_proto_path < <(find "${bazel_output_base}/external" -name "empty.proto" | sed -nE 's/(.+\/src)\/google\/protobuf\/empty.proto/\1/p') +read -r googleapis_proto_path < <(find "${bazel_output_base}/external" -name "api-index-v1.json" | sed -nE 's/(.+)\/api-index-v1.json/\1/p') + if [ -z "${UPDATED_DISCOVERY_DOCUMENT}" ]; then io::log_h2 "Removing previously generated golden files" git grep -l "Generated by the Codegen C++ plugin" generator/integration_tests/golden | xargs rm @@ -36,8 +41,8 @@ fi io::log_h2 "Running the generator to update the golden files" bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \ //generator:google-cloud-cpp-codegen -- \ - --protobuf_proto_path="${bazel_output_base}/external/protobuf~/src" \ - --googleapis_proto_path="${bazel_output_base}/external/googleapis~" \ + --protobuf_proto_path="${protobuf_proto_path}" \ + --googleapis_proto_path="${googleapis_proto_path}" \ --golden_proto_path="${PWD}" \ --output_path="${PWD}" \ --update_ci=false \ @@ -49,8 +54,8 @@ if [ -z "${GENERATE_GOLDEN_ONLY}" ]; then io::log_h2 "Running the generator to emit protos from discovery docs" bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \ //generator:google-cloud-cpp-codegen -- \ - --protobuf_proto_path="${bazel_output_base}"/external/protobuf~/src \ - --googleapis_proto_path="${bazel_output_base}"/external/googleapis~ \ + --protobuf_proto_path="${protobuf_proto_path}" \ + --googleapis_proto_path="${googleapis_proto_path}" \ --discovery_proto_path="${PWD}/protos" \ --output_path="${PROJECT_ROOT}/protos" \ --export_output_path="${PROJECT_ROOT}" \ @@ -81,8 +86,8 @@ if [ -z "${GENERATE_GOLDEN_ONLY}" ]; then io::log_h2 "Running the generator to update the generated libraries" bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \ //generator:google-cloud-cpp-codegen -- \ - --protobuf_proto_path="${bazel_output_base}"/external/protobuf~/src \ - --googleapis_proto_path="${bazel_output_base}"/external/googleapis~ \ + --protobuf_proto_path="${protobuf_proto_path}" \ + --googleapis_proto_path="${googleapis_proto_path}" \ --discovery_proto_path="${PWD}/protos" \ --output_path="${PROJECT_ROOT}" \ --check_comment_substitutions=true \ diff --git a/ci/cloudbuild/builds/lib/integration.sh b/ci/cloudbuild/builds/lib/integration.sh index d6fba90073441..cb4c07fb0c3d6 100644 --- a/ci/cloudbuild/builds/lib/integration.sh +++ b/ci/cloudbuild/builds/lib/integration.sh @@ -267,10 +267,16 @@ function integration::bazel_with_emulators() { else io::log_h2 "Running generator integration test" bazel_output_base="$(bazel info output_base)" + + # As we support both WORKSPACE and MODULE modes for bazel, we need to determine + # the path to these dependencies dynamically. + read -r protobuf_proto_path < <(find "${bazel_output_base}/external" -name "empty.proto" | sed -nE 's/(.+\/src)\/google\/protobuf\/empty.proto/\1/p') + read -r googleapis_proto_path < <(find "${bazel_output_base}/external" -name "api-index-v1.json" | sed -nE 's/(.+)\/api-index-v1.json/\1/p') + bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \ //generator:google-cloud-cpp-codegen -- \ - --protobuf_proto_path="${bazel_output_base}/external/protobuf~/src" \ - --googleapis_proto_path="${bazel_output_base}/external/googleapis~" \ + --protobuf_proto_path="${protobuf_proto_path}" \ + --googleapis_proto_path="${googleapis_proto_path}" \ --golden_proto_path="${PWD}" \ --output_path="${PWD}" \ --update_ci=false \ diff --git a/ci/cloudbuild/builds/lib/quickstart.sh b/ci/cloudbuild/builds/lib/quickstart.sh index 4a148f4d6fc9e..6d585b95537b5 100644 --- a/ci/cloudbuild/builds/lib/quickstart.sh +++ b/ci/cloudbuild/builds/lib/quickstart.sh @@ -58,6 +58,7 @@ function quickstart::build_one_quickstart() { local configure_args=( "-S" "${src_dir}" "-B" "${cmake_bin_dir}" + -DCMAKE_CXX_STANDARD=17 -DCMAKE_PREFIX_PATH="${prefix}" ) if command -v /usr/local/bin/sccache >/dev/null 2>&1; then @@ -68,12 +69,12 @@ function quickstart::build_one_quickstart() { cmake "${configure_args[@]}" cmake --build "${cmake_bin_dir}" - echo - io::log "[ Make ]" - local makefile_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/makefile-${bin_dir_suffix}" - mkdir -p "${makefile_bin_dir}" - PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" \ - make -C "${src_dir}" BIN="${makefile_bin_dir}" + # echo + # io::log "[ Make ]" + # local makefile_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/makefile-${bin_dir_suffix}" + # mkdir -p "${makefile_bin_dir}" + # PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" \ + # CXXFLAGS="--std=c++17" make -C "${src_dir}" BIN="${makefile_bin_dir}" } # Runs the CMake and Makefile quickstart programs but DOES NOT COMPILE THEM. @@ -104,11 +105,11 @@ function quickstart::run_gcs_grpc_quickstart() { local cmake_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/cmake-storage_grpc" "${cmake_bin_dir}/quickstart_grpc" "${run_args[@]}" - echo - io::log "[ Make ]" - local makefile_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/makefile-storage_grpc" - LD_LIBRARY_PATH="${prefix}/lib64:${prefix}/lib:${LD_LIBRARY_PATH:-}" \ - "${makefile_bin_dir}/quickstart_grpc" "${run_args[@]}" + # echo + # io::log "[ Make ]" + # local makefile_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/makefile-storage_grpc" + # LD_LIBRARY_PATH="${prefix}/lib64:${prefix}/lib:${LD_LIBRARY_PATH:-}" \ + # "${makefile_bin_dir}/quickstart_grpc" "${run_args[@]}" } function quickstart::run_one_quickstart() { @@ -121,8 +122,8 @@ function quickstart::run_one_quickstart() { local cmake_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/cmake-${bin_dir_suffix}" io::run "${cmake_bin_dir}/quickstart" "${run_args[@]}" - echo - io::log "[ Make ]" - local makefile_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/makefile-${bin_dir_suffix}" - io::run env LD_LIBRARY_PATH="${prefix}/lib64:${prefix}/lib:${LD_LIBRARY_PATH:-}" "${makefile_bin_dir}/quickstart" "${run_args[@]}" + # echo + # io::log "[ Make ]" + # local makefile_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/makefile-${bin_dir_suffix}" + # io::run env LD_LIBRARY_PATH="${prefix}/lib64:${prefix}/lib:${LD_LIBRARY_PATH:-}" "${makefile_bin_dir}/quickstart" "${run_args[@]}" } diff --git a/ci/cloudbuild/builds/m32.sh b/ci/cloudbuild/builds/m32.sh index bac62106191d3..6db88dafa98f1 100755 --- a/ci/cloudbuild/builds/m32.sh +++ b/ci/cloudbuild/builds/m32.sh @@ -35,6 +35,7 @@ readonly ENABLED_FEATURES # This is the build to test with -m32, which requires a toolchain file. io::run cmake "${cmake_args[@]}" \ "--toolchain" "${PROJECT_ROOT}/ci/etc/m32-toolchain.cmake" \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" io::run cmake --build cmake-out mapfile -t ctest_args < <(ctest::common_args) diff --git a/ci/cloudbuild/builds/noex.sh b/ci/cloudbuild/builds/noex.sh index 4cffa4618ddcc..2cab6111b68da 100755 --- a/ci/cloudbuild/builds/noex.sh +++ b/ci/cloudbuild/builds/noex.sh @@ -32,6 +32,7 @@ readonly ENABLED_FEATURES io::run cmake "${cmake_args[@]}" \ -DGOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS=NO \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" io::run cmake --build cmake-out mapfile -t ctest_args < <(ctest::common_args) diff --git a/ci/cloudbuild/builds/otel-disabled-bazel.sh b/ci/cloudbuild/builds/otel-disabled-bazel.sh deleted file mode 100755 index 63901b1811069..0000000000000 --- a/ci/cloudbuild/builds/otel-disabled-bazel.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -euo pipefail - -source "$(dirname "$0")/../../lib/init.sh" -source module ci/cloudbuild/builds/lib/bazel.sh -source module ci/cloudbuild/builds/lib/cloudcxxrc.sh - -export CC=clang -export CXX=clang++ - -mapfile -t args < <(bazel::common_args) -args+=("--//:enable_opentelemetry=false") -# Note that we do not ignore `//:opentelemetry`, as the exporters should be -# usable whether google-cloud-cpp is built with OpenTelemetry or not. -ignore=( - # These integration tests use opentelemetry matchers out of convenience. - "-//google/cloud/opentelemetry/integration_tests/..." - # The quickstart demonstrates client tracing instrumentation, and thus it - # depends on google-cloud-cpp being built with OpenTelemetry. - "-//google/cloud/opentelemetry/quickstart/..." -) -bazel test "${args[@]}" --test_tag_filters=-integration-test -- "${BAZEL_TARGETS[@]}" "${ignore[@]}" diff --git a/ci/cloudbuild/builds/publish-docs.sh b/ci/cloudbuild/builds/publish-docs.sh index 5f40ea6504bdb..e1e3d7275a947 100755 --- a/ci/cloudbuild/builds/publish-docs.sh +++ b/ci/cloudbuild/builds/publish-docs.sh @@ -40,6 +40,7 @@ fi doc_args=( "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_CXX_STANDARD=17" "-DGOOGLE_CLOUD_CPP_GENERATE_DOXYGEN=ON" "-DGOOGLE_CLOUD_CPP_INTERNAL_DOCFX=ON" "-DGOOGLE_CLOUD_CPP_ENABLE=${ENABLED_FEATURES}" diff --git a/ci/cloudbuild/builds/quickstart-bazel.sh b/ci/cloudbuild/builds/quickstart-bazel.sh index 3a86351e7a5c1..db9664127769f 100755 --- a/ci/cloudbuild/builds/quickstart-bazel.sh +++ b/ci/cloudbuild/builds/quickstart-bazel.sh @@ -27,6 +27,6 @@ export CXX=g++ mapfile -t args < <(bazel::common_args) for lib in $(quickstart::libraries); do io::log_h2 "Running Bazel quickstart for ${lib}" - env -C "${PROJECT_ROOT}/google/cloud/${lib}/quickstart" \ + io::run env -C "${PROJECT_ROOT}/google/cloud/${lib}/quickstart" \ bazel build "${args[@]}" :quickstart done diff --git a/ci/cloudbuild/builds/quickstart-cmake.sh b/ci/cloudbuild/builds/quickstart-cmake.sh index 8a5baa15a840e..64a4ecc667b7b 100755 --- a/ci/cloudbuild/builds/quickstart-cmake.sh +++ b/ci/cloudbuild/builds/quickstart-cmake.sh @@ -60,6 +60,7 @@ mapfile -t features < <( feature_list="$(printf ";%s" "${features[@]}")" feature_list="${feature_list:1}" io::run cmake -G Ninja \ + -DCMAKE_CXX_STANDARD=17 \ -S "${PROJECT_ROOT}/ci/verify_quickstart" \ -B "${PROJECT_ROOT}/cmake-out/quickstart" \ -DCMAKE_TOOLCHAIN_FILE="${vcpkg_dir}/scripts/buildsystems/vcpkg.cmake" \ diff --git a/ci/cloudbuild/builds/quickstart-production.sh b/ci/cloudbuild/builds/quickstart-production.sh index 73f226bb73a1d..ea63c181e89fd 100755 --- a/ci/cloudbuild/builds/quickstart-production.sh +++ b/ci/cloudbuild/builds/quickstart-production.sh @@ -35,6 +35,7 @@ readonly ENABLED_FEATURES io::run cmake "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_MESSAGE=NEVER \ -DBUILD_SHARED_LIBS=ON \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" diff --git a/ci/cloudbuild/builds/scan-build.sh b/ci/cloudbuild/builds/scan-build.sh index 7c71cd3891487..2846f0829d34c 100755 --- a/ci/cloudbuild/builds/scan-build.sh +++ b/ci/cloudbuild/builds/scan-build.sh @@ -38,5 +38,6 @@ scan_build=( "${HOME}/scan-build" ) io::run "${scan_build[@]}" cmake "${cmake_args[@]}" \ + -DCMAKE_CXX_STANDARD=17 \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" io::run "${scan_build[@]}" cmake --build cmake-out diff --git a/ci/cloudbuild/builds/shared.sh b/ci/cloudbuild/builds/shared.sh index 26ecce68ed514..9bcd6a6243d66 100755 --- a/ci/cloudbuild/builds/shared.sh +++ b/ci/cloudbuild/builds/shared.sh @@ -33,6 +33,7 @@ readonly ENABLED_FEATURES io::run cmake "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_MESSAGE=NEVER \ -DBUILD_SHARED_LIBS=ON \ -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" diff --git a/ci/cloudbuild/dockerfiles/checkers.Dockerfile b/ci/cloudbuild/dockerfiles/checkers.Dockerfile index 819f7dd2466f2..c13831ef34fcc 100644 --- a/ci/cloudbuild/dockerfiles/checkers.Dockerfile +++ b/ci/cloudbuild/dockerfiles/checkers.Dockerfile @@ -54,6 +54,6 @@ RUN pip3 install mdformat==0.7.19 \ mdformat-frontmatter==2.0.8 \ mdformat-footnote==0.1.1 -RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.24.1/bazelisk-linux-${ARCH}" && \ +RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-${ARCH}" && \ chmod +x /usr/bin/bazelisk && \ ln -s /usr/bin/bazelisk /usr/bin/bazel diff --git a/ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile b/ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile index 3b27a85bc7ae8..d44f692b2e6ec 100644 --- a/ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile @@ -71,14 +71,14 @@ RUN apk update && \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile b/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile index 4ed72ae9a418b..d6c49d263665c 100644 --- a/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile @@ -58,26 +58,19 @@ RUN curl -fsSL https://distfiles.ariadne.space/pkgconf/pkgconf-2.2.0.tar.gz | \ ENV PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib/pkgconfig # ``` -# #### crc32c - -# The project depends on the Crc32c library, we need to compile this from -# source: - -# ```bash -WORKDIR /var/tmp/build/crc32c -RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ +# #### abseil +WORKDIR /var/tmp/build/abseil-cpp +RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DCRC32C_BUILD_TESTS=OFF \ - -DCRC32C_BUILD_BENCHMARKS=OFF \ - -DCRC32C_USE_GLOG=OFF \ - -S . -B cmake-out && \ + -DCMAKE_BUILD_TYPE=Release \ + -DABSL_BUILD_TESTING=OFF \ + -DABSL_PROPAGATE_CXX_STD=ON \ + -DBUILD_SHARED_LIBS=yes \ + -S . -B cmake-out && \ cmake --build cmake-out -- -j ${NCPU:-4} && \ cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ ldconfig -# ``` # #### opentelemetry-cpp @@ -88,14 +81,14 @@ RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile b/ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile index 7d847693157ae..d6ae0eaf807a1 100644 --- a/ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile @@ -40,6 +40,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -88,10 +89,11 @@ RUN apt-get update && \ # ```bash WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -121,14 +123,13 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \ # #### gRPC -# Finally, we build gRPC from source: - # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -152,14 +153,14 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile b/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile index 9e63de4fad809..75732c47670e1 100644 --- a/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile @@ -79,14 +79,14 @@ ENV PKG_CONFIG_PATH=/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/local/l # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile index 5e07d8be4d975..8292f720ef64b 100644 --- a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile @@ -27,7 +27,7 @@ ARG NCPU=4 # ```bash RUN zypper refresh && \ zypper install --allow-downgrade -y automake cmake curl \ - gcc gcc-c++ gcc8 gcc8-c++ git gzip libtool make patch tar wget + gcc8 gcc8-c++ git gzip libtool make patch tar wget # ``` # Install some of the dependencies for `google-cloud-cpp`. @@ -50,23 +50,25 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig ENV PATH=/usr/local/bin:${PATH} # ``` +# Use the following environment variables to configure the compiler used by +# CMake. +ENV CC=gcc-8 +ENV CXX=g++-8 + # #### opentelemetry-cpp -# The project has an **optional** dependency on the OpenTelemetry library. -# We recommend installing this library because: -# - the dependency will become required in the google-cloud-cpp v3.x series. -# - it is needed to produce distributed traces of the library. +# The project has a dependency on the OpenTelemetry library. # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -75,13 +77,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 ldconfig # ``` -# Use the following environment variables to configure the compiler used by -# CMake. - -ENV CXX=g++-8 - -ENV CC=gcc-8 - ## [DONE packaging.md] WORKDIR /var/tmp/sccache diff --git a/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile b/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile index 6c97967e70375..9cf4808143165 100644 --- a/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile @@ -79,6 +79,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -96,10 +97,11 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | # ```bash WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -137,7 +139,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=17 \ @@ -208,14 +210,14 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile index 8f14cae6f71fd..dbf368f57a9b3 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile @@ -62,27 +62,19 @@ RUN curl -fsSL https://distfiles.ariadne.space/pkgconf/pkgconf-2.2.0.tar.gz | \ RUN ln -s /usr/bin/pkgconf /usr/bin/pkg-config # ``` - -# #### crc32c - -# The project depends on the Crc32c library, we need to compile this from -# source: - -# ```bash -WORKDIR /var/tmp/build/crc32c -RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ +# #### abseil +WORKDIR /var/tmp/build/abseil-cpp +RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DCRC32C_BUILD_TESTS=OFF \ - -DCRC32C_BUILD_BENCHMARKS=OFF \ - -DCRC32C_USE_GLOG=OFF \ - -S . -B cmake-out && \ + -DCMAKE_BUILD_TYPE=Release \ + -DABSL_BUILD_TESTING=OFF \ + -DABSL_PROPAGATE_CXX_STD=ON \ + -DBUILD_SHARED_LIBS=yes \ + -S . -B cmake-out && \ cmake --build cmake-out -- -j ${NCPU:-4} && \ cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ ldconfig -# ``` # #### opentelemetry-cpp @@ -93,14 +85,13 @@ RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile index f0c9d4934fdba..a22d83f75bdd0 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile @@ -40,6 +40,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -56,10 +57,11 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | # ```bash WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -95,10 +97,11 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -165,14 +168,14 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile index 1f5d6c164c893..b977fc72ab615 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile @@ -40,6 +40,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -56,10 +57,11 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | # ```bash WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -76,10 +78,11 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -146,14 +149,14 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ # ```bash WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-bazel.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-bazel.Dockerfile index 44904a1aec020..2b406debf8c9a 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-bazel.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-bazel.Dockerfile @@ -50,7 +50,7 @@ RUN /var/tmp/ci/install-cloud-sdk.sh ENV CLOUD_SDK_LOCATION=/usr/local/google-cloud-sdk ENV PATH=${CLOUD_SDK_LOCATION}/bin:${PATH} -RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.24.1/bazelisk-linux-${ARCH}" && \ +RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-${ARCH}" && \ chmod +x /usr/bin/bazelisk && \ ln -s /usr/bin/bazelisk /usr/bin/bazel diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile index ebb032c5804a5..d020a1a95bdda 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile @@ -72,10 +72,9 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib WORKDIR /var/tmp/build RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ - sed -i 's/^#define ABSL_OPTION_USE_\(.*\) 2/#define ABSL_OPTION_USE_\1 0/' "absl/base/options.h" && \ - sed -i 's/^#define ABSL_OPTION_USE_INLINE_NAMESPACE 1$/#define ABSL_OPTION_USE_INLINE_NAMESPACE 0/' "absl/base/options.h" && \ cmake \ -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DBUILD_SHARED_LIBS=yes \ -GNinja -S . -B cmake-out && \ @@ -129,10 +128,11 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -141,16 +141,15 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/ -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \ -DBUILD_SHARED_LIBS=ON \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -160,10 +159,11 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=ON \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cxx14.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cxx14.Dockerfile deleted file mode 100644 index 74612e722e5c5..0000000000000 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cxx14.Dockerfile +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2023 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM fedora:40 -ARG NCPU=4 -ARG ARCH=amd64 - -# Install the basic development tools. -RUN dnf makecache && \ - dnf install -y autoconf automake \ - clang cmake diffutils findutils gcc-c++ git \ - make ninja-build patch python3 \ - python-pip tar unzip wget which zip zlib-devel - -# Install the development packages for libcurl and OpenSSL. Neither are affected -# by the C++ version, so we can use the pre-built binaries. -RUN dnf makecache && \ - dnf install -y libcurl-devel openssl-devel - -# Install the Python modules needed to run the storage emulator -RUN dnf makecache && dnf install -y python3-devel -RUN pip3 install --upgrade pip -RUN pip3 install setuptools wheel - -# The Cloud Pub/Sub emulator needs Java, and so does `bazel coverage` :shrug: -# Bazel needs the '-devel' version with javac. -RUN dnf makecache && dnf install -y java-latest-openjdk-devel - -# Sets root's password to the empty string to enable users to get a root shell -# inside the container with `su -` and no password. Sudo would not work because -# we run these containers as the invoking user's uid, which does not exist in -# the container's /etc/passwd file. -RUN echo 'root:cloudcxx' | chpasswd - -# Fedora's version of `pkg-config` (https://github.com/pkgconf/pkgconf) is slow -# when handling `.pc` files with lots of `Requires:` deps, which happens with -# Abseil, so we use the normal `pkg-config` binary, which seems to not suffer -# from this bottleneck. For more details see -# https://github.com/googleapis/google-cloud-cpp/issues/7052 -WORKDIR /var/tmp/build/pkgconf -RUN curl -fsSL https://distfiles.ariadne.space/pkgconf/pkgconf-2.2.0.tar.gz | \ - tar -xzf - --strip-components=1 && \ - ./configure --prefix=/usr --with-system-libdir=/lib64:/usr/lib64 --with-system-includedir=/usr/include && \ - make -j ${NCPU:-4} && \ - make install && \ - ldconfig && cd /var/tmp && rm -fr build - -# The following steps will install libraries and tools in `/usr/local`. By -# default, pkgconf does not search in these directories. We need to explicitly -# set the search path. -ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib64/pkgconfig - -# Download and install direct dependencies of `google-cloud-cpp`. Including -# development dependencies. In each case, remove the downloaded files and the -# temporary artifacts after a successful build to keep the image smaller (and -# with fewer layers). - -WORKDIR /var/tmp/build -RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DABSL_BUILD_TESTING=OFF \ - -DABSL_PROPAGATE_CXX_STD=ON \ - -DBUILD_SHARED_LIBS=yes \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build -RUN curl -fsSL https://github.com/google/googletest/archive/v1.16.0.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build -RUN curl -fsSL https://github.com/google/benchmark/archive/v1.9.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DBENCHMARK_ENABLE_TESTING=OFF \ - -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build -RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DCRC32C_BUILD_TESTS=OFF \ - -DCRC32C_BUILD_BENCHMARKS=OFF \ - -DCRC32C_USE_GLOG=OFF \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build -RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DBUILD_TESTING=OFF \ - -DJSON_BuildTests=OFF \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_ABSL_PROVIDER=package \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build/ -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \ - -DBUILD_SHARED_LIBS=ON \ - -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ - -DBUILD_TESTING=OFF \ - -DOPENTELEMETRY_INSTALL=ON \ - -DOPENTELEMETRY_ABI_VERSION_NO=2 \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/build/grpc -RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_OPENTELEMETRY_PROVIDER=package \ - -DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=ON \ - -GNinja -S . -B cmake-out && \ - cmake --build cmake-out && cmake --install cmake-out && \ - ldconfig && \ - cd /var/tmp && rm -fr build - -WORKDIR /var/tmp/sccache -RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \ - tar -zxf - --strip-components=1 && \ - mkdir -p /usr/local/bin && \ - mv sccache /usr/local/bin/sccache && \ - chmod +x /usr/local/bin/sccache - -# Install the Cloud SDK and some of the emulators. We use the emulators to run -# integration tests for the client libraries. -COPY . /var/tmp/ci -WORKDIR /var/tmp/downloads -# The Google Cloud CLI requires Python <= 3.10, Fedora defaults to 3.12. -RUN dnf makecache && dnf install -y python3.10 -ENV CLOUDSDK_PYTHON=python3.10 -RUN /var/tmp/ci/install-cloud-sdk.sh -ENV CLOUD_SDK_LOCATION=/usr/local/google-cloud-sdk -ENV PATH=${CLOUD_SDK_LOCATION}/bin:${PATH} - -# Update the ld.conf cache in case any libraries were installed in /usr/local/lib* -RUN ldconfig /usr/local/lib* diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile index 2e4ceda94a7bb..36d0c5430e660 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile @@ -39,6 +39,10 @@ RUN pip3 install setuptools wheel # Bazel needs the '-devel' version with javac. RUN dnf makecache && dnf install -y java-latest-openjdk-devel +RUN dnf makecache && dnf install -y glibc glibc-devel + +RUN dnf makecache && dnf install -y clang-tools-extra + # Sets root's password to the empty string to enable users to get a root shell # inside the container with `su -` and no password. Sudo would not work because # we run these containers as the invoking user's uid, which does not exist in @@ -137,7 +141,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=20 \ @@ -151,7 +155,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/ -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=20 \ @@ -160,7 +164,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 -DBUILD_SHARED_LIBS=ON \ -DWITH_EXAMPLES=OFF \ -DWITH_STL=CXX20 \ - -DWITH_ABSEIL=ON \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -170,7 +173,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=20 \ diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile index edfa43967e05c..fa0945ee79d52 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile @@ -63,15 +63,15 @@ RUN curl -fsSL https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_11 cmake --build cmake-out --target install WORKDIR /var/tmp/build/ -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \ -DBUILD_SHARED_LIBS=ON \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/fedora-m32.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-m32.Dockerfile index 22e4e93c9af86..6435028d58989 100644 --- a/ci/cloudbuild/dockerfiles/fedora-m32.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-m32.Dockerfile @@ -100,7 +100,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ # compiled with. And we use the compiler flags from ci/etc/m32-toolchain.cmake # to force a 32-bit install. WORKDIR /var/tmp/build/opentelemetry -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=17 \ @@ -114,8 +114,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \ -DBUILD_SHARED_LIBS=ON \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ diff --git a/ci/cloudbuild/dockerfiles/fedora-msan.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-msan.Dockerfile index 6eef6ad512195..f2cf48537eac6 100644 --- a/ci/cloudbuild/dockerfiles/fedora-msan.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-msan.Dockerfile @@ -81,6 +81,6 @@ RUN /var/tmp/ci/install-cloud-sdk.sh ENV CLOUD_SDK_LOCATION=/usr/local/google-cloud-sdk ENV PATH=${CLOUD_SDK_LOCATION}/bin:${PATH} -RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.24.1/bazelisk-linux-${ARCH}" && \ +RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-${ARCH}" && \ chmod +x /usr/bin/bazelisk && \ ln -s /usr/bin/bazelisk /usr/bin/bazel diff --git a/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile b/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile index 547ce3218c655..ea44c79c90ef1 100644 --- a/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile +++ b/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile @@ -17,19 +17,42 @@ ARG NCPU=4 RUN zypper refresh && \ zypper install --allow-downgrade -y automake cmake curl gcc gcc-c++ \ - git gzip libtool make ninja patch tar wget - - -RUN zypper refresh && \ - zypper install --allow-downgrade -y abseil-cpp-devel c-ares-devel \ - libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel \ - re2-devel + git gzip libtool make ninja patch tar wget \ + c-ares-devel libcurl-devel libopenssl-devel libcrc32c-devel RUN (echo "/usr/local/lib" ; echo "/usr/local/lib64") | \ tee /etc/ld.so.conf.d/usrlocal.conf ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig ENV PATH=/usr/local/bin:${PATH} +WORKDIR /var/tmp/build +RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ + tar -xzf - --strip-components=1 && \ + cmake \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_BUILD_TYPE=Release \ + -DABSL_BUILD_TESTING=OFF \ + -DABSL_PROPAGATE_CXX_STD=ON \ + -DBUILD_SHARED_LIBS=yes \ + -GNinja -S . -B cmake-out && \ + cmake --build cmake-out && cmake --install cmake-out && \ + ldconfig && \ + cd /var/tmp && rm -fr build + +WORKDIR /var/tmp/build/re2 +RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \ + tar -xzf - --strip-components=1 && \ + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ + -DBUILD_SHARED_LIBS=ON \ + -DRE2_BUILD_TESTING=OFF \ + -S . -B cmake-out && \ + cmake --build cmake-out -- -j ${NCPU:-4} && \ + cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ + ldconfig && \ + cd /var/tmp && rm -fr build + + # Install googletest, remove the downloaded files and the temporary artifacts # after a successful build to keep the image smaller (and with fewer layers) WORKDIR /var/tmp/build @@ -37,6 +60,7 @@ RUN curl -fsSL https://github.com/google/googletest/archive/v1.16.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -GNinja -S . -B cmake-out && \ cmake --build cmake-out && cmake --install cmake-out && \ @@ -55,10 +79,11 @@ RUN curl -fsSL https://github.com/google/benchmark/archive/v1.9.2.tar.gz | \ ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -70,15 +95,15 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz # GCC 7.x. See https://github.com/open-telemetry/opentelemetry-cpp/issues/1014 # for more details. WORKDIR /var/tmp/build/opentelemetry-cpp -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ sed -i 's/Stack &GetStack()/Stack \&GetStack() __attribute__((noinline, noclone))/' "api/include/opentelemetry/context/runtime_context.h" && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -87,10 +112,11 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -104,6 +130,18 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ cmake --build cmake-out && cmake --install cmake-out && \ ldconfig && cd /var/tmp && rm -fr build +WORKDIR /var/tmp/build +RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ + tar -xzf - --strip-components=1 && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=yes \ + -DBUILD_TESTING=OFF \ + -DJSON_BuildTests=OFF \ + -GNinja -S . -B cmake-out && \ + cmake --build cmake-out --target install && \ + ldconfig && cd /var/tmp && rm -fr build + WORKDIR /var/tmp/sccache RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \ tar -zxf - --strip-components=1 && \ diff --git a/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile index 8b674b17cd2f5..2c6d761f16513 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile @@ -46,6 +46,7 @@ RUN apt-get update && \ apt-utils \ ca-certificates \ apt-transport-https + # Install Python packages used in the integration tests. RUN update-alternatives --install /usr/bin/python python $(which python3) 10 RUN pip3 install setuptools wheel @@ -62,6 +63,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -75,6 +77,7 @@ RUN curl -fsSL https://github.com/google/googletest/archive/v1.16.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -S . -B cmake-out -GNinja && \ cmake --build cmake-out --target install && \ @@ -120,11 +123,13 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \ ldconfig && \ cd /var/tmp && rm -fr build + WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -156,16 +161,15 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \ cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/ -RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \ -DBUILD_SHARED_LIBS=ON \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -174,10 +178,11 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20 ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=ON \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ diff --git a/ci/cloudbuild/dockerfiles/ubuntu-24.04.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-24.04.Dockerfile index a67a2f89b646e..3bb1f5fe01e2f 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-24.04.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-24.04.Dockerfile @@ -65,6 +65,6 @@ RUN /var/tmp/ci/install-cloud-sdk.sh ENV CLOUD_SDK_LOCATION=/usr/local/google-cloud-sdk ENV PATH=${CLOUD_SDK_LOCATION}/bin:${PATH} -RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.24.1/bazelisk-linux-${ARCH}" && \ +RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-${ARCH}" && \ chmod +x /usr/bin/bazelisk && \ ln -s /usr/bin/bazelisk /usr/bin/bazel diff --git a/ci/cloudbuild/dockerfiles/ubuntu-focal.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-focal.Dockerfile index ad6690e64454b..32026618237cd 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-focal.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-focal.Dockerfile @@ -67,6 +67,6 @@ RUN /var/tmp/ci/install-cloud-sdk.sh ENV CLOUD_SDK_LOCATION=/usr/local/google-cloud-sdk ENV PATH=${CLOUD_SDK_LOCATION}/bin:${PATH} -RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.24.1/bazelisk-linux-${ARCH}" && \ +RUN curl -o /usr/bin/bazelisk -sSL "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-${ARCH}" && \ chmod +x /usr/bin/bazelisk && \ ln -s /usr/bin/bazelisk /usr/bin/bazel diff --git a/ci/cloudbuild/triggers/asan-ci.yaml b/ci/cloudbuild/triggers/asan-ci.yaml index 4e624d3aebc7a..3ce78b499939f 100644 --- a/ci/cloudbuild/triggers/asan-ci.yaml +++ b/ci/cloudbuild/triggers/asan-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-22T00:38:08.167137222Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: a803727d-8633-49ea-b545-bd7f9124bc3d + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: asan-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a803727d-8633-49ea-b545-bd7f9124bc3d +name: prepare-for-v3-0-0-asan-ci substitutions: _BUILD_NAME: asan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/asan-pr.yaml b/ci/cloudbuild/triggers/asan-pr.yaml index e1b22dbb1abe4..8f5c4638ec148 100644 --- a/ci/cloudbuild/triggers/asan-pr.yaml +++ b/ci/cloudbuild/triggers/asan-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:26.533760362Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 45fd50c2-04f1-4674-b533-0db1346c8b7e includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: asan-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/45fd50c2-04f1-4674-b533-0db1346c8b7e +name: prepare-for-v3-0-0-asan-pr substitutions: _BUILD_NAME: asan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/bazel-oldest-ci.yaml b/ci/cloudbuild/triggers/bazel-oldest-ci.yaml index 31df3bb45423f..593883bb0620c 100644 --- a/ci/cloudbuild/triggers/bazel-oldest-ci.yaml +++ b/ci/cloudbuild/triggers/bazel-oldest-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-02-08T12:44:34.878690706Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 3a7690ee-a385-4e86-835e-990a64eb71d7 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: bazel-oldest-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3a7690ee-a385-4e86-835e-990a64eb71d7 +name: prepare-for-v3-0-0-bazel-oldest-ci substitutions: _BUILD_NAME: bazel-oldest _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/bazel-oldest-pr.yaml b/ci/cloudbuild/triggers/bazel-oldest-pr.yaml index 4f4b2b36421ed..033fcd346e630 100644 --- a/ci/cloudbuild/triggers/bazel-oldest-pr.yaml +++ b/ci/cloudbuild/triggers/bazel-oldest-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-02-08T12:44:28.719440875Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 914bc7a4-afa2-4faf-8a0e-571218e8fd83 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: bazel-oldest-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/914bc7a4-afa2-4faf-8a0e-571218e8fd83 +name: prepare-for-v3-0-0-bazel-oldest-pr substitutions: _BUILD_NAME: bazel-oldest _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml b/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml index af9768ad913c3..8ca1408f2916e 100644 --- a/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml +++ b/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-12-13T16:53:04.793743056Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: abfbaa6f-e1a0-4298-af45-78f9dc1a9831 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: bazel-otel-abi-2-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/abfbaa6f-e1a0-4298-af45-78f9dc1a9831 +name: prepare-for-v3-0-0-bazel-otel-abi-2-ci substitutions: _BUILD_NAME: bazel-otel-abi-2 _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml b/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml index 338f750994701..5089f3d8f811e 100644 --- a/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml +++ b/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml @@ -17,12 +17,10 @@ github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 18b11d89-0625-40ba-897a-ac10462d1c7b includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: bazel-otel-abi-2-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/18b11d89-0625-40ba-897a-ac10462d1c7b +name: prepare-for-v3-0-0-bazel-otel-abi-2-pr substitutions: _BUILD_NAME: bazel-otel-abi-2 _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/bazel-targets-ci.yaml b/ci/cloudbuild/triggers/bazel-targets-ci.yaml index 599e2586bb30d..7f2dfdaa2d7c4 100644 --- a/ci/cloudbuild/triggers/bazel-targets-ci.yaml +++ b/ci/cloudbuild/triggers/bazel-targets-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-26T16:37:27.818296611Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 1f63c286-589b-41cf-aee0-dd0e3cb6861c + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: bazel-targets-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/1f63c286-589b-41cf-aee0-dd0e3cb6861c +name: prepare-for-v3-0-0-bazel-targets-ci substitutions: _BUILD_NAME: bazel-targets _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/bazel-targets-pr.yaml b/ci/cloudbuild/triggers/bazel-targets-pr.yaml index a50efe76ffb8e..18ddcb7ec76be 100644 --- a/ci/cloudbuild/triggers/bazel-targets-pr.yaml +++ b/ci/cloudbuild/triggers/bazel-targets-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-26T16:37:32.709851004Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 95e11a96-2138-4d65-8598-25308f1cf5f8 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: bazel-targets-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/95e11a96-2138-4d65-8598-25308f1cf5f8 +name: prepare-for-v3-0-0-bazel-targets-pr substitutions: _BUILD_NAME: bazel-targets _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/check-api-ci.yaml b/ci/cloudbuild/triggers/check-api-ci.yaml index 1c0314e181c66..6ff8614a3ed3c 100644 --- a/ci/cloudbuild/triggers/check-api-ci.yaml +++ b/ci/cloudbuild/triggers/check-api-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-30T13:51:14.389552861Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 83b375fa-9209-4691-8dcc-a28f7a19dcf2 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: check-api-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/83b375fa-9209-4691-8dcc-a28f7a19dcf2 +name: prepare-for-v3-0-0-check-api-ci substitutions: _BUILD_NAME: check-api _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/check-api-pr.yaml b/ci/cloudbuild/triggers/check-api-pr.yaml index e4a68a40daa43..1b790d75d0e4a 100644 --- a/ci/cloudbuild/triggers/check-api-pr.yaml +++ b/ci/cloudbuild/triggers/check-api-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-30T13:51:18.047210322Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 9d4afe6c-48fc-4bc4-8b40-68312b2c0fec includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: check-api-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/9d4afe6c-48fc-4bc4-8b40-68312b2c0fec +name: prepare-for-v3-0-0-check-api-pr substitutions: _BUILD_NAME: check-api _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/checkers-ci.yaml b/ci/cloudbuild/triggers/checkers-ci.yaml index ad3403e81f633..ad6455b6c1bfa 100644 --- a/ci/cloudbuild/triggers/checkers-ci.yaml +++ b/ci/cloudbuild/triggers/checkers-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-30T00:38:59.589682412Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 2d35a7fd-e273-44d4-b592-fc8810327a27 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: checkers-ci +name: prepare-for-v3-0-0-checkers-ci substitutions: _BUILD_NAME: checkers _DISTRO: checkers diff --git a/ci/cloudbuild/triggers/checkers-pr.yaml b/ci/cloudbuild/triggers/checkers-pr.yaml index 8e1c2a766ee8b..1374b55f8ca37 100644 --- a/ci/cloudbuild/triggers/checkers-pr.yaml +++ b/ci/cloudbuild/triggers/checkers-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:32.194276806Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 746bbc75-cdf8-4172-bb08-0c2335479a8b includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: checkers-pr +name: prepare-for-v3-0-0-checkers-pr substitutions: _BUILD_NAME: checkers _DISTRO: checkers diff --git a/ci/cloudbuild/triggers/clang-7-0-ci.yaml b/ci/cloudbuild/triggers/clang-7-0-ci.yaml index f9e881ba2c41d..b828c24d2a77e 100644 --- a/ci/cloudbuild/triggers/clang-7-0-ci.yaml +++ b/ci/cloudbuild/triggers/clang-7-0-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-06-02T17:19:48.154215116Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: c9060166-f159-46c6-8ac9-4f256759fcb8 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-7-0-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/c9060166-f159-46c6-8ac9-4f256759fcb8 +name: prepare-for-v3-0-0-clang-7-0-ci substitutions: _BUILD_NAME: clang-7.0 _DISTRO: ubuntu-20.04-install diff --git a/ci/cloudbuild/triggers/clang-7-0-pr.yaml b/ci/cloudbuild/triggers/clang-7-0-pr.yaml index 57e61a54dfde2..244cff91b4fcd 100644 --- a/ci/cloudbuild/triggers/clang-7-0-pr.yaml +++ b/ci/cloudbuild/triggers/clang-7-0-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-06-02T17:19:52.984755094Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 8a4c069a-53c0-49bf-ba31-5f3a3c228a42 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-7-0-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8a4c069a-53c0-49bf-ba31-5f3a3c228a42 +name: prepare-for-v3-0-0-clang-7-0-pr substitutions: _BUILD_NAME: clang-7.0 _DISTRO: ubuntu-20.04-install diff --git a/ci/cloudbuild/triggers/clang-cxx20-ci.yaml b/ci/cloudbuild/triggers/clang-cxx20-ci.yaml index f576175518750..2c806e99af69d 100644 --- a/ci/cloudbuild/triggers/clang-cxx20-ci.yaml +++ b/ci/cloudbuild/triggers/clang-cxx20-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2024-02-20T18:40:45.776612692Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: ed6fae7b-7ab3-44b9-b26b-d41de3926e16 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-cxx20-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ed6fae7b-7ab3-44b9-b26b-d41de3926e16 +name: prepare-for-v3-0-0-clang-cxx20-ci substitutions: _BUILD_NAME: clang-cxx20 _DISTRO: fedora-latest-cxx20 diff --git a/ci/cloudbuild/triggers/clang-cxx20-pr.yaml b/ci/cloudbuild/triggers/clang-cxx20-pr.yaml index d91fe98fa40da..513e44ab58772 100644 --- a/ci/cloudbuild/triggers/clang-cxx20-pr.yaml +++ b/ci/cloudbuild/triggers/clang-cxx20-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2024-02-20T18:41:20.365076403Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: b5fb032a-c06d-4369-b42d-98524085d402 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-cxx20-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/b5fb032a-c06d-4369-b42d-98524085d402 +name: prepare-for-v3-0-0-clang-cxx20-pr substitutions: _BUILD_NAME: clang-cxx20 _DISTRO: fedora-latest-cxx20 diff --git a/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml index b954e747a024d..bafe65d6b4b02 100644 --- a/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:38:53.406054685Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 5ad8f0dd-38a8-4a40-aa81-925e0867fef6 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-bigquery-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5ad8f0dd-38a8-4a40-aa81-925e0867fef6 +name: prepare-for-v3-0-0-clang-tidy-bigquery-ci substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml index 3172cac412840..ab16f00d6de26 100644 --- a/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:38:54.756444054Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 94fbc973-ea4b-49e9-a1ce-db3994993675 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-bigquery-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/94fbc973-ea4b-49e9-a1ce-db3994993675 +name: prepare-for-v3-0-0-clang-tidy-bigquery-pr substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-ci.yaml index fc71b6c8eb0dd..963e99a088ec0 100644 --- a/ci/cloudbuild/triggers/clang-tidy-ci.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-22T00:36:44.386437504Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 88b3547a-7d8b-4af2-998f-e2ed284ebaaa + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/88b3547a-7d8b-4af2-998f-e2ed284ebaaa +name: prepare-for-v3-0-0-clang-tidy-ci substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-compute.yaml b/ci/cloudbuild/triggers/clang-tidy-compute.yaml index 3478a8c656eb3..bc83d9d7ca154 100644 --- a/ci/cloudbuild/triggers/clang-tidy-compute.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-compute.yaml @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-07-10T20:41:19.444876272Z' description: Runs clang-tidy on all compute libraries. gitFileSource: path: ci/cloudbuild/cloudbuild.yaml repoType: GITHUB revision: refs/heads/main uri: https://github.com/googleapis/google-cloud-cpp -id: 6d247368-98d8-4b06-9179-afeedd054f50 -name: clang-tidy-compute -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6d247368-98d8-4b06-9179-afeedd054f50 +name: prepare-for-v3-0-0-clang-tidy-compute sourceToBuild: ref: refs/heads/main repoType: GITHUB diff --git a/ci/cloudbuild/triggers/clang-tidy-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-pr.yaml index 3df8445b2199f..d879284ef82e4 100644 --- a/ci/cloudbuild/triggers/clang-tidy-pr.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:36.012514343Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 8448ca7a-edac-4d56-ae23-928897249570 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8448ca7a-edac-4d56-ae23-928897249570 +name: prepare-for-v3-0-0-clang-tidy-pr substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml index 46ec3f0f85b19..e1915efbc7fac 100644 --- a/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:38:56.263489135Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 7bdca032-6ec4-4b7c-9c0b-d04bd19c2ba3 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-pubsub-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7bdca032-6ec4-4b7c-9c0b-d04bd19c2ba3 +name: prepare-for-v3-0-0-clang-tidy-pubsub-ci substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml index 2aa254d3eceb8..00d7f9a164064 100644 --- a/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:38:57.870335767Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 47691835-f91f-42a3-92bf-7820c2eb34f2 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-pubsub-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/47691835-f91f-42a3-92bf-7820c2eb34f2 +name: prepare-for-v3-0-0-clang-tidy-pubsub-pr substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml index aa39e6a6335df..af98d3c402afc 100644 --- a/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:38:59.377179872Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: dcb2a46a-01f9-4b02-8c34-79943099e25f + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-storage-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/dcb2a46a-01f9-4b02-8c34-79943099e25f +name: prepare-for-v3-0-0-clang-tidy-storage-ci substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml index 25a3b368e72b3..14f2af7859fb8 100644 --- a/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:39:00.640655067Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 163b45f9-e55c-48fb-948d-c1f4539f1524 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-storage-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/163b45f9-e55c-48fb-948d-c1f4539f1524 +name: prepare-for-v3-0-0-clang-tidy-storage-pr substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml index f1945eeb1a984..74929c76c2f01 100644 --- a/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:39:02.117138961Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 8be80238-a508-43c4-a1c3-8ce285cbb571 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-tools-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8be80238-a508-43c4-a1c3-8ce285cbb571 +name: prepare-for-v3-0-0-clang-tidy-tools-ci substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml index b220c26c2034b..86a98cefc0b23 100644 --- a/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml +++ b/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-24T17:39:03.693462256Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: cb911c90-e6a6-4440-a1c9-0890cce4565f includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: clang-tidy-tools-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/cb911c90-e6a6-4440-a1c9-0890cce4565f +name: prepare-for-v3-0-0-clang-tidy-tools-pr substitutions: _BUILD_NAME: clang-tidy _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml b/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml index 91b7cd684fc96..26b727708ac5c 100644 --- a/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml +++ b/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-04-28T21:23:21.953441802Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 87c8300c-afd2-419e-b878-2e8ceb7a7496 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-gcs-rest-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/87c8300c-afd2-419e-b878-2e8ceb7a7496 +name: prepare-for-v3-0-0-cmake-gcs-rest-ci substitutions: _BUILD_NAME: cmake-gcs-rest _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml b/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml index f33f31f74bcda..8768d74297c8a 100644 --- a/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml +++ b/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-04-28T21:23:32.712697493Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 4bc5ac63-ff83-4063-b5f6-c1d04c0ce706 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-gcs-rest-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/4bc5ac63-ff83-4063-b5f6-c1d04c0ce706 +name: prepare-for-v3-0-0-cmake-gcs-rest-pr substitutions: _BUILD_NAME: cmake-gcs-rest _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-install-ci.yaml b/ci/cloudbuild/triggers/cmake-install-ci.yaml index 1e9ea8a9d495d..ac1c1155fb541 100644 --- a/ci/cloudbuild/triggers/cmake-install-ci.yaml +++ b/ci/cloudbuild/triggers/cmake-install-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-24T00:02:59.444857698Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 49d3dff1-bee0-4a2b-9bd1-a696d54e48c9 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-install-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/49d3dff1-bee0-4a2b-9bd1-a696d54e48c9 +name: prepare-for-v3-0-0-cmake-install-ci substitutions: _BUILD_NAME: cmake-install _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-install-pr.yaml b/ci/cloudbuild/triggers/cmake-install-pr.yaml index 46529333844cd..d58ea220ad468 100644 --- a/ci/cloudbuild/triggers/cmake-install-pr.yaml +++ b/ci/cloudbuild/triggers/cmake-install-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:41.397491676Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 1e40a006-1073-4d1b-82ca-03528fd3fd51 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-install-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/1e40a006-1073-4d1b-82ca-03528fd3fd51 +name: prepare-for-v3-0-0-cmake-install-pr substitutions: _BUILD_NAME: cmake-install _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml b/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml index a4e015aa1d0c3..7bd0eeaaafec1 100644 --- a/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml +++ b/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-28T12:39:57.322470341Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 64e55546-2701-4234-b348-fe9a4478dd38 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-oldest-deps-ci +name: prepare-for-v3-0-0-cmake-oldest-deps-ci substitutions: _BUILD_NAME: cmake-oldest-deps _DISTRO: ubuntu-focal diff --git a/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml b/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml index f91205e69e765..4e215094ad609 100644 --- a/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml +++ b/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-28T12:39:51.473360103Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 384786a7-5ee5-49e2-8866-369fe55c7d04 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-oldest-deps-pr +name: prepare-for-v3-0-0-cmake-oldest-deps-pr substitutions: _BUILD_NAME: cmake-oldest-deps _DISTRO: ubuntu-focal diff --git a/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml b/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml index 5576c038e3231..d42e9f2fe47f0 100644 --- a/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml +++ b/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-05-06T21:50:55.921332969Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 09d4a76e-0a9f-4ef1-ab7e-de78684c23cc + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-single-feature-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/09d4a76e-0a9f-4ef1-ab7e-de78684c23cc +name: prepare-for-v3-0-0-cmake-single-feature-ci substitutions: _BUILD_NAME: cmake-single-feature _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml b/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml index b51df7d6d4c6b..e0d898c112f84 100644 --- a/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml +++ b/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-05-06T21:51:02.240926631Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 3e376bfc-ab89-4c29-a640-f7f88f756c8c includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-single-feature-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3e376bfc-ab89-4c29-a640-f7f88f756c8c +name: prepare-for-v3-0-0-cmake-single-feature-pr substitutions: _BUILD_NAME: cmake-single-feature _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-split-install-ci.yaml b/ci/cloudbuild/triggers/cmake-split-install-ci.yaml index d76869eee2028..d61d6acb02119 100644 --- a/ci/cloudbuild/triggers/cmake-split-install-ci.yaml +++ b/ci/cloudbuild/triggers/cmake-split-install-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-07-10T15:26:52.770667141Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 0b727502-82fe-41a1-a4e2-73f9375718ad + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-split-install-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/0b727502-82fe-41a1-a4e2-73f9375718ad +name: prepare-for-v3-0-0-cmake-split-install-ci substitutions: _BUILD_NAME: cmake-split-install _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/cmake-split-install-pr.yaml b/ci/cloudbuild/triggers/cmake-split-install-pr.yaml index 0d0a9193291e6..9e19e6053983c 100644 --- a/ci/cloudbuild/triggers/cmake-split-install-pr.yaml +++ b/ci/cloudbuild/triggers/cmake-split-install-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-07-10T15:26:59.182700120Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: a6f49616-83ce-4471-b517-f86c44e09ce5 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cmake-split-install-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a6f49616-83ce-4471-b517-f86c44e09ce5 +name: prepare-for-v3-0-0-cmake-split-install-pr substitutions: _BUILD_NAME: cmake-split-install _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/conformance-ci.yaml b/ci/cloudbuild/triggers/conformance-ci.yaml index c02548500f06f..e1423e131eb2c 100644 --- a/ci/cloudbuild/triggers/conformance-ci.yaml +++ b/ci/cloudbuild/triggers/conformance-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-30T21:38:59.771402989Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 9858e9c0-2f5a-45ad-9e5b-3af30eaf30af + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: conformance-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/9858e9c0-2f5a-45ad-9e5b-3af30eaf30af +name: prepare-for-v3-0-0-conformance-ci substitutions: _BUILD_NAME: conformance _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/conformance-pr.yaml b/ci/cloudbuild/triggers/conformance-pr.yaml index 90c09130c8612..c9fb8a321151c 100644 --- a/ci/cloudbuild/triggers/conformance-pr.yaml +++ b/ci/cloudbuild/triggers/conformance-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-10-30T21:35:19.557214462Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 03976e73-5154-457f-813f-4d33bb162e70 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: conformance-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/03976e73-5154-457f-813f-4d33bb162e70 +name: prepare-for-v3-0-0-conformance-pr substitutions: _BUILD_NAME: conformance _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/coverage-ci.yaml b/ci/cloudbuild/triggers/coverage-ci.yaml index af06ffa89b86c..3e27a5f93c64d 100644 --- a/ci/cloudbuild/triggers/coverage-ci.yaml +++ b/ci/cloudbuild/triggers/coverage-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-16T13:00:27.617873387Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 5c4f383c-11bc-4eb7-a42f-c8d69172caf2 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: coverage-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5c4f383c-11bc-4eb7-a42f-c8d69172caf2 +name: prepare-for-v3-0-0-coverage-ci substitutions: _BUILD_NAME: coverage _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/coverage-pr.yaml b/ci/cloudbuild/triggers/coverage-pr.yaml index a6f08ff1dde82..a41deec35ff49 100644 --- a/ci/cloudbuild/triggers/coverage-pr.yaml +++ b/ci/cloudbuild/triggers/coverage-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-16T13:00:31.944469840Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 0ada9a21-5379-48e2-9e6d-8c388d6333e5 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: coverage-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/0ada9a21-5379-48e2-9e6d-8c388d6333e5 +name: prepare-for-v3-0-0-coverage-pr substitutions: _BUILD_NAME: coverage _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/cxx14-ci.yaml b/ci/cloudbuild/triggers/cxx14-ci.yaml deleted file mode 100644 index 1d828f4ffd743..0000000000000 --- a/ci/cloudbuild/triggers/cxx14-ci.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -createTime: '2022-06-23T15:35:45.803275576Z' -filename: ci/cloudbuild/cloudbuild.yaml -github: - name: google-cloud-cpp - owner: googleapis - push: - branch: ^main$ -id: 23c2a0e2-d64f-4ca4-869a-1064e2549624 -includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cxx14-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/23c2a0e2-d64f-4ca4-869a-1064e2549624 -substitutions: - _BUILD_NAME: cxx14 - _DISTRO: fedora-latest-cxx14 - _TRIGGER_TYPE: ci -tags: -- ci diff --git a/ci/cloudbuild/triggers/cxx14-pr.yaml b/ci/cloudbuild/triggers/cxx14-pr.yaml deleted file mode 100644 index 872298572d48b..0000000000000 --- a/ci/cloudbuild/triggers/cxx14-pr.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -createTime: '2022-06-23T15:35:40.201715614Z' -filename: ci/cloudbuild/cloudbuild.yaml -github: - name: google-cloud-cpp - owner: googleapis - pullRequest: - branch: ^main$ - commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 54861c36-30b4-4c71-81f9-a765a957ef23 -includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cxx14-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/54861c36-30b4-4c71-81f9-a765a957ef23 -substitutions: - _BUILD_NAME: cxx14 - _DISTRO: fedora-latest-cxx14 - _TRIGGER_TYPE: pr -tags: -- pr diff --git a/ci/cloudbuild/triggers/cxx20-ci.yaml b/ci/cloudbuild/triggers/cxx20-ci.yaml index c91ce65b5d020..7fc05aad6297e 100644 --- a/ci/cloudbuild/triggers/cxx20-ci.yaml +++ b/ci/cloudbuild/triggers/cxx20-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-10-21T13:06:18.672990290Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 7471e4f8-769d-48dd-8f6f-253bef7051ef + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cxx20-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7471e4f8-769d-48dd-8f6f-253bef7051ef +name: prepare-for-v3-0-0-cxx20-ci substitutions: _BUILD_NAME: cxx20 _DISTRO: fedora-latest-cxx20 diff --git a/ci/cloudbuild/triggers/cxx20-pr.yaml b/ci/cloudbuild/triggers/cxx20-pr.yaml index 648d65635062b..b8b148d6fa862 100644 --- a/ci/cloudbuild/triggers/cxx20-pr.yaml +++ b/ci/cloudbuild/triggers/cxx20-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-10-21T13:06:28.013633506Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: f4da53f5-3966-45bd-8821-8a43a0804ecc includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: cxx20-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f4da53f5-3966-45bd-8821-8a43a0804ecc +name: prepare-for-v3-0-0-cxx20-pr substitutions: _BUILD_NAME: cxx20 _DISTRO: fedora-latest-cxx20 diff --git a/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml b/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml index 505824c5934b8..c919b655a2aed 100644 --- a/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml +++ b/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-06-24T18:22:48.436591174Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: d5596043-576e-41b2-b324-72805c5983e1 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-alpine-stable-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/d5596043-576e-41b2-b324-72805c5983e1 +name: prepare-for-v3-0-0-demo-alpine-stable-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-alpine-stable diff --git a/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml b/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml index 7e7ae83ac78dd..6d0d2405c097a 100644 --- a/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml +++ b/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-06-24T18:22:53.925960095Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 85f2a500-3643-4ac3-96be-4b824a69762f includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-alpine-stable-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/85f2a500-3643-4ac3-96be-4b824a69762f +name: prepare-for-v3-0-0-demo-alpine-stable-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-alpine-stable diff --git a/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml b/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml index ea8d0346b10aa..a8e95613e1338 100644 --- a/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml +++ b/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-09-09T16:23:55.750964253Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 6e1b6108-8b51-4751-ba8c-59dd82c062dc + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-debian-bookworm-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6e1b6108-8b51-4751-ba8c-59dd82c062dc +name: prepare-for-v3-0-0-demo-debian-bookworm-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-debian-bookworm diff --git a/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml b/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml index 8ededcc7d56a8..9adf60af4fda8 100644 --- a/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml +++ b/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-09-09T16:24:10.043640665Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: f1cbc3fc-d09b-483f-bb4c-0ea3394b334e includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-debian-bookworm-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f1cbc3fc-d09b-483f-bb4c-0ea3394b334e +name: prepare-for-v3-0-0-demo-debian-bookworm-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-debian-bookworm diff --git a/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml b/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml index 32bc2d971ee0a..520e01b32871e 100644 --- a/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml +++ b/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-08-17T14:42:37.946358416Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 99ed51ab-3b42-4046-8698-6ea54b39afaa + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-debian-bullseye-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/99ed51ab-3b42-4046-8698-6ea54b39afaa +name: prepare-for-v3-0-0-demo-debian-bullseye-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-debian-bullseye diff --git a/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml b/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml index a18f67684c95b..a608eae79e4d8 100644 --- a/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml +++ b/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-08-17T14:43:32.603712645Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 3cc016a1-2a35-467a-94af-4eab3822cbfd includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-debian-bullseye-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3cc016a1-2a35-467a-94af-4eab3822cbfd +name: prepare-for-v3-0-0-demo-debian-bullseye-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-debian-bullseye diff --git a/ci/cloudbuild/triggers/demo-fedora-ci.yaml b/ci/cloudbuild/triggers/demo-fedora-ci.yaml index a8d5d0048ed6d..5909efa785e60 100644 --- a/ci/cloudbuild/triggers/demo-fedora-ci.yaml +++ b/ci/cloudbuild/triggers/demo-fedora-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-13T23:35:58.117686333Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: efe44360-59b3-4784-96f6-ebe03ecdd2f7 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-fedora-ci +name: prepare-for-v3-0-0-demo-fedora-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-fedora diff --git a/ci/cloudbuild/triggers/demo-fedora-pr.yaml b/ci/cloudbuild/triggers/demo-fedora-pr.yaml index f622b52d16894..6c1b8f6acfaf4 100644 --- a/ci/cloudbuild/triggers/demo-fedora-pr.yaml +++ b/ci/cloudbuild/triggers/demo-fedora-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-13T23:35:59.268915688Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 182e01a3-0956-47bc-9a8a-023318168962 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-fedora-pr +name: prepare-for-v3-0-0-demo-fedora-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-fedora diff --git a/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml b/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml index ae9bcd864c143..be28f6ff6ffd9 100644 --- a/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml +++ b/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-13T23:36:00.260269718Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 3b91bcd6-80af-4aa0-9e64-60047f5a65f5 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-opensuse-leap-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3b91bcd6-80af-4aa0-9e64-60047f5a65f5 +name: prepare-for-v3-0-0-demo-opensuse-leap-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-opensuse-leap diff --git a/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml b/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml index 8f9130fc2a1b4..f60a16468f3cc 100644 --- a/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml +++ b/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-13T23:36:01.288217115Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: f18095de-383b-45bd-835e-06a70adbf296 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-opensuse-leap-pr +name: prepare-for-v3-0-0-demo-opensuse-leap-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-opensuse-leap diff --git a/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml b/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml index 688a3c84594c9..becf504d6ef5e 100644 --- a/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml +++ b/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-11-09T20:49:08.012480312Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: de5ea0bf-fef1-433d-aa17-4cb50ab8278b + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-rockylinux-9-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/de5ea0bf-fef1-433d-aa17-4cb50ab8278b +name: prepare-for-v3-0-0-demo-rockylinux-9-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-rockylinux-9 diff --git a/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml b/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml index 80128088e5b7e..ff38c00d9cf20 100644 --- a/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml +++ b/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-11-09T20:49:14.519880680Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 55c2722f-ba23-4b27-af94-cee7095098e2 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-rockylinux-9-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/55c2722f-ba23-4b27-af94-cee7095098e2 +name: prepare-for-v3-0-0-demo-rockylinux-9-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-rockylinux-9 diff --git a/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml index 76f3eba809deb..f7f7a77804245 100644 --- a/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml +++ b/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2024-04-29T15:41:19.785339726Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 93fdf9e2-71b2-44a1-911e-13dca09cbd7c + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-ubuntu-24-04-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/93fdf9e2-71b2-44a1-911e-13dca09cbd7c +name: prepare-for-v3-0-0-demo-ubuntu-24-04-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-ubuntu-24.04 diff --git a/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml index a3cc011fc7e9e..8ec5b151c6ab8 100644 --- a/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml +++ b/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2024-04-29T15:40:53.593998357Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 4e65bb4a-0deb-4e5c-a074-f628fa012f13 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-ubuntu-24-04-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/4e65bb4a-0deb-4e5c-a074-f628fa012f13 +name: prepare-for-v3-0-0-demo-ubuntu-24-04-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-ubuntu-24.04 diff --git a/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml index 9c435a293efba..995d197ea7b9a 100644 --- a/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml +++ b/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-13T23:36:04.667175923Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 0294a1e2-044b-45d5-8ba0-6806c93b3a72 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-ubuntu-focal-ci +name: prepare-for-v3-0-0-demo-ubuntu-focal-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-ubuntu-focal diff --git a/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml index 639e4e8ac38c5..e63f7d7ed29ad 100644 --- a/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml +++ b/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-13T23:36:05.750350763Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 22188f98-620b-4a43-b5f7-34f206d70062 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-ubuntu-focal-pr +name: prepare-for-v3-0-0-demo-ubuntu-focal-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-ubuntu-focal diff --git a/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml index 750bbb568dc53..fd52ed4e7bb07 100644 --- a/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml +++ b/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-05-13T19:36:13.788953133Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: a646ace3-c0a6-4acf-8e42-72c8d2aece0c + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-ubuntu-jammy-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a646ace3-c0a6-4acf-8e42-72c8d2aece0c +name: prepare-for-v3-0-0-demo-ubuntu-jammy-ci substitutions: _BUILD_NAME: demo-install _DISTRO: demo-ubuntu-jammy diff --git a/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml index 866f7a55a244a..c2d077ef36f19 100644 --- a/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml +++ b/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-05-13T19:36:14.958592625Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: f190d45e-015f-4e09-bc3f-864aebf18316 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: demo-ubuntu-jammy-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f190d45e-015f-4e09-bc3f-864aebf18316 +name: prepare-for-v3-0-0-demo-ubuntu-jammy-pr substitutions: _BUILD_NAME: demo-install _DISTRO: demo-ubuntu-jammy diff --git a/ci/cloudbuild/triggers/gcc-oldest-ci.yaml b/ci/cloudbuild/triggers/gcc-oldest-ci.yaml index 4a3f90949fe28..859ed360cdd7f 100644 --- a/ci/cloudbuild/triggers/gcc-oldest-ci.yaml +++ b/ci/cloudbuild/triggers/gcc-oldest-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2024-07-02T17:49:31.595592561Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 71fc938d-2480-4bdb-b274-eb0bf3a3ed1b + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: gcc-oldest-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/71fc938d-2480-4bdb-b274-eb0bf3a3ed1b +name: prepare-for-v3-0-0-gcc-oldest-ci substitutions: _BUILD_NAME: gcc-oldest _DISTRO: gcc-oldest diff --git a/ci/cloudbuild/triggers/gcc-oldest-pr.yaml b/ci/cloudbuild/triggers/gcc-oldest-pr.yaml index 5f2ddeb348c6f..01224b0745024 100644 --- a/ci/cloudbuild/triggers/gcc-oldest-pr.yaml +++ b/ci/cloudbuild/triggers/gcc-oldest-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2024-07-02T17:51:28.002279385Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: d2015e6f-b0c4-46a4-afc6-d1ac99c4abea includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: gcc-oldest-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/d2015e6f-b0c4-46a4-afc6-d1ac99c4abea +name: prepare-for-v3-0-0-gcc-oldest-pr substitutions: _BUILD_NAME: gcc-oldest _DISTRO: gcc-oldest diff --git a/ci/cloudbuild/triggers/generate-libraries-ci.yaml b/ci/cloudbuild/triggers/generate-libraries-ci.yaml index 032b0fe9af591..5b987787e09fc 100644 --- a/ci/cloudbuild/triggers/generate-libraries-ci.yaml +++ b/ci/cloudbuild/triggers/generate-libraries-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-23T21:24:08.230967530Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 11fcbd32-d016-4661-ba98-31c65277739c + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: generate-libraries-ci +name: prepare-for-v3-0-0-generate-libraries-ci substitutions: _BUILD_NAME: generate-libraries _DISTRO: checkers diff --git a/ci/cloudbuild/triggers/generate-libraries-pr.yaml b/ci/cloudbuild/triggers/generate-libraries-pr.yaml index 0fd7ad36c90c4..9b0b0b6e96d56 100644 --- a/ci/cloudbuild/triggers/generate-libraries-pr.yaml +++ b/ci/cloudbuild/triggers/generate-libraries-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-23T21:24:15.931797724Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 6dc01f3c-7ccc-422f-8adb-2de0478853b3 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: generate-libraries-pr +name: prepare-for-v3-0-0-generate-libraries-pr substitutions: _BUILD_NAME: generate-libraries _DISTRO: checkers diff --git a/ci/cloudbuild/triggers/grpc-at-head.yaml b/ci/cloudbuild/triggers/grpc-at-head.yaml index 6a7540265f2e4..00f717b84709e 100644 --- a/ci/cloudbuild/triggers/grpc-at-head.yaml +++ b/ci/cloudbuild/triggers/grpc-at-head.yaml @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-03-27T18:47:54.336916197Z' description: Compiles using gRPC at HEAD gitFileSource: path: ci/cloudbuild/cloudbuild.yaml repoType: GITHUB revision: refs/heads/main uri: https://github.com/googleapis/google-cloud-cpp -id: e21f4d09-213f-41ef-9be5-62309adf4287 -name: grpc-at-head -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/e21f4d09-213f-41ef-9be5-62309adf4287 +name: prepare-for-v3-0-0-grpc-at-head sourceToBuild: ref: refs/heads/main repoType: GITHUB diff --git a/ci/cloudbuild/triggers/integration-daily.yaml b/ci/cloudbuild/triggers/integration-daily.yaml index 6bb4b4101b872..32e0830882da5 100644 --- a/ci/cloudbuild/triggers/integration-daily.yaml +++ b/ci/cloudbuild/triggers/integration-daily.yaml @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-26T23:11:01.303393604Z' description: Runs the slow integration tests gitFileSource: path: ci/cloudbuild/cloudbuild.yaml repoType: GITHUB revision: refs/heads/main uri: https://github.com/googleapis/google-cloud-cpp -id: 03b9bb52-8d28-4095-9ca4-653f8602acf7 -name: integration-daily -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/03b9bb52-8d28-4095-9ca4-653f8602acf7 +name: prepare-for-v3-0-0-integration-daily sourceToBuild: ref: refs/heads/main repoType: GITHUB diff --git a/ci/cloudbuild/triggers/integration-production-ci.yaml b/ci/cloudbuild/triggers/integration-production-ci.yaml index 7c22f06458c91..50af2915e2b37 100644 --- a/ci/cloudbuild/triggers/integration-production-ci.yaml +++ b/ci/cloudbuild/triggers/integration-production-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-02-10T22:16:26.551396759Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: ee3bb11b-6d26-4c21-a5fb-aeca37c2deb8 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: integration-production-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ee3bb11b-6d26-4c21-a5fb-aeca37c2deb8 +name: prepare-for-v3-0-0-integration-production-ci substitutions: _BUILD_NAME: integration-production _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/integration-production-pr.yaml b/ci/cloudbuild/triggers/integration-production-pr.yaml index 3ffd9c67bae97..5d1def6f2791a 100644 --- a/ci/cloudbuild/triggers/integration-production-pr.yaml +++ b/ci/cloudbuild/triggers/integration-production-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-02-10T22:16:19.911913669Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 60e90544-5856-457c-b293-d9bade69c132 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: integration-production-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/60e90544-5856-457c-b293-d9bade69c132 +name: prepare-for-v3-0-0-integration-production-pr substitutions: _BUILD_NAME: integration-production _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/libcxx-ci.yaml b/ci/cloudbuild/triggers/libcxx-ci.yaml index 0fc1a57d02c30..3bc3507a6fa91 100644 --- a/ci/cloudbuild/triggers/libcxx-ci.yaml +++ b/ci/cloudbuild/triggers/libcxx-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-14T19:46:44.349528722Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 431b657a-77ea-4448-8f1f-16af521409e5 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: libcxx-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/431b657a-77ea-4448-8f1f-16af521409e5 +name: prepare-for-v3-0-0-libcxx-ci substitutions: _BUILD_NAME: libcxx _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/libcxx-pr.yaml b/ci/cloudbuild/triggers/libcxx-pr.yaml index 12c49e687492c..9afa404c9c26f 100644 --- a/ci/cloudbuild/triggers/libcxx-pr.yaml +++ b/ci/cloudbuild/triggers/libcxx-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-14T19:46:45.308277299Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: bb2d6a6f-9cf9-493a-bcbc-b7c0b60514a6 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: libcxx-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/bb2d6a6f-9cf9-493a-bcbc-b7c0b60514a6 +name: prepare-for-v3-0-0-libcxx-pr substitutions: _BUILD_NAME: libcxx _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/m32-ci.yaml b/ci/cloudbuild/triggers/m32-ci.yaml index 98c6f632d9945..47b596534c238 100644 --- a/ci/cloudbuild/triggers/m32-ci.yaml +++ b/ci/cloudbuild/triggers/m32-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-02-08T12:05:48.696628316Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: b3c7d288-1474-4114-9a12-4d07d25a541e + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: m32-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/b3c7d288-1474-4114-9a12-4d07d25a541e +name: prepare-for-v3-0-0-m32-ci substitutions: _BUILD_NAME: m32 _DISTRO: fedora-m32 diff --git a/ci/cloudbuild/triggers/m32-pr.yaml b/ci/cloudbuild/triggers/m32-pr.yaml index b608731b732bb..37ed8c470cf9a 100644 --- a/ci/cloudbuild/triggers/m32-pr.yaml +++ b/ci/cloudbuild/triggers/m32-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-02-08T12:05:52.742100534Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 5eaadd40-1942-4c3f-b3ac-b4feae945a54 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: m32-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5eaadd40-1942-4c3f-b3ac-b4feae945a54 +name: prepare-for-v3-0-0-m32-pr substitutions: _BUILD_NAME: m32 _DISTRO: fedora-m32 diff --git a/ci/cloudbuild/triggers/msan-ci.yaml b/ci/cloudbuild/triggers/msan-ci.yaml index 30164fa9eba24..890abd81fb15b 100644 --- a/ci/cloudbuild/triggers/msan-ci.yaml +++ b/ci/cloudbuild/triggers/msan-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-15T01:54:43.175858386Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 6a79664d-8602-4312-9c33-810683d8f847 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: msan-ci +name: prepare-for-v3-0-0-msan-ci substitutions: _BUILD_NAME: msan _DISTRO: fedora-msan diff --git a/ci/cloudbuild/triggers/msan-pr.yaml b/ci/cloudbuild/triggers/msan-pr.yaml index cf775a9ab4704..d8d1e3ae5e0f8 100644 --- a/ci/cloudbuild/triggers/msan-pr.yaml +++ b/ci/cloudbuild/triggers/msan-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-15T01:54:38.313691225Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: d9988eca-23ae-4b44-ad1f-ae38b12d5987 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: msan-pr +name: prepare-for-v3-0-0-msan-pr substitutions: _BUILD_NAME: msan _DISTRO: fedora-msan diff --git a/ci/cloudbuild/triggers/noex-ci.yaml b/ci/cloudbuild/triggers/noex-ci.yaml index fb5c1adb8185d..9a2449c08f084 100644 --- a/ci/cloudbuild/triggers/noex-ci.yaml +++ b/ci/cloudbuild/triggers/noex-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-14T14:41:37.760841534Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: ab963829-28af-4d7c-8aa4-e2598f8b8862 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: noex-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ab963829-28af-4d7c-8aa4-e2598f8b8862 +name: prepare-for-v3-0-0-noex-ci substitutions: _BUILD_NAME: noex _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/noex-pr.yaml b/ci/cloudbuild/triggers/noex-pr.yaml index 0870e554ca8aa..f86d589f0505e 100644 --- a/ci/cloudbuild/triggers/noex-pr.yaml +++ b/ci/cloudbuild/triggers/noex-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-14T14:41:33.605980616Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: da93fa8a-46af-4274-b397-ac1cc33c46c5 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: noex-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/da93fa8a-46af-4274-b397-ac1cc33c46c5 +name: prepare-for-v3-0-0-noex-pr substitutions: _BUILD_NAME: noex _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml b/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml deleted file mode 100644 index 81d34aa9b4c73..0000000000000 --- a/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -createTime: '2022-11-29T04:06:34.344761147Z' -filename: ci/cloudbuild/cloudbuild.yaml -github: - name: google-cloud-cpp - owner: googleapis - push: - branch: ^main$ -id: 95ef05ac-0f7d-46b6-ae3c-bf9e3b1bd342 -includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: otel-disabled-bazel-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/95ef05ac-0f7d-46b6-ae3c-bf9e3b1bd342 -substitutions: - _BUILD_NAME: otel-disabled-bazel - _DISTRO: fedora-latest-bazel - _TRIGGER_TYPE: ci -tags: -- ci diff --git a/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml b/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml deleted file mode 100644 index c23e51ca34edf..0000000000000 --- a/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -createTime: '2022-11-29T04:06:20.679878755Z' -filename: ci/cloudbuild/cloudbuild.yaml -github: - name: google-cloud-cpp - owner: googleapis - pullRequest: - branch: ^main$ - commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: e645a8df-6b2c-4911-a192-e36e6d8935b6 -includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: otel-disabled-bazel-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/e645a8df-6b2c-4911-a192-e36e6d8935b6 -substitutions: - _BUILD_NAME: otel-disabled-bazel - _DISTRO: fedora-latest-bazel - _TRIGGER_TYPE: pr -tags: -- pr diff --git a/ci/cloudbuild/triggers/protobuf-at-head.yaml b/ci/cloudbuild/triggers/protobuf-at-head.yaml index c2f1d9a6d247d..10b28bf134d86 100644 --- a/ci/cloudbuild/triggers/protobuf-at-head.yaml +++ b/ci/cloudbuild/triggers/protobuf-at-head.yaml @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-06-13T12:46:50.379194817Z' description: Compiles using gRPC at HEAD gitFileSource: path: ci/cloudbuild/cloudbuild.yaml repoType: GITHUB revision: refs/heads/main uri: https://github.com/googleapis/google-cloud-cpp -id: 7dc9cea4-9d0b-4d0f-9947-5b79bfee5c12 -name: protobuf-at-head -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7dc9cea4-9d0b-4d0f-9947-5b79bfee5c12 +name: prepare-for-v3-0-0-protobuf-at-head sourceToBuild: ref: refs/heads/main repoType: GITHUB diff --git a/ci/cloudbuild/triggers/publish-docs-ci.yaml b/ci/cloudbuild/triggers/publish-docs-ci.yaml index 06c8d2a99eff9..74a9d891855b0 100644 --- a/ci/cloudbuild/triggers/publish-docs-ci.yaml +++ b/ci/cloudbuild/triggers/publish-docs-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-23T19:47:54.365241453Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: ee436bb0-22ab-407d-ab69-2a73aec2566d + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: publish-docs-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ee436bb0-22ab-407d-ab69-2a73aec2566d +name: prepare-for-v3-0-0-publish-docs-ci substitutions: _BUILD_NAME: publish-docs _DISTRO: fedora-latest-publish-docs diff --git a/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml b/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml index 4f1ddfb1d58cb..7b95a7e57e3c0 100644 --- a/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml +++ b/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2023-08-28T23:51:12.027081210Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 30ee0e3e-4eed-4b33-8786-47baae4947c1 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: publish-docs-compute-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/30ee0e3e-4eed-4b33-8786-47baae4947c1 +name: prepare-for-v3-0-0-publish-docs-compute-pr substitutions: _BUILD_NAME: publish-docs _DISTRO: fedora-latest-publish-docs diff --git a/ci/cloudbuild/triggers/publish-docs-pr.yaml b/ci/cloudbuild/triggers/publish-docs-pr.yaml index 91234eb86db42..f0f05af99fcb5 100644 --- a/ci/cloudbuild/triggers/publish-docs-pr.yaml +++ b/ci/cloudbuild/triggers/publish-docs-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-23T21:24:42.026459567Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 7957a267-70de-4e1b-a6b9-99469602a8af includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: publish-docs-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7957a267-70de-4e1b-a6b9-99469602a8af +name: prepare-for-v3-0-0-publish-docs-pr substitutions: _BUILD_NAME: publish-docs _DISTRO: fedora-latest-publish-docs diff --git a/ci/cloudbuild/triggers/publish-docs-release.yaml b/ci/cloudbuild/triggers/publish-docs-release.yaml index f2f64840f1708..5d9b40c297e89 100644 --- a/ci/cloudbuild/triggers/publish-docs-release.yaml +++ b/ci/cloudbuild/triggers/publish-docs-release.yaml @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-11-02T14:12:26.217489944Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^v2.*.x$ -id: d8deccfb-08d6-4ab7-b8fe-1d59c2d346ea -name: publish-docs-release -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/d8deccfb-08d6-4ab7-b8fe-1d59c2d346ea + branch: prepare-for-v3.0.0 +name: prepare-for-v3-0-0-publish-docs-release substitutions: _BUILD_NAME: publish-docs _DISTRO: fedora-latest-publish-docs diff --git a/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml b/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml index 7f76a05047241..ba9bcbca38a79 100644 --- a/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml +++ b/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-29T23:07:34.524944837Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 1967685b-bdf1-48e2-abe5-593db92382ef + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: quickstart-bazel-ci +name: prepare-for-v3-0-0-quickstart-bazel-ci substitutions: _BUILD_NAME: quickstart-bazel _DISTRO: ubuntu-24.04 diff --git a/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml b/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml index 35e3d24f2b615..e1a9a078e8b65 100644 --- a/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml +++ b/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:48.096780282Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 77afa7e6-cfd6-46c4-9b38-a943a61335ca includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: quickstart-bazel-pr +name: prepare-for-v3-0-0-quickstart-bazel-pr substitutions: _BUILD_NAME: quickstart-bazel _DISTRO: ubuntu-24.04 diff --git a/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml b/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml index 76d7afc27e182..dffe86ebb5886 100644 --- a/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml +++ b/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-29T23:07:43.402748254Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: ff22d673-dc4c-4330-922e-d43be27ef2b4 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: quickstart-cmake-ci +name: prepare-for-v3-0-0-quickstart-cmake-ci substitutions: _BUILD_NAME: quickstart-cmake _DISTRO: ubuntu-focal diff --git a/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml b/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml index 66d23059e1546..6284043f383b0 100644 --- a/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml +++ b/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml @@ -12,17 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:49.856898769Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 94aaedf9-cbc3-4b7b-b571-a6281587d358 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: quickstart-cmake-pr +name: prepare-for-v3-0-0-quickstart-cmake-pr substitutions: _BUILD_NAME: quickstart-cmake _DISTRO: ubuntu-focal diff --git a/ci/cloudbuild/triggers/quickstart-production-ci.yaml b/ci/cloudbuild/triggers/quickstart-production-ci.yaml index d65a6f0ea9fa6..bb93cc4bb59e6 100644 --- a/ci/cloudbuild/triggers/quickstart-production-ci.yaml +++ b/ci/cloudbuild/triggers/quickstart-production-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-02-11T02:48:03.262626422Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: f516d42a-ed88-432f-9ee7-5e4ac4d5c676 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: quickstart-production-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f516d42a-ed88-432f-9ee7-5e4ac4d5c676 +name: prepare-for-v3-0-0-quickstart-production-ci substitutions: _BUILD_NAME: quickstart-production _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/quickstart-production-pr.yaml b/ci/cloudbuild/triggers/quickstart-production-pr.yaml index 61c5159c0fd5d..0824ae4c48d46 100644 --- a/ci/cloudbuild/triggers/quickstart-production-pr.yaml +++ b/ci/cloudbuild/triggers/quickstart-production-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2022-02-11T02:48:08.775499777Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: e373a802-f341-4559-bb55-7ec64f1ee825 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: quickstart-production-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/e373a802-f341-4559-bb55-7ec64f1ee825 +name: prepare-for-v3-0-0-quickstart-production-pr substitutions: _BUILD_NAME: quickstart-production _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/rotate-keys.yaml b/ci/cloudbuild/triggers/rotate-keys.yaml index 6fe036a1ab2ba..41fe411793b27 100644 --- a/ci/cloudbuild/triggers/rotate-keys.yaml +++ b/ci/cloudbuild/triggers/rotate-keys.yaml @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-23T00:24:28.311789386Z' description: Rotates the SA keys used by the GCS integration test gitFileSource: path: ci/cloudbuild/cloudbuild.yaml repoType: GITHUB revision: refs/heads/main uri: https://github.com/googleapis/google-cloud-cpp -id: 3fca51de-ec4c-453f-9693-5ccec556a379 -name: rotate-keys -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3fca51de-ec4c-453f-9693-5ccec556a379 +name: prepare-for-v3-0-0-rotate-keys sourceToBuild: ref: refs/heads/main repoType: GITHUB diff --git a/ci/cloudbuild/triggers/shared-ci.yaml b/ci/cloudbuild/triggers/shared-ci.yaml index 008946395d067..d91a092709fbb 100644 --- a/ci/cloudbuild/triggers/shared-ci.yaml +++ b/ci/cloudbuild/triggers/shared-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-16T17:54:50.114636655Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 876841fe-996a-4b64-a080-62b05313b8ff + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: shared-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/876841fe-996a-4b64-a080-62b05313b8ff +name: prepare-for-v3-0-0-shared-ci substitutions: _BUILD_NAME: shared _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/shared-pr.yaml b/ci/cloudbuild/triggers/shared-pr.yaml index 403320d3b4727..472f75c268c4c 100644 --- a/ci/cloudbuild/triggers/shared-pr.yaml +++ b/ci/cloudbuild/triggers/shared-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-16T17:54:51.132738909Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 0a6fec60-47ba-4795-979b-4aec54e16d1a includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: shared-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/0a6fec60-47ba-4795-979b-4aec54e16d1a +name: prepare-for-v3-0-0-shared-pr substitutions: _BUILD_NAME: shared _DISTRO: fedora-latest-cmake diff --git a/ci/cloudbuild/triggers/tsan-ci.yaml b/ci/cloudbuild/triggers/tsan-ci.yaml index a58bf045dc09f..f0b8d80ed9d32 100644 --- a/ci/cloudbuild/triggers/tsan-ci.yaml +++ b/ci/cloudbuild/triggers/tsan-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-30T01:00:00.841245060Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: de7c77d3-385d-48b6-a6e8-9dda0c171716 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: tsan-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/de7c77d3-385d-48b6-a6e8-9dda0c171716 +name: prepare-for-v3-0-0-tsan-ci substitutions: _BUILD_NAME: tsan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/tsan-pr.yaml b/ci/cloudbuild/triggers/tsan-pr.yaml index 41f3d6d016aa5..771703fccbc80 100644 --- a/ci/cloudbuild/triggers/tsan-pr.yaml +++ b/ci/cloudbuild/triggers/tsan-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:51.542576617Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: ea400a9b-879a-4e13-a4b3-9109825d6e99 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: tsan-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ea400a9b-879a-4e13-a4b3-9109825d6e99 +name: prepare-for-v3-0-0-tsan-pr substitutions: _BUILD_NAME: tsan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/ubsan-ci.yaml b/ci/cloudbuild/triggers/ubsan-ci.yaml index 7cbb2d8d1eeab..e2de1f8c901cb 100644 --- a/ci/cloudbuild/triggers/ubsan-ci.yaml +++ b/ci/cloudbuild/triggers/ubsan-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-28T18:40:21.563522491Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: f61a17f2-316f-4ba5-a56a-5abd55e3da83 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: ubsan-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f61a17f2-316f-4ba5-a56a-5abd55e3da83 +name: prepare-for-v3-0-0-ubsan-ci substitutions: _BUILD_NAME: ubsan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/ubsan-pr.yaml b/ci/cloudbuild/triggers/ubsan-pr.yaml index 61d4e03aa8f6b..f076f0310f502 100644 --- a/ci/cloudbuild/triggers/ubsan-pr.yaml +++ b/ci/cloudbuild/triggers/ubsan-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:53.351255451Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 6e77e431-c822-40c7-a8de-7860b4b0fc69 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: ubsan-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6e77e431-c822-40c7-a8de-7860b4b0fc69 +name: prepare-for-v3-0-0-ubsan-pr substitutions: _BUILD_NAME: ubsan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/universe-domain-ci.yaml b/ci/cloudbuild/triggers/universe-domain-ci.yaml index 860a7bee6332d..aa7d502bb7350 100644 --- a/ci/cloudbuild/triggers/universe-domain-ci.yaml +++ b/ci/cloudbuild/triggers/universe-domain-ci.yaml @@ -17,8 +17,8 @@ github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -name: universe-domain-ci + branch: prepare-for-v3.0.0 +name: prepare-for-v3-0-0-universe-domain-ci substitutions: _BUILD_NAME: universe-domain _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/universe-domain-pr.yaml b/ci/cloudbuild/triggers/universe-domain-pr.yaml index 61b0926549a7d..37e5eabc531a2 100644 --- a/ci/cloudbuild/triggers/universe-domain-pr.yaml +++ b/ci/cloudbuild/triggers/universe-domain-pr.yaml @@ -17,9 +17,9 @@ github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -name: universe-domain-pr +name: prepare-for-v3-0-0-universe-domain-pr substitutions: _BUILD_NAME: universe-domain _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/xsan-ci.yaml b/ci/cloudbuild/triggers/xsan-ci.yaml index 17489a5295092..59d3705c862db 100644 --- a/ci/cloudbuild/triggers/xsan-ci.yaml +++ b/ci/cloudbuild/triggers/xsan-ci.yaml @@ -12,17 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-03-23T16:27:32.983843488Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis push: - branch: ^main$ -id: 7af338de-c46d-41ff-a96b-f58e3b720fc5 + branch: prepare-for-v3.0.0 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: xsan-ci -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7af338de-c46d-41ff-a96b-f58e3b720fc5 +name: prepare-for-v3-0-0-xsan-ci substitutions: _BUILD_NAME: xsan _DISTRO: fedora-latest-bazel diff --git a/ci/cloudbuild/triggers/xsan-pr.yaml b/ci/cloudbuild/triggers/xsan-pr.yaml index 6cd9595b22baa..333063c848d32 100644 --- a/ci/cloudbuild/triggers/xsan-pr.yaml +++ b/ci/cloudbuild/triggers/xsan-pr.yaml @@ -12,18 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -createTime: '2021-04-09T18:15:54.945301389Z' filename: ci/cloudbuild/cloudbuild.yaml github: name: google-cloud-cpp owner: googleapis pullRequest: - branch: ^main$ + branch: prepare-for-v3.0.0 commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY -id: 679ab848-3bcc-4e46-b4e5-4cd86d4b1405 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS -name: xsan-pr -resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/679ab848-3bcc-4e46-b4e5-4cd86d4b1405 +name: prepare-for-v3-0-0-xsan-pr substitutions: _BUILD_NAME: xsan _DISTRO: fedora-latest-bazel diff --git a/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/fix-target_link.patch b/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/fix-target_link.patch new file mode 100644 index 0000000000000..f4709e8b1c28f --- /dev/null +++ b/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/fix-target_link.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/opentracing-cpp.cmake b/cmake/opentracing-cpp.cmake +index f014ecd..fd8898a 100644 +--- a/cmake/opentracing-cpp.cmake ++++ b/cmake/opentracing-cpp.cmake +@@ -1,7 +1,11 @@ + # Copyright The OpenTelemetry Authors + # SPDX-License-Identifier: Apache-2.0 + +-find_package(OpenTracing CONFIG QUIET) ++find_package(OpenTracing CONFIG REQUIRED) ++if(NOT TARGET OpenTracing::opentracing AND TARGET OpenTracing::opentracing-static) ++ add_library(OpenTracing::opentracing ALIAS OpenTracing::opentracing-static) ++endif() ++ + set(OpenTracing_PROVIDER "find_package") + + if(NOT OpenTracing_FOUND) diff --git a/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/portfile.cmake b/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/portfile.cmake new file mode 100644 index 0000000000000..c8bb4f68fce6a --- /dev/null +++ b/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/portfile.cmake @@ -0,0 +1,135 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif () + +vcpkg_from_github( + OUT_SOURCE_PATH + SOURCE_PATH + REPO + open-telemetry/opentelemetry-cpp + REF + "v${VERSION}" + SHA512 + 6dc0357d8b3410852d3f970f72b8bec59dba9d6c533ca600432102e65de161903bd9170d98cef7ff0af5191309577ffd2a69ccd004b840914a910a6a282204e4 + HEAD_REF + main + PATCHES + fix-target_link.patch) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + etw + WITH_ETW + zipkin + WITH_ZIPKIN + prometheus + WITH_PROMETHEUS + elasticsearch + WITH_ELASTICSEARCH + otlp-file + WITH_OTLP_FILE + otlp-http + WITH_OTLP_HTTP + otlp-grpc + WITH_OTLP_GRPC + geneva + WITH_GENEVA + user-events + WITH_USER_EVENTS + opentracing + WITH_OPENTRACING + INVERTED_FEATURES + user-events + BUILD_TRACEPOINTS) + +# opentelemetry-proto is a third party submodule and opentelemetry-cpp release +# did not pack it. +if (WITH_OTLP_FILE + OR WITH_OTLP_GRPC + OR WITH_OTLP_HTTP) + set(OTEL_PROTO_VERSION "1.6.0") + vcpkg_download_distfile( + ARCHIVE + URLS + "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" + FILENAME + "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" + SHA512 + 0e72e0c32d2d699d7a832a4c57a9dbe60e844d4c4e8d7b39eb45e4282cde89fccfeef893eae70b9d018643782090a7228c3ef60863b00747498e80f0cf1db8ae + ) + + vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") + file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") + file(COPY "${src}/." + DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto") + # Create empty .git directory to prevent opentelemetry from cloning it + # during build time + file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") + list( + APPEND + FEATURE_OPTIONS + "-DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif () +list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=17) +list(APPEND FEATURE_OPTIONS -DWITH_STL=CXX17) + +set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "OFF") + +if (WITH_GENEVA OR WITH_USER_EVENTS) + # Geneva and user events exporters from opentelemetry-cpp-contrib are + # tightly coupled with opentelemetry-cpp repo, so they should be ported as a + # feature under opentelemetry-cpp. + clone_opentelemetry_cpp_contrib(CONTRIB_SOURCE_PATH) + + if (WITH_GENEVA) + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS + "${CONTRIB_SOURCE_PATH}/exporters/geneva") + if (VCPKG_TARGET_IS_WINDOWS) + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS + "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/geneva-trace" + ) + else () + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS + "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/fluentd" + ) + endif () + endif () + + if (WITH_USER_EVENTS) + if (WITH_GENEVA) + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS + "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/user_events" + ) + else () + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS + "${CONTRIB_SOURCE_PATH}/exporters/user_events") + endif () + endif () +endif () + +vcpkg_cmake_configure( + SOURCE_PATH + "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DWITH_EXAMPLES=OFF + -DOPENTELEMETRY_INSTALL=ON + -DWITH_BENCHMARK=OFF + -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH=${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS} + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + WITH_GENEVA + WITH_USER_EVENTS + BUILD_TRACEPOINTS + gRPC_CPP_PLUGIN_EXECUTABLE) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/vcpkg.json b/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/vcpkg.json new file mode 100644 index 0000000000000..0570a7bd2e108 --- /dev/null +++ b/ci/etc/oldest-deps/overlay-ports/opentelemetry-cpp/vcpkg.json @@ -0,0 +1,108 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "opentelemetry-cpp", + "version-semver": "1.23.0", + "description": [ + "OpenTelemetry is a collection of tools, APIs, and SDKs.", + "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." + ], + "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", + "license": "Apache-2.0", + "dependencies": [ + "abseil", + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "elasticsearch": { + "description": "Whether to include the Elasticsearch Client in the SDK", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] + }, + "etw": { + "description": "Whether to include the ETW Exporter in the SDK", + "supports": "windows" + }, + "geneva": { + "description": "Whether to include the Geneva Exporter from the opentelemetry-cpp-contrib repository", + "dependencies": [ + { + "name": "opentelemetry-cpp", + "features": [ + "etw" + ], + "platform": "windows" + }, + "opentelemetry-cpp-contrib-version" + ] + }, + "opentracing": { + "description": "Whether to include the Opentracing shim", + "dependencies": [ + "opentracing" + ] + }, + "otlp-file": { + "description": "Whether to include the OpenTelemetry Protocol to File exporter in the SDK", + "supports": "!uwp", + "dependencies": [ + "protobuf" + ] + }, + "otlp-grpc": { + "description": "Whether to include the OTLP gRPC exporter in the SDK", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + } + ] + }, + "otlp-http": { + "description": "Whether to include the OpenTelemetry Protocol over HTTP in the SDK", + "dependencies": [ + "curl", + "protobuf" + ] + }, + "prometheus": { + "description": "Whether to include the Prometheus Client in the SDK", + "dependencies": [ + "prometheus-cpp" + ] + }, + "user-events": { + "description": "Whether to include the User Events Exporter from the opentelemetry-cpp-contrib repository", + "supports": "linux", + "dependencies": [ + "libeventheader-tracepoint", + "libtracepoint", + { + "name": "opentelemetry-cpp", + "features": [ + "otlp-http" + ] + }, + "opentelemetry-cpp-contrib-version" + ] + }, + "zipkin": { + "description": "Whether to include the Zipkin exporter in the SDK", + "dependencies": [ + "curl" + ] + } + } +} diff --git a/ci/etc/oldest-deps/vcpkg.json b/ci/etc/oldest-deps/vcpkg.json index 9545857b07db6..29dadb3489d80 100644 --- a/ci/etc/oldest-deps/vcpkg.json +++ b/ci/etc/oldest-deps/vcpkg.json @@ -8,7 +8,7 @@ "$TODO": "move `gtest` and `benchmark` to dev-dependencies", "builtin-baseline": "6d9ed568117dd958c543b3ab8d3ed692965cac34", "dependencies": [ - {"name": "abseil", "version>=": "2020-09-23#3"}, + {"name": "abseil", "version>=": "20250127.1"}, {"name": "crc32c", "version>=": "1.1.1"}, { "name": "curl", @@ -27,17 +27,21 @@ "host": true }, {"name": "grpc", "version>=": "1.33.1"}, - {"name": "opentelemetry-cpp", "version>=": "1.9.1"}, + {"name": "opentelemetry-cpp", "version>=": "1.20.0"}, {"name": "protobuf", "version>=": "3.15.8"}, {"name": "nlohmann-json", "version>=": "3.9.1"}, "benchmark", {"name": "gtest", "version>=": "1.11.0", "host": true} ], "overrides": [ - { "name": "opentelemetry-cpp", "version": "1.9.1"}, + { "name": "abseil", "version": "20250127.1"}, + { "name": "opentelemetry-cpp", "version": "1.20.0"}, { "name": "protobuf", "version": "3.15.8" }, { "name": "grpc", "version": "1.36.4" }, { "name": "upb", "version": "2020-12-19" }, { "name": "gtest", "version": "1.12.0" } - ] + ], + "configuration": { + "overlay-ports" : [ "overlay-ports"] + } } diff --git a/ci/etc/vcpkg-version.txt b/ci/etc/vcpkg-version.txt index 1cf30f24daa2d..fdf37ec4deabe 100644 --- a/ci/etc/vcpkg-version.txt +++ b/ci/etc/vcpkg-version.txt @@ -1 +1 @@ -2024.09.30 +2025.10.17 diff --git a/ci/gha/builds/lib/bazel.sh b/ci/gha/builds/lib/bazel.sh index e3576265e3981..96b22858d798e 100755 --- a/ci/gha/builds/lib/bazel.sh +++ b/ci/gha/builds/lib/bazel.sh @@ -78,6 +78,7 @@ function bazel::msvc_args() { '--per_file_copt=.*\.upbdefs\.c@-wd4090' # TODO(#14462) - gRPC is not compatible with (at least) MSVC 2019 + bzlmod. '--noenable_bzlmod' + '--enable_workspace' ) printf "%s\n" "${args[@]}" } diff --git a/ci/verify_current_targets/.bazelrc b/ci/verify_current_targets/.bazelrc index 161c057f747d3..08cbd3ab82723 100644 --- a/ci/verify_current_targets/.bazelrc +++ b/ci/verify_current_targets/.bazelrc @@ -15,23 +15,19 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" +# The project requires C++ >= 17. +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 +# Protobuf and gRPC require C++17 to compile the "host" # targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds # the project separately. build --experimental_convenience_symlinks=ignore -# TODO(#11485) - enable bzlmod once it works -common --noenable_bzlmod - # TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using # `apple_rules`. common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1 diff --git a/ci/verify_current_targets/.bazelversion b/ci/verify_current_targets/.bazelversion index e8be68404bcb3..e7fdef7e2e635 100644 --- a/ci/verify_current_targets/.bazelversion +++ b/ci/verify_current_targets/.bazelversion @@ -1 +1 @@ -7.6.1 +8.4.2 diff --git a/ci/verify_current_targets/MODULE.bazel b/ci/verify_current_targets/MODULE.bazel new file mode 100644 index 0000000000000..1c488000beede --- /dev/null +++ b/ci/verify_current_targets/MODULE.bazel @@ -0,0 +1,7 @@ +module(name = "google-cloud-cpp-verify-current-targets") + +bazel_dep(name = "google_cloud_cpp", version = "0.0.0") +local_path_override( + module_name = "google_cloud_cpp", + path = "../..", +) diff --git a/ci/verify_current_targets/WORKSPACE.bazel b/ci/verify_current_targets/WORKSPACE.bazel deleted file mode 100644 index 46f3b24ccaa76..0000000000000 --- a/ci/verify_current_targets/WORKSPACE.bazel +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -workspace(name = "verify_current_targets") - -local_repository( - name = "google_cloud_cpp", - path = "../../", -) - -load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0") - -gl_cpp_workspace0() - -load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1") - -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("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5") - -gl_cpp_workspace5() diff --git a/ci/verify_deprecated_targets/.bazelrc b/ci/verify_deprecated_targets/.bazelrc index a63472faf465a..dd078cc0c0d14 100644 --- a/ci/verify_deprecated_targets/.bazelrc +++ b/ci/verify_deprecated_targets/.bazelrc @@ -15,23 +15,19 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" +# The project requires C++ >= 17. +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 +# Protobuf and gRPC require C++17 to compile the "host" # targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds # the project separately. build --experimental_convenience_symlinks=ignore -# TODO(#11485) - enable bzlmod once it works -common --noenable_bzlmod - # TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using # `apple_rules`. common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1 diff --git a/ci/verify_deprecated_targets/.bazelversion b/ci/verify_deprecated_targets/.bazelversion index e8be68404bcb3..e7fdef7e2e635 100644 --- a/ci/verify_deprecated_targets/.bazelversion +++ b/ci/verify_deprecated_targets/.bazelversion @@ -1 +1 @@ -7.6.1 +8.4.2 diff --git a/ci/verify_deprecated_targets/MODULE.bazel b/ci/verify_deprecated_targets/MODULE.bazel new file mode 100644 index 0000000000000..fd929f8987a59 --- /dev/null +++ b/ci/verify_deprecated_targets/MODULE.bazel @@ -0,0 +1,7 @@ +module(name = "google-cloud-cpp-verify-deprecated-targets") + +bazel_dep(name = "google_cloud_cpp", version = "0.0.0") +local_path_override( + module_name = "google_cloud_cpp", + path = "../..", +) diff --git a/ci/verify_deprecated_targets/WORKSPACE.bazel b/ci/verify_deprecated_targets/WORKSPACE.bazel deleted file mode 100644 index 8711eace78c3f..0000000000000 --- a/ci/verify_deprecated_targets/WORKSPACE.bazel +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# A minimal WORKSPACE file showing how to use the Google Cloud Bigtable C++ -# client library in Bazel-based projects. -workspace(name = "verify_deprecated_targets") - -local_repository( - name = "google_cloud_cpp", - path = "../../", -) - -load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0") - -gl_cpp_workspace0() - -load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1") - -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("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5") - -gl_cpp_workspace5() diff --git a/cmake/CompileProtos.cmake b/cmake/CompileProtos.cmake index 4b389c7bf3256..a42f48c7e25cd 100644 --- a/cmake/CompileProtos.cmake +++ b/cmake/CompileProtos.cmake @@ -227,7 +227,7 @@ endfunction () # extracts the list of `.proto` files for each proto library we are interested # in. These files are extracted as Bazel rule names, for example: # -# @com_google_googleapis//google/bigtable/v2:bigtable.proto +# @googleapis//google/bigtable/v2:bigtable.proto # # We use naming conventions to convert these rules files to a path. Using the # same example that becomes: @@ -253,7 +253,7 @@ function (google_cloud_cpp_load_protolist var file) string(REGEX REPLACE "\n" ";" contents "${contents}") set(protos) foreach (line IN LISTS contents) - string(REPLACE "@com_google_googleapis//" "" line "${line}") + string(REPLACE "@googleapis//" "" line "${line}") string(REPLACE ":" "/" line "${line}") if ("${line}" STREQUAL "") continue() @@ -273,7 +273,7 @@ endfunction () # extracts the list of dependencies for each proto library we are interested in. # These dependencies are extracted as Bazel rule names, for example: # -# @com_google_googleapis//google/api:annotations_proto +# @googleapis//google/api:annotations_proto # # We use naming conventions to convert these rules files to a CMake target. # Using the same example that becomes: @@ -311,8 +311,7 @@ function (google_cloud_cpp_load_protodeps var file) endif () string(REPLACE ":" "_" line "${line}") string(REPLACE "_proto" "_protos" line "${line}") - string(REPLACE "@com_google_googleapis//" "google-cloud-cpp::" line - "${line}") + string(REPLACE "@googleapis//" "google-cloud-cpp::" line "${line}") # Avoid duplicate `google`'s in the target name. string(REPLACE "google-cloud-cpp::google/" "google-cloud-cpp::" line "${line}") diff --git a/cmake/GoogleCloudCppFeatures.cmake b/cmake/GoogleCloudCppFeatures.cmake index c674626b65a70..89883a55e0210 100644 --- a/cmake/GoogleCloudCppFeatures.cmake +++ b/cmake/GoogleCloudCppFeatures.cmake @@ -303,7 +303,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 @@ -342,11 +343,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 () @@ -361,9 +357,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 diff --git a/cmake/IncludeNlohmannJson.cmake b/cmake/IncludeNlohmannJson.cmake deleted file mode 100644 index db8056ae051b2..0000000000000 --- a/cmake/IncludeNlohmannJson.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# ~~~ -# Copyright 2018 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ~~~ - -function (find_nlohmann_json) - find_package(nlohmann_json CONFIG QUIET) - if (nlohmann_json_FOUND) - return() - endif () - # As a fall back, try finding the header. Since this is a header-only - # library that is all we need. - find_path(GOOGLE_CLOUD_CPP_NLOHMANN_JSON_HEADER "nlohmann/json.hpp" - REQUIRED) - add_library(nlohmann_json::nlohmann_json UNKNOWN IMPORTED) - set_property( - TARGET nlohmann_json::nlohmann_json - APPEND - PROPERTY INTERFACE_INCLUDE_DIRECTORIES - ${GOOGLE_CLOUD_CPP_NLOHMANN_JSON_HEADER}) -endfunction () - -find_nlohmann_json() diff --git a/doc/packaging.md b/doc/packaging.md index 3b77ef4d6db6b..b2bd8cb7f5221 100644 --- a/doc/packaging.md +++ b/doc/packaging.md @@ -202,14 +202,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -226,6 +226,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -305,14 +306,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -330,6 +331,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -355,7 +357,7 @@ use GCC 8 or higher to compile `google-cloud-cpp`. ```bash sudo zypper refresh && \ sudo zypper install --allow-downgrade -y automake cmake curl \ - gcc gcc-c++ gcc8 gcc8-c++ git gzip libtool make patch tar wget + gcc8 gcc8-c++ git gzip libtool make patch tar wget ``` Install some of the dependencies for `google-cloud-cpp`. @@ -378,24 +380,23 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig export PATH=/usr/local/bin:${PATH} ``` +Use the following environment variables to configure the compiler used by CMake. +export CC=gcc-8 export CXX=g++-8 + #### opentelemetry-cpp -The project has an **optional** dependency on the OpenTelemetry library. We -recommend installing this library because: - -- the dependency will become required in the google-cloud-cpp v3.x series. -- it is needed to produce distributed traces of the library. +The project has a dependency on the OpenTelemetry library. ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -404,12 +405,6 @@ sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ sudo ldconfig ``` -Use the following environment variables to configure the compiler used by CMake. - -export CXX=g++-8 - -export CC=gcc-8 - #### Compile and install the main project We can now compile and install `google-cloud-cpp`: @@ -419,6 +414,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -479,25 +475,20 @@ sudo ldconfig && cd /var/tmp && rm -fr build ln -s /usr/bin/pkgconf /usr/bin/pkg-config ``` -#### crc32c - -The project depends on the Crc32c library, we need to compile this from source: +#### abseil -```bash -mkdir -p $HOME/Downloads/crc32c && cd $HOME/Downloads/crc32c -curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DCRC32C_BUILD_TESTS=OFF \ - -DCRC32C_BUILD_BENCHMARKS=OFF \ - -DCRC32C_USE_GLOG=OFF \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ +mkdir -p $HOME/Downloads/abseil-cpp && cd $HOME/Downloads/abseil-cpp curl -fsSL +https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ +tar -xzf - --strip-components=1 && \ +cmake \ +-DCMAKE_BUILD_TYPE=Release \ +-DABSL_BUILD_TESTING=OFF \ +-DABSL_PROPAGATE_CXX_STD=ON \ +-DBUILD_SHARED_LIBS=yes \ +-S . -B cmake-out && \ +cmake --build cmake-out -- -j ${NCPU:-4} && \ sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ sudo ldconfig -``` #### opentelemetry-cpp @@ -509,14 +500,13 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -534,6 +524,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -571,6 +562,7 @@ curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -587,10 +579,11 @@ Google Cloud Platform proto files: ```bash mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf -curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -607,10 +600,11 @@ Platform proto files. We install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -677,14 +671,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -702,6 +696,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -739,6 +734,7 @@ curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -755,10 +751,11 @@ Google Cloud Platform proto files: ```bash mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf -curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -794,10 +791,11 @@ Platform proto files. We install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -864,14 +862,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -889,6 +887,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -945,25 +944,20 @@ sudo ldconfig && cd /var/tmp && rm -fr build export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib/pkgconfig ``` -#### crc32c +#### abseil -The project depends on the Crc32c library, we need to compile this from source: - -```bash -mkdir -p $HOME/Downloads/crc32c && cd $HOME/Downloads/crc32c -curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DCRC32C_BUILD_TESTS=OFF \ - -DCRC32C_BUILD_BENCHMARKS=OFF \ - -DCRC32C_USE_GLOG=OFF \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ +mkdir -p $HOME/Downloads/abseil-cpp && cd $HOME/Downloads/abseil-cpp curl -fsSL +https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ +tar -xzf - --strip-components=1 && \ +cmake \ +-DCMAKE_BUILD_TYPE=Release \ +-DABSL_BUILD_TESTING=OFF \ +-DABSL_PROPAGATE_CXX_STD=ON \ +-DBUILD_SHARED_LIBS=yes \ +-S . -B cmake-out && \ +cmake --build cmake-out -- -j ${NCPU:-4} && \ sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ sudo ldconfig -``` #### opentelemetry-cpp @@ -975,14 +969,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -1000,6 +994,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -1037,6 +1032,7 @@ curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -1085,10 +1081,11 @@ to build from source: ```bash mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf -curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -1118,14 +1115,13 @@ sudo ldconfig #### gRPC -Finally, we build gRPC from source: - ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ @@ -1150,14 +1146,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -1175,6 +1171,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ @@ -1252,6 +1249,7 @@ curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_BUILD_TESTING=OFF \ -DABSL_PROPAGATE_CXX_STD=ON \ -DBUILD_SHARED_LIBS=yes \ @@ -1269,10 +1267,11 @@ install Protobuf (and any downstream packages) from source. ```bash mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf -curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz | \ +curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_ABSL_PROVIDER=package \ @@ -1310,7 +1309,7 @@ install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.69.0.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=17 \ @@ -1381,14 +1380,14 @@ recommend installing this library because: ```bash mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp -curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz | \ +curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=yes \ -DWITH_EXAMPLES=OFF \ - -DWITH_STL=CXX14 \ - -DWITH_ABSEIL=ON \ + -DWITH_STL=CXX17 \ -DBUILD_TESTING=OFF \ -DOPENTELEMETRY_INSTALL=ON \ -DOPENTELEMETRY_ABI_VERSION_NO=2 \ @@ -1406,6 +1405,7 @@ We can now compile and install `google-cloud-cpp`: PREFIX="${HOME}/google-cloud-cpp-installed" cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ diff --git a/doc/v3-migration-guide.md b/doc/v3-migration-guide.md new file mode 100644 index 0000000000000..dd860d9473b9c --- /dev/null +++ b/doc/v3-migration-guide.md @@ -0,0 +1,568 @@ +# `google-cloud-cpp` v3 Migration Guide + +This document is intended for users of previous major versions (v1.x.y, v2.x.y) +of the `google-cloud-cpp` SDK who are moving to a release on the v3.x.y series. + +While this repository does not strictly follow semver, it does use the major +version number to indicate large breaking changes. We strive to balance the +frequency in which we introduce breaking changes with improvements to the SDK. +Since our most recent major version increment, about 3 years ago, we have added +new API surfaces that supersede the previous deprecated types and functions. As +part of the v3 release series, we are decommissioning those deprecated API +surfaces. This guide serves a central location to document how to migrate from +the decommissioned API surfaces to their replacements. + +## C++17 + +Depending on your build system of choice, you should set the appropriate flag +for your compiler if it does not already default to `--std=c++17` or higher. + +## Bazel Central Registry + +Bazel is moving away from WORKSPACE file support to using modules from the Bazel +Central Registry. Part of the v3.x.y release series includes supporting the new +[google-cloud-cpp](https://registry.bazel.build/modules/google_cloud_cpp) Bazel +module which can be added to your `MODULE.bazel` file as a dependency. + +## Dependencies + +### Previously Optional Dependencies that are now Required + +- `libcurl` +- `nlohmann_json` +- `opentelemetry-cpp` + +### Relocated Dependencies + +- `crc32c` + +## Decommissioned API Surfaces + +### Bazel + +### CMake + +### Common + +### Bigquery + +
+Removed bigquery/retry_traits.h file + +The library no longer exposes the `google/cloud/bigquery/retry_traits.h` header +file. It only contained internal symbols. + +
+ +### Bigtable + +
+Removed bigtable::RowReader constructors + + +The `bigtable::RowReader` constructors that accept `DataClient` as an argument +have been removed. + +Developers that read rows by directly constructing a `RowReader` object should +instead construct a `Table` object and call `Table::ReadRows(...)`. + +For example, code that used to look like this: + +**Before:** + +```cpp +#include "google/cloud/bigtable/data_client.h" +#include "google/cloud/bigtable/row_reader.h" +#include "google/cloud/bigtable/table.h" + +// ... + +auto client = google::cloud::bigtable::MakeDataClient( + "my-project", "my-instance", creds); +auto reader = google::cloud::bigtable::RowReader( + client, "my-table-id", google::cloud::bigtable::RowSet("r1", "r2"), + google::cloud::bigtable::RowReader::NO_ROWS_LIMIT, + google::cloud::bigtable::Filter::PassAllFilter(), + /*...retry and backoff policies...*/); + +for (auto& row : reader) { + if (!row) throw std::move(row).status(); + // ... +} +``` + +Should be changed to this: + +**After:** + +```cpp +#include "google/cloud/bigtable/table.h" + +// ... + +namespace cbt = google::cloud::bigtable; +cbt::Table table(cbt::MakeDataConnection(), + cbt::TableResource("my-project", "my-instance", "my-table-id")); + +for (auto& row : table.ReadRows( + cbt::RowSet("r1", "r2"), + cbt::Filter::PassAllFilter())) { + if (!row) throw std::move(row).status(); + // ... +} +``` + +
+ +
+ Removed bigtable::ClientOptions + +#### `bigtable::ClientOptions` + +The deprecated `bigtable::ClientOptions` has been removed. Please use +`google::cloud::Options` instead. + +The following table shows the mapping from `bigtable::ClientOptions` methods to +their `google::cloud::Options` equivalents: + +| `bigtable::ClientOptions` method | `google::cloud::Options` equivalent | +| ----------------------------------- | ----------------------------------------------------------------------------------------------- | +| `(constructor)` | `google::cloud::Options{}` | +| `set_data_endpoint` | `google::cloud::EndpointOption` | +| `set_admin_endpoint` | `google::cloud::EndpointOption` | +| `set_connection_pool_name` | `google::cloud::GrpcChannelArgumentsOption` or`google::cloud::GrpcChannelArgumentsNativeOption` | +| `set_connection_pool_size` | `google::cloud::GrpcNumChannelsOption` | +| `SetCredentials` | `google::cloud::GrpcCredentialOption` | +| `set_channel_arguments` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetCompressionAlgorithm` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetGrpclbFallbackTimeout` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetUserAgentPrefix` | `google::cloud::UserAgentProductsOption` or`google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetResourceQuota` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetMaxReceiveMessageSize` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetMaxSendMessageSize` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetLoadBalancingPolicyName` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetServiceConfigJSON` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `SetSslTargetNameOverride` | `google::cloud::GrpcChannelArgumentsNativeOption` | +| `enable_tracing`, `disable_tracing` | `google::cloud::LoggingComponentsOption` | +| `tracing_options` | `google::cloud::GrpcTracingOptionsOption` | +| `set_max_conn_refresh_period` | `bigtable::MaxConnectionRefreshOption` | +| `set_min_conn_refresh_period` | `bigtable::MinConnectionRefreshOption` | +| `set_background_thread_pool_size` | `google::cloud::GrpcBackgroundThreadPoolSizeOption` | +| `DisableBackgroundThreads` | `google::cloud::GrpcCompletionQueueOption` | + +Example usage of the replacements can be found below. + +**Before:** + +```cpp +auto client = bigtable::Client( + bigtable::ClientOptions().set_connection_pool_size(4)); +``` + +**After:** + +```cpp +auto client = bigtable::Client( + google::cloud::Options{}.set(4)); +``` + +#### `bigtable::CreateDefaultDataClient` + +The deprecated `bigtable::CreateDefaultDataClient` function has been removed. +Please use `bigtable::MakeDataClient` instead. + +**Before:** + +```cpp +auto client = bigtable::CreateDefaultDataClient( + "my-project", "my-instance", + bigtable::ClientOptions().set_connection_pool_size(4)); +``` + +**After:** + +```cpp +auto client = bigtable::MakeDataClient( + "my-project", "my-instance", + google::cloud::Options{}.set(4)); +``` + +#### `bigtable::CreateDefaultAdminClient` + +The deprecated `bigtable::CreateDefaultAdminClient` function has been removed. +Please use `bigtable::MakeAdminClient` instead. + +**Before:** + +```cpp +auto client = bigtable::CreateDefaultAdminClient( + "my-project", bigtable::ClientOptions().set_connection_pool_size(4)); +``` + +**After:** + +```cpp +auto client = bigtable::MakeAdminClient( + "my-project", + google::cloud::Options{}.set(4)); +``` + +#### `bigtable::CreateDefaultInstanceAdminClient` + +The deprecated `bigtable::CreateDefaultInstanceAdminClient` function has been +removed. Please use `bigtable::MakeInstanceAdminClient` instead. + +**Before:** + +```cpp +auto client = bigtable::CreateDefaultInstanceAdminClient( + "my-project", bigtable::ClientOptions().set_connection_pool_size(4)); +``` + +**After:** + +```cpp +auto client = bigtable::MakeInstanceAdminClient( + "my-project", + google::cloud::Options{}.set(4)); +``` + +
+ +
+ +Removed bigtable::AsyncRowReader<>::NO_ROWS_LIMIT + + +AsyncRowReader::NO_ROWS_LIMIT has been removed. Please use +`google::cloud::bigtable::RowReader::NO_ROWS_LIMIT` instead. + +```cpp +// Before +auto limit = google::cloud::bigtable::AsyncRowReader<>::NO_ROWS_LIMIT; + +// After +auto limit = google::cloud::bigtable::RowReader::NO_ROWS_LIMIT; +``` + +
+ +
+Removed Endpoint Options + + +The `bigtable::DataEndpointOption`, `bigtable::AdminEndpointOption`, and +`bigtable::InstanceAdminEndpointOption` classes have been removed. Applications +should use `google::cloud::EndpointOption` instead. + +**Before:** + +```cpp +auto options = google::cloud::Options{}.set("..."); +``` + +**After:** + +```cpp +auto options = google::cloud::Options{}.set("..."); +``` + +
+ +
+Removed bigtable::DataClient and related functions + +The `bigtable::DataClient` class and its associated factory functions (e.g., +`MakeDataClient`) have been removed. Applications should now use +`bigtable::DataConnection` and `bigtable::MakeDataConnection()` instead. For +detailed migration steps and examples, please refer to the official migration +guide: + +[Migrating from DataClient to DataConnection](https://docs.cloud.google.com/cpp/docs/reference/bigtable/latest/migrating-from-dataclient) + +
+ +### Pubsub + +### Spanner + +
+Removed spanner::MakeTestRow + + +The `spanner::MakeTestRow` functions have been removed. Please use +`spanner_mocks::MakeRow` instead. + +**Before:** + +```cpp +#include "google/cloud/spanner/row.h" + +// ... + +auto row = google::cloud::spanner::MakeTestRow( + {{"c0", google::cloud::spanner::Value(42)}}); +auto row2 = google::cloud::spanner::MakeTestRow(1, "foo", true); +``` + +**After:** + +```cpp +#include "google/cloud/spanner/mocks/row.h" + +// ... + +auto row = google::cloud::spanner_mocks::MakeRow( + {{"c0", google::cloud::spanner::Value(42)}}); +auto row2 = google::cloud::spanner_mocks::MakeRow(1, "foo", true); +``` + +
+ +
+Removed spanner::ClientOptions class + +The `spanner::ClientOptions` class has been removed. Use +`google::cloud::Options` instead to set the following as needed: + +- `spanner::QueryOptimizerVersionOption` +- `spanner::QueryOptimizerStatisticsPackageOption` +- `spanner::RequestPriorityOption` +- `spanner::RequestTagOption` + +**Before:** + +```cpp +#include "google/cloud/spanner/client.h" + +// ... + +namespace spanner = ::google::cloud::spanner; +auto client_options = spanner::ClientOptions().set_query_options( + spanner::QueryOptions().set_optimizer_version("1")); + +auto client = spanner::Client(connection, client_options); +``` + +**After:** + +```cpp +#include "google/cloud/spanner/client.h" +#include "google/cloud/spanner/options.h" + +// ... + +namespace spanner = ::google::cloud::spanner; +auto options = google::cloud::Options{}.set("1"); + +auto client = spanner::Client(connection, options); +``` + +
+ +
+ +Removed admin/retry_traits.h file + +The library no longer exposes `google/cloud/spanner/admin/retry_traits.h` header +file. It only contained internal symbols. + +
+ +
+Removed Admin Clients from spanner namespace + +The `DatabaseAdminClient` and `InstanceAdminClient` classes (and their +associated connection classes and factory functions) have been removed from the +`google::cloud::spanner` namespace. Please use the replacements in +`google::cloud::spanner_admin`. + +**Before:** + +```cpp +#include "google/cloud/spanner/database_admin_client.h" +#include "google/cloud/spanner/instance_admin_client.h" + +namespace spanner = ::google::cloud::spanner; + +void Function(spanner::DatabaseAdminClient db_admin, + spanner::InstanceAdminClient in_admin) { + // ... +} +``` + +**After:** + +```cpp +#include "google/cloud/spanner/admin/database_admin_client.h" +#include "google/cloud/spanner/admin/instance_admin_client.h" + +namespace spanner_admin = ::google::cloud::spanner_admin; + +void Function(spanner_admin::DatabaseAdminClient db_admin, + spanner_admin::InstanceAdminClient in_admin) { + // ... +} +``` + +
+ +### Storage + +
+ClientOptions is removed + +The `ClientOptions` class is no longer available. You should now use +`google::cloud::Options` to configure the `Client`. + +**Before:** + +```cpp +#include "google/cloud/storage/client.h" + +void CreateClient() { + auto credentials = google::cloud::storage::oauth2::GoogleDefaultCredentials().value(); + auto options = google::cloud::storage::ClientOptions(credentials); + options.set_project_id("my-project"); + options.set_upload_buffer_size(1024 * 1024); + + google::cloud::storage::Client client(options); +} +``` + +**After:** + +```cpp +#include "google/cloud/storage/client.h" +#include "google/cloud/storage/options.h" // For option structs + +void CreateClient() { + auto credentials = google::cloud::MakeGoogleDefaultCredentials(); + auto client = google::cloud::storage::Client( + google::cloud::Options{} + .set(credentials) + .set("my-project") + .set(1024 * 1024)); +} +``` + +Use the following table to map `ClientOptions` setters to +`google::cloud::Options`: + +| `ClientOptions` Method | Replacement Option (`.set(value)`) | +| :------------------------------------ | :------------------------------------------------------ | +| `set_credentials(c)` | `google::cloud::storage::Oauth2CredentialsOption` | +| `set_project_id(p)` | `google::cloud::storage::ProjectIdOption` | +| `set_endpoint(url)` | `google::cloud::storage::RestEndpointOption` | +| `set_iam_endpoint(url)` | `google::cloud::storage::IamEndpointOption` | +| `SetDownloadBufferSize` | `google::cloud::storage::DownloadBufferSizeOption` | +| `SetUploadBufferSizee` | `google::cloud::storage::UploadBufferSizeOption` | +| `set_maximum_simple_upload_size(s)` | `google::cloud::storage::MaximumSimpleUploadSizeOption` | +| `set_enable_http_tracing(true)` | `google::cloud::LoggingComponentsOption` | +| `set_enable_raw_client_tracing(true)` | `google::cloud::LoggingComponentsOption` | + +**Example for Tracing:** + +```cpp +// Before +options.set_enable_http_tracing(true); + +// After +auto opts = Options{}.lookup().insert("raw-client"); +``` + +
+ +
+ChannelOptions is removed + +The `ChannelOptions` class is no longer available. You should now use +`google::cloud::Options` to configure the transport channel. + +**Before:** + +```cpp +#include "google/cloud/storage/grpc_plugin.h" + +void CreateClient() { + auto options = google::cloud::storage::ChannelOptions() + .set_ssl_root_path("path/to/roots.pem"); + + auto client = google::cloud::storage::MakeGrpcClient( + google::cloud::storage::ClientOptions(), options); +} +``` + +**After:** + +```cpp +#include "google/cloud/storage/grpc_plugin.h" +#include "google/cloud/grpc_options.h" +#include "google/cloud/common_options.h" + +void CreateClient() { + auto client = google::cloud::storage::MakeGrpcClient( + google::cloud::Options{}.set( + "path/to/roots.pem")); +} +``` + +
+ +
+ChannelOptions Mapping + +Use the following table to map `ChannelOptions` setters to +`google::cloud::Options`: + +| `ChannelOptions` Method | Replacement Option (`.set(value)`) | +| :---------------------- | :------------------------------------- | +| `set_ssl_root_path(p)` | `google::cloud::CARootsFilePathOption` | + +
+ +
+Client Constructor removal + +The constructor `Client(ClientOptions)` is removed. The default constructor +`Client()` generally uses default options and default credentials. To customize, +use `Client(Options)`. + +**Before:** + +```cpp +#include "google/cloud/storage/client.h" + +void CreateClient() { + auto credentials = google::cloud::storage::oauth2::GoogleDefaultCredentials().value(); + auto options = google::cloud::storage::ClientOptions(credentials); + auto client = google::cloud::storage::Client(options); +} +``` + +**After:** + +```cpp +#include "google/cloud/storage/client.h" +#include "google/cloud/storage/options.h" + +void CreateClient() { + auto credentials = google::cloud::MakeGoogleDefaultCredentials(); + auto client = google::cloud::storage::Client( + google::cloud::Options{}.set(credentials)); +} +``` + +
+ +### IAM + +
+ +Removed iam/retry_traits.h file + +
+The library no longer exposes `google/cloud/iam/retry_traits.h` header file. It +only contained internal symbols. + + diff --git a/docfx/BUILD.bazel b/docfx/BUILD.bazel index 2960304936fca..25de3ea4d760a 100644 --- a/docfx/BUILD.bazel +++ b/docfx/BUILD.bazel @@ -32,8 +32,8 @@ cc_library( }), deps = [ "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:json", "@com_github_zeux_pugixml//:pugixml", + "@nlohmann_json//:json", ], ) @@ -50,8 +50,8 @@ cc_library( deps = [ ":docfx", "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:json", "@com_github_zeux_pugixml//:pugixml", + "@nlohmann_json//:json", ], ) @@ -63,7 +63,7 @@ cc_library( ":docfx", ":docfx_testing", "@com_github_zeux_pugixml//:pugixml", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in unit_tests] diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index a131ef5390160..f0881c24cef5a 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -12,11 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load( - "@com_google_googleapis_imports//:imports.bzl", - "cc_grpc_library", - "cc_proto_library", -) +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") package(default_visibility = ["//visibility:private"]) @@ -95,7 +93,7 @@ cc_test( "//:spanner", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", + "@curl", ], ) diff --git a/examples/gcs2cbt.cc b/examples/gcs2cbt.cc index 0b1d5ab889556..4405a2cb8d28b 100644 --- a/examples/gcs2cbt.cc +++ b/examples/gcs2cbt.cc @@ -60,8 +60,9 @@ int main(int argc, char* argv[]) try { // Create a connection to Cloud Bigtable and an object to manipulate the // specific table used in this demo. - cbt::Table table(cbt::MakeDataClient(options.project_id, options.instance_id), - options.table_id); + cbt::Table table(cbt::MakeDataConnection(), + cbt::TableResource(options.project_id, options.instance_id, + options.table_id)); cbt::MutationBatcher batcher(table); // How often do we print a progress marker ('.') in the reader thread. diff --git a/external/googleapis/protodeps/accessapproval.deps b/external/googleapis/protodeps/accessapproval.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/accessapproval.deps +++ b/external/googleapis/protodeps/accessapproval.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/accesscontextmanager.deps b/external/googleapis/protodeps/accesscontextmanager.deps index ceffcfaf47cd4..99121353ed73a 100644 --- a/external/googleapis/protodeps/accesscontextmanager.deps +++ b/external/googleapis/protodeps/accesscontextmanager.deps @@ -1,14 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/identity/accesscontextmanager/type:type_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/identity/accesscontextmanager/type:type_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/advisorynotifications.deps b/external/googleapis/protodeps/advisorynotifications.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/advisorynotifications.deps +++ b/external/googleapis/protodeps/advisorynotifications.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/aiplatform.deps b/external/googleapis/protodeps/aiplatform.deps index 2f70814a31fbd..1bf735c9d55e1 100644 --- a/external/googleapis/protodeps/aiplatform.deps +++ b/external/googleapis/protodeps/aiplatform.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:httpbody_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:interval_proto -@com_google_googleapis//google/type:latlng_proto -@com_google_googleapis//google/type:money_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:httpbody_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:interval_proto +@googleapis//google/type:latlng_proto +@googleapis//google/type:money_proto diff --git a/external/googleapis/protodeps/alloydb.deps b/external/googleapis/protodeps/alloydb.deps index 1d05da9c5f015..46b0ff5b368cf 100644 --- a/external/googleapis/protodeps/alloydb.deps +++ b/external/googleapis/protodeps/alloydb.deps @@ -1,12 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/apigateway.deps b/external/googleapis/protodeps/apigateway.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/apigateway.deps +++ b/external/googleapis/protodeps/apigateway.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/apigeeconnect.deps b/external/googleapis/protodeps/apigeeconnect.deps index da299b760ccb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/apigeeconnect.deps +++ b/external/googleapis/protodeps/apigeeconnect.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/apikeys.deps b/external/googleapis/protodeps/apikeys.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/apikeys.deps +++ b/external/googleapis/protodeps/apikeys.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/appengine.deps b/external/googleapis/protodeps/appengine.deps index eb1ab5d9b5bf6..156e79c776692 100644 --- a/external/googleapis/protodeps/appengine.deps +++ b/external/googleapis/protodeps/appengine.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/logging/type:type_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/logging/type:type_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/apphub.deps b/external/googleapis/protodeps/apphub.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/apphub.deps +++ b/external/googleapis/protodeps/apphub.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/artifactregistry.deps b/external/googleapis/protodeps/artifactregistry.deps index 9098b1b674ef2..11efb6f9d66da 100644 --- a/external/googleapis/protodeps/artifactregistry.deps +++ b/external/googleapis/protodeps/artifactregistry.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/asset.deps b/external/googleapis/protodeps/asset.deps index 089feac7b43ee..f9a583f6c679e 100644 --- a/external/googleapis/protodeps/asset.deps +++ b/external/googleapis/protodeps/asset.deps @@ -1,22 +1,22 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/orgpolicy/v1:orgpolicy_proto -@com_google_googleapis//google/cloud/osconfig/v1:osconfig_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/identity/accesscontextmanager/type:type_proto -@com_google_googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:expr_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/orgpolicy/v1:orgpolicy_proto +@googleapis//google/cloud/osconfig/v1:osconfig_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/identity/accesscontextmanager/type:type_proto +@googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:expr_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/assuredworkloads.deps b/external/googleapis/protodeps/assuredworkloads.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/assuredworkloads.deps +++ b/external/googleapis/protodeps/assuredworkloads.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/automl.deps b/external/googleapis/protodeps/automl.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/automl.deps +++ b/external/googleapis/protodeps/automl.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/backupdr.deps b/external/googleapis/protodeps/backupdr.deps index c95a0a1cd0211..7fd8412d7bb69 100644 --- a/external/googleapis/protodeps/backupdr.deps +++ b/external/googleapis/protodeps/backupdr.deps @@ -1,11 +1,11 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:month_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:month_proto diff --git a/external/googleapis/protodeps/baremetalsolution.deps b/external/googleapis/protodeps/baremetalsolution.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/baremetalsolution.deps +++ b/external/googleapis/protodeps/baremetalsolution.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/batch.deps b/external/googleapis/protodeps/batch.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/batch.deps +++ b/external/googleapis/protodeps/batch.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/beyondcorp.deps b/external/googleapis/protodeps/beyondcorp.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/beyondcorp.deps +++ b/external/googleapis/protodeps/beyondcorp.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/bigquery.deps b/external/googleapis/protodeps/bigquery.deps index 9ce491ff2a77d..b22419f223126 100644 --- a/external/googleapis/protodeps/bigquery.deps +++ b/external/googleapis/protodeps/bigquery.deps @@ -1,17 +1,17 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:distribution_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:label_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:metric_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:error_details_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:distribution_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:label_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:metric_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:error_details_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/bigquerycontrol.deps b/external/googleapis/protodeps/bigquerycontrol.deps index bd46b0cedb062..34365612fc71f 100644 --- a/external/googleapis/protodeps/bigquerycontrol.deps +++ b/external/googleapis/protodeps/bigquerycontrol.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/bigtable.deps b/external/googleapis/protodeps/bigtable.deps index bb9e95d7e0e3b..15001fff1a50c 100644 --- a/external/googleapis/protodeps/bigtable.deps +++ b/external/googleapis/protodeps/bigtable.deps @@ -1,15 +1,15 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/billing.deps b/external/googleapis/protodeps/billing.deps index 0c58b63ac7071..1668a7cb77606 100644 --- a/external/googleapis/protodeps/billing.deps +++ b/external/googleapis/protodeps/billing.deps @@ -1,13 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:expr_proto -@com_google_googleapis//google/type:money_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:expr_proto +@googleapis//google/type:money_proto diff --git a/external/googleapis/protodeps/binaryauthorization.deps b/external/googleapis/protodeps/binaryauthorization.deps index d2c38d51f9ffc..5524f95cdace3 100644 --- a/external/googleapis/protodeps/binaryauthorization.deps +++ b/external/googleapis/protodeps/binaryauthorization.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//grafeas/v1:grafeas_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto +@googleapis//grafeas/v1:grafeas_proto diff --git a/external/googleapis/protodeps/certificatemanager.deps b/external/googleapis/protodeps/certificatemanager.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/certificatemanager.deps +++ b/external/googleapis/protodeps/certificatemanager.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/channel.deps b/external/googleapis/protodeps/channel.deps index 983107aeb76d1..ccb330e36cc92 100644 --- a/external/googleapis/protodeps/channel.deps +++ b/external/googleapis/protodeps/channel.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:decimal_proto -@com_google_googleapis//google/type:money_proto -@com_google_googleapis//google/type:postal_address_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:decimal_proto +@googleapis//google/type:money_proto +@googleapis//google/type:postal_address_proto diff --git a/external/googleapis/protodeps/chronicle.deps b/external/googleapis/protodeps/chronicle.deps index 2e6ff1caf713a..4bbe4120b3305 100644 --- a/external/googleapis/protodeps/chronicle.deps +++ b/external/googleapis/protodeps/chronicle.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/cloudbuild.deps b/external/googleapis/protodeps/cloudbuild.deps index 628d37343b4ed..8852d31b2ad18 100644 --- a/external/googleapis/protodeps/cloudbuild.deps +++ b/external/googleapis/protodeps/cloudbuild.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:httpbody_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:httpbody_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/cloudcontrolspartner.deps b/external/googleapis/protodeps/cloudcontrolspartner.deps index 22f7f75a595a1..f631e058a96b9 100644 --- a/external/googleapis/protodeps/cloudcontrolspartner.deps +++ b/external/googleapis/protodeps/cloudcontrolspartner.deps @@ -1,7 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/cloudquotas.deps b/external/googleapis/protodeps/cloudquotas.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/cloudquotas.deps +++ b/external/googleapis/protodeps/cloudquotas.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/cloudsecuritycompliance.deps b/external/googleapis/protodeps/cloudsecuritycompliance.deps index 2e6ff1caf713a..4bbe4120b3305 100644 --- a/external/googleapis/protodeps/cloudsecuritycompliance.deps +++ b/external/googleapis/protodeps/cloudsecuritycompliance.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/commerce.deps b/external/googleapis/protodeps/commerce.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/commerce.deps +++ b/external/googleapis/protodeps/commerce.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/common.deps b/external/googleapis/protodeps/common.deps index 84fe573712543..bb6f4b96c838a 100644 --- a/external/googleapis/protodeps/common.deps +++ b/external/googleapis/protodeps/common.deps @@ -1 +1,2 @@ -@com_google_googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/composer.deps b/external/googleapis/protodeps/composer.deps index 56ffb0ed0575f..d648e9f3b53c5 100644 --- a/external/googleapis/protodeps/composer.deps +++ b/external/googleapis/protodeps/composer.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto diff --git a/external/googleapis/protodeps/compute.deps b/external/googleapis/protodeps/compute.deps index 85cafd76d2c8c..c3119d7f51695 100644 --- a/external/googleapis/protodeps/compute.deps +++ b/external/googleapis/protodeps/compute.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/cloud:extended_operations_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/cloud:extended_operations_proto diff --git a/external/googleapis/protodeps/confidentialcomputing.deps b/external/googleapis/protodeps/confidentialcomputing.deps index da299b760ccb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/confidentialcomputing.deps +++ b/external/googleapis/protodeps/confidentialcomputing.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/config.deps b/external/googleapis/protodeps/config.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/config.deps +++ b/external/googleapis/protodeps/config.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/configdelivery.deps b/external/googleapis/protodeps/configdelivery.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/configdelivery.deps +++ b/external/googleapis/protodeps/configdelivery.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/connectors.deps b/external/googleapis/protodeps/connectors.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/connectors.deps +++ b/external/googleapis/protodeps/connectors.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/contactcenterinsights.deps b/external/googleapis/protodeps/contactcenterinsights.deps index 2e6ff1caf713a..4bbe4120b3305 100644 --- a/external/googleapis/protodeps/contactcenterinsights.deps +++ b/external/googleapis/protodeps/contactcenterinsights.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/container.deps b/external/googleapis/protodeps/container.deps index b4198c064ae3e..bb786c561e94a 100644 --- a/external/googleapis/protodeps/container.deps +++ b/external/googleapis/protodeps/container.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/containeranalysis.deps b/external/googleapis/protodeps/containeranalysis.deps index 167e562981c0a..a0baf2c377879 100644 --- a/external/googleapis/protodeps/containeranalysis.deps +++ b/external/googleapis/protodeps/containeranalysis.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto -@com_google_googleapis//grafeas/v1:grafeas_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto +@googleapis//grafeas/v1:grafeas_proto diff --git a/external/googleapis/protodeps/contentwarehouse.deps b/external/googleapis/protodeps/contentwarehouse.deps index f27f32a86d7f7..6d161fdc7e6f9 100644 --- a/external/googleapis/protodeps/contentwarehouse.deps +++ b/external/googleapis/protodeps/contentwarehouse.deps @@ -1,17 +1,17 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/documentai/v1:documentai_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:color_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:expr_proto -@com_google_googleapis//google/type:interval_proto -@com_google_googleapis//google/type:money_proto -@com_google_googleapis//google/type:postal_address_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/documentai/v1:documentai_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:color_proto +@googleapis//google/type:date_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:expr_proto +@googleapis//google/type:interval_proto +@googleapis//google/type:money_proto +@googleapis//google/type:postal_address_proto diff --git a/external/googleapis/protodeps/datacatalog.deps b/external/googleapis/protodeps/datacatalog.deps index 9098b1b674ef2..11efb6f9d66da 100644 --- a/external/googleapis/protodeps/datacatalog.deps +++ b/external/googleapis/protodeps/datacatalog.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/dataform.deps b/external/googleapis/protodeps/dataform.deps index db570cc8d9199..f631e058a96b9 100644 --- a/external/googleapis/protodeps/dataform.deps +++ b/external/googleapis/protodeps/dataform.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/datafusion.deps b/external/googleapis/protodeps/datafusion.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/datafusion.deps +++ b/external/googleapis/protodeps/datafusion.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/datamigration.deps b/external/googleapis/protodeps/datamigration.deps index 9098b1b674ef2..11efb6f9d66da 100644 --- a/external/googleapis/protodeps/datamigration.deps +++ b/external/googleapis/protodeps/datamigration.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/dataplex.deps b/external/googleapis/protodeps/dataplex.deps index b6736e4dc8dbb..6fe9d79d63f91 100644 --- a/external/googleapis/protodeps/dataplex.deps +++ b/external/googleapis/protodeps/dataplex.deps @@ -1,14 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/dataproc.deps b/external/googleapis/protodeps/dataproc.deps index 2e6ff1caf713a..4bbe4120b3305 100644 --- a/external/googleapis/protodeps/dataproc.deps +++ b/external/googleapis/protodeps/dataproc.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/datastore.deps b/external/googleapis/protodeps/datastore.deps index b48ba0d6dc240..0b84223bcdb80 100644 --- a/external/googleapis/protodeps/datastore.deps +++ b/external/googleapis/protodeps/datastore.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:latlng_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:routing_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:latlng_proto diff --git a/external/googleapis/protodeps/datastream.deps b/external/googleapis/protodeps/datastream.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/datastream.deps +++ b/external/googleapis/protodeps/datastream.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/deploy.deps b/external/googleapis/protodeps/deploy.deps index 690385b1c9fa0..817953a439a11 100644 --- a/external/googleapis/protodeps/deploy.deps +++ b/external/googleapis/protodeps/deploy.deps @@ -1,11 +1,11 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/developerconnect.deps b/external/googleapis/protodeps/developerconnect.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/developerconnect.deps +++ b/external/googleapis/protodeps/developerconnect.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/devicestreaming.deps b/external/googleapis/protodeps/devicestreaming.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/devicestreaming.deps +++ b/external/googleapis/protodeps/devicestreaming.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/dialogflow_cx.deps b/external/googleapis/protodeps/dialogflow_cx.deps index 457ff4c5f60b2..ba45406b2df47 100644 --- a/external/googleapis/protodeps/dialogflow_cx.deps +++ b/external/googleapis/protodeps/dialogflow_cx.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:latlng_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:latlng_proto diff --git a/external/googleapis/protodeps/dialogflow_es.deps b/external/googleapis/protodeps/dialogflow_es.deps index 457ff4c5f60b2..ba45406b2df47 100644 --- a/external/googleapis/protodeps/dialogflow_es.deps +++ b/external/googleapis/protodeps/dialogflow_es.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:latlng_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:latlng_proto diff --git a/external/googleapis/protodeps/discoveryengine.deps b/external/googleapis/protodeps/discoveryengine.deps index d2fe5d9ee5836..ba7d47fadd611 100644 --- a/external/googleapis/protodeps/discoveryengine.deps +++ b/external/googleapis/protodeps/discoveryengine.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:httpbody_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:httpbody_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto diff --git a/external/googleapis/protodeps/dlp.deps b/external/googleapis/protodeps/dlp.deps index dec5bc18836cc..db48401637fb8 100644 --- a/external/googleapis/protodeps/dlp.deps +++ b/external/googleapis/protodeps/dlp.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/documentai.deps b/external/googleapis/protodeps/documentai.deps index b5eb632423f8e..aec9bc7912381 100644 --- a/external/googleapis/protodeps/documentai.deps +++ b/external/googleapis/protodeps/documentai.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:color_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:money_proto -@com_google_googleapis//google/type:postal_address_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:color_proto +@googleapis//google/type:date_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:money_proto +@googleapis//google/type:postal_address_proto diff --git a/external/googleapis/protodeps/domains.deps b/external/googleapis/protodeps/domains.deps index 1a611eac8ecb4..81447f0c47af9 100644 --- a/external/googleapis/protodeps/domains.deps +++ b/external/googleapis/protodeps/domains.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:money_proto -@com_google_googleapis//google/type:postal_address_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:money_proto +@googleapis//google/type:postal_address_proto diff --git a/external/googleapis/protodeps/edgecontainer.deps b/external/googleapis/protodeps/edgecontainer.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/edgecontainer.deps +++ b/external/googleapis/protodeps/edgecontainer.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/edgenetwork.deps b/external/googleapis/protodeps/edgenetwork.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/edgenetwork.deps +++ b/external/googleapis/protodeps/edgenetwork.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/essentialcontacts.deps b/external/googleapis/protodeps/essentialcontacts.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/essentialcontacts.deps +++ b/external/googleapis/protodeps/essentialcontacts.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/eventarc.deps b/external/googleapis/protodeps/eventarc.deps index 0070a78d1da1d..c38fafb3763df 100644 --- a/external/googleapis/protodeps/eventarc.deps +++ b/external/googleapis/protodeps/eventarc.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/filestore.deps b/external/googleapis/protodeps/filestore.deps index 566a4dcfa2cbf..fef9d1147e5f4 100644 --- a/external/googleapis/protodeps/filestore.deps +++ b/external/googleapis/protodeps/filestore.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/common:common_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/common:common_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/financialservices.deps b/external/googleapis/protodeps/financialservices.deps index 98062774348f3..30285358b93a4 100644 --- a/external/googleapis/protodeps/financialservices.deps +++ b/external/googleapis/protodeps/financialservices.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/functions.deps b/external/googleapis/protodeps/functions.deps index 5c762bd51f554..c0924d5a73d28 100644 --- a/external/googleapis/protodeps/functions.deps +++ b/external/googleapis/protodeps/functions.deps @@ -1,14 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/gkebackup.deps b/external/googleapis/protodeps/gkebackup.deps index 1d05da9c5f015..46b0ff5b368cf 100644 --- a/external/googleapis/protodeps/gkebackup.deps +++ b/external/googleapis/protodeps/gkebackup.deps @@ -1,12 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/gkeconnect.deps b/external/googleapis/protodeps/gkeconnect.deps index 5d260a00b6f04..191cdfdc78801 100644 --- a/external/googleapis/protodeps/gkeconnect.deps +++ b/external/googleapis/protodeps/gkeconnect.deps @@ -1,5 +1,6 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/gkehub.deps b/external/googleapis/protodeps/gkehub.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/gkehub.deps +++ b/external/googleapis/protodeps/gkehub.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/gkemulticloud.deps b/external/googleapis/protodeps/gkemulticloud.deps index 56ffb0ed0575f..d648e9f3b53c5 100644 --- a/external/googleapis/protodeps/gkemulticloud.deps +++ b/external/googleapis/protodeps/gkemulticloud.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto diff --git a/external/googleapis/protodeps/grafeas.deps b/external/googleapis/protodeps/grafeas.deps index da299b760ccb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/grafeas.deps +++ b/external/googleapis/protodeps/grafeas.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/iam.deps b/external/googleapis/protodeps/iam.deps index e027a4c044e59..ac9f9bb108292 100644 --- a/external/googleapis/protodeps/iam.deps +++ b/external/googleapis/protodeps/iam.deps @@ -1,11 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/iam_v2.deps b/external/googleapis/protodeps/iam_v2.deps index 7dabe81c47849..6a7f7c082196f 100644 --- a/external/googleapis/protodeps/iam_v2.deps +++ b/external/googleapis/protodeps/iam_v2.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/iam_v3.deps b/external/googleapis/protodeps/iam_v3.deps index ea852ac64f42a..5290041a37946 100644 --- a/external/googleapis/protodeps/iam_v3.deps +++ b/external/googleapis/protodeps/iam_v3.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/iap.deps b/external/googleapis/protodeps/iap.deps index e027a4c044e59..ac9f9bb108292 100644 --- a/external/googleapis/protodeps/iap.deps +++ b/external/googleapis/protodeps/iap.deps @@ -1,11 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/ids.deps b/external/googleapis/protodeps/ids.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/ids.deps +++ b/external/googleapis/protodeps/ids.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/kms.deps b/external/googleapis/protodeps/kms.deps index a4834da700af3..0ae51f1dfe212 100644 --- a/external/googleapis/protodeps/kms.deps +++ b/external/googleapis/protodeps/kms.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/kms/v1:kms_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/kms/v1:kms_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/language.deps b/external/googleapis/protodeps/language.deps index 5d260a00b6f04..191cdfdc78801 100644 --- a/external/googleapis/protodeps/language.deps +++ b/external/googleapis/protodeps/language.deps @@ -1,5 +1,6 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/licensemanager.deps b/external/googleapis/protodeps/licensemanager.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/licensemanager.deps +++ b/external/googleapis/protodeps/licensemanager.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/logging.deps b/external/googleapis/protodeps/logging.deps index c1736c35c9531..d72761ae60779 100644 --- a/external/googleapis/protodeps/logging.deps +++ b/external/googleapis/protodeps/logging.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:distribution_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:label_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:metric_proto -@com_google_googleapis//google/api:monitored_resource_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/logging/type:type_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:distribution_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:label_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:metric_proto +@googleapis//google/api:monitored_resource_proto +@googleapis//google/api:resource_proto +@googleapis//google/logging/type:type_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/logging_type.deps b/external/googleapis/protodeps/logging_type.deps index e69de29bb2d1d..571008e03f6be 100644 --- a/external/googleapis/protodeps/logging_type.deps +++ b/external/googleapis/protodeps/logging_type.deps @@ -0,0 +1 @@ +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/lustre.deps b/external/googleapis/protodeps/lustre.deps index 0070a78d1da1d..c38fafb3763df 100644 --- a/external/googleapis/protodeps/lustre.deps +++ b/external/googleapis/protodeps/lustre.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/maintenance.deps b/external/googleapis/protodeps/maintenance.deps index 8790d2ff278d9..215c8fb2926ff 100644 --- a/external/googleapis/protodeps/maintenance.deps +++ b/external/googleapis/protodeps/maintenance.deps @@ -1,7 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/managedidentities.deps b/external/googleapis/protodeps/managedidentities.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/managedidentities.deps +++ b/external/googleapis/protodeps/managedidentities.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/managedkafka.deps b/external/googleapis/protodeps/managedkafka.deps index 1f1ff171c6bb8..55352947fc477 100644 --- a/external/googleapis/protodeps/managedkafka.deps +++ b/external/googleapis/protodeps/managedkafka.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:httpbody_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:httpbody_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/memcache.deps b/external/googleapis/protodeps/memcache.deps index 64a55e8f7c5ea..b4a44896f9844 100644 --- a/external/googleapis/protodeps/memcache.deps +++ b/external/googleapis/protodeps/memcache.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/memorystore.deps b/external/googleapis/protodeps/memorystore.deps index d820005adbc5a..4760fd1987644 100644 --- a/external/googleapis/protodeps/memorystore.deps +++ b/external/googleapis/protodeps/memorystore.deps @@ -1,11 +1,11 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/metastore.deps b/external/googleapis/protodeps/metastore.deps index 1f3a27a42b85d..8b5e38216b242 100644 --- a/external/googleapis/protodeps/metastore.deps +++ b/external/googleapis/protodeps/metastore.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:dayofweek_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:dayofweek_proto diff --git a/external/googleapis/protodeps/migrationcenter.deps b/external/googleapis/protodeps/migrationcenter.deps index b77d5badb5fc8..bf3983f8225f3 100644 --- a/external/googleapis/protodeps/migrationcenter.deps +++ b/external/googleapis/protodeps/migrationcenter.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:money_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:money_proto diff --git a/external/googleapis/protodeps/monitoring.deps b/external/googleapis/protodeps/monitoring.deps index ff168475aa60d..a108c60062189 100644 --- a/external/googleapis/protodeps/monitoring.deps +++ b/external/googleapis/protodeps/monitoring.deps @@ -1,16 +1,16 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:distribution_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:label_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:metric_proto -@com_google_googleapis//google/api:monitored_resource_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:calendar_period_proto -@com_google_googleapis//google/type:interval_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:distribution_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:label_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:metric_proto +@googleapis//google/api:monitored_resource_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:calendar_period_proto +@googleapis//google/type:interval_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/netapp.deps b/external/googleapis/protodeps/netapp.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/netapp.deps +++ b/external/googleapis/protodeps/netapp.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/networkconnectivity.deps b/external/googleapis/protodeps/networkconnectivity.deps index 549af4e186636..6055d685d86c1 100644 --- a/external/googleapis/protodeps/networkconnectivity.deps +++ b/external/googleapis/protodeps/networkconnectivity.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:error_details_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:error_details_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/networkmanagement.deps b/external/googleapis/protodeps/networkmanagement.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/networkmanagement.deps +++ b/external/googleapis/protodeps/networkmanagement.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/networksecurity.deps b/external/googleapis/protodeps/networksecurity.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/networksecurity.deps +++ b/external/googleapis/protodeps/networksecurity.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/networkservices.deps b/external/googleapis/protodeps/networkservices.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/networkservices.deps +++ b/external/googleapis/protodeps/networkservices.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/notebooks.deps b/external/googleapis/protodeps/notebooks.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/notebooks.deps +++ b/external/googleapis/protodeps/notebooks.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/optimization.deps b/external/googleapis/protodeps/optimization.deps index adcc65c0bd05f..01bfe98dfffbd 100644 --- a/external/googleapis/protodeps/optimization.deps +++ b/external/googleapis/protodeps/optimization.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:latlng_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:latlng_proto diff --git a/external/googleapis/protodeps/oracledatabase.deps b/external/googleapis/protodeps/oracledatabase.deps index ec9a1e918f795..8dbc33f98fbe6 100644 --- a/external/googleapis/protodeps/oracledatabase.deps +++ b/external/googleapis/protodeps/oracledatabase.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:month_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:month_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/orgpolicy.deps b/external/googleapis/protodeps/orgpolicy.deps index bd46b0cedb062..95e1c03aafd45 100644 --- a/external/googleapis/protodeps/orgpolicy.deps +++ b/external/googleapis/protodeps/orgpolicy.deps @@ -1,7 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/osconfig.deps b/external/googleapis/protodeps/osconfig.deps index f8d1159c4429c..73b148e638ab4 100644 --- a/external/googleapis/protodeps/osconfig.deps +++ b/external/googleapis/protodeps/osconfig.deps @@ -1,12 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:datetime_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:datetime_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/oslogin.deps b/external/googleapis/protodeps/oslogin.deps index 789389795384a..e41a179464293 100644 --- a/external/googleapis/protodeps/oslogin.deps +++ b/external/googleapis/protodeps/oslogin.deps @@ -1,7 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/oslogin/common:common_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/oslogin/common:common_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/parallelstore.deps b/external/googleapis/protodeps/parallelstore.deps index 0070a78d1da1d..c38fafb3763df 100644 --- a/external/googleapis/protodeps/parallelstore.deps +++ b/external/googleapis/protodeps/parallelstore.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/parametermanager.deps b/external/googleapis/protodeps/parametermanager.deps index 5b0f6e6ecbcd0..58d4140ff41a3 100644 --- a/external/googleapis/protodeps/parametermanager.deps +++ b/external/googleapis/protodeps/parametermanager.deps @@ -1,8 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/policysimulator.deps b/external/googleapis/protodeps/policysimulator.deps index a2410bf813156..2cc7903fd7e31 100644 --- a/external/googleapis/protodeps/policysimulator.deps +++ b/external/googleapis/protodeps/policysimulator.deps @@ -1,12 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/orgpolicy/v2:orgpolicy_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/orgpolicy/v2:orgpolicy_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/policytroubleshooter.deps b/external/googleapis/protodeps/policytroubleshooter.deps index b814dcc68cf04..6eb8ac6c618ee 100644 --- a/external/googleapis/protodeps/policytroubleshooter.deps +++ b/external/googleapis/protodeps/policytroubleshooter.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v2:policy_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v2:policy_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/privateca.deps b/external/googleapis/protodeps/privateca.deps index ea852ac64f42a..5290041a37946 100644 --- a/external/googleapis/protodeps/privateca.deps +++ b/external/googleapis/protodeps/privateca.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/privilegedaccessmanager.deps b/external/googleapis/protodeps/privilegedaccessmanager.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/privilegedaccessmanager.deps +++ b/external/googleapis/protodeps/privilegedaccessmanager.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/profiler.deps b/external/googleapis/protodeps/profiler.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/profiler.deps +++ b/external/googleapis/protodeps/profiler.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/publicca.deps b/external/googleapis/protodeps/publicca.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/publicca.deps +++ b/external/googleapis/protodeps/publicca.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/pubsub.deps b/external/googleapis/protodeps/pubsub.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/pubsub.deps +++ b/external/googleapis/protodeps/pubsub.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/pubsublite.deps b/external/googleapis/protodeps/pubsublite.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/pubsublite.deps +++ b/external/googleapis/protodeps/pubsublite.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/rapidmigrationassessment.deps b/external/googleapis/protodeps/rapidmigrationassessment.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/rapidmigrationassessment.deps +++ b/external/googleapis/protodeps/rapidmigrationassessment.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/recaptchaenterprise.deps b/external/googleapis/protodeps/recaptchaenterprise.deps index c4941d895e95b..215c8fb2926ff 100644 --- a/external/googleapis/protodeps/recaptchaenterprise.deps +++ b/external/googleapis/protodeps/recaptchaenterprise.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/recommender.deps b/external/googleapis/protodeps/recommender.deps index d39c17013f4d3..c2af991168b9b 100644 --- a/external/googleapis/protodeps/recommender.deps +++ b/external/googleapis/protodeps/recommender.deps @@ -1,8 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/cloud/recommender/v1:recommender_proto -@com_google_googleapis//google/type:money_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/cloud/recommender/v1:recommender_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:money_proto diff --git a/external/googleapis/protodeps/redis.deps b/external/googleapis/protodeps/redis.deps index d820005adbc5a..4760fd1987644 100644 --- a/external/googleapis/protodeps/redis.deps +++ b/external/googleapis/protodeps/redis.deps @@ -1,11 +1,11 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:dayofweek_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:dayofweek_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/resourcemanager.deps b/external/googleapis/protodeps/resourcemanager.deps index 9098b1b674ef2..11efb6f9d66da 100644 --- a/external/googleapis/protodeps/resourcemanager.deps +++ b/external/googleapis/protodeps/resourcemanager.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/retail.deps b/external/googleapis/protodeps/retail.deps index d2fe5d9ee5836..ba7d47fadd611 100644 --- a/external/googleapis/protodeps/retail.deps +++ b/external/googleapis/protodeps/retail.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:httpbody_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:httpbody_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto diff --git a/external/googleapis/protodeps/run.deps b/external/googleapis/protodeps/run.deps index c74f9bbf1f0cc..fa07d4ad68c5b 100644 --- a/external/googleapis/protodeps/run.deps +++ b/external/googleapis/protodeps/run.deps @@ -1,14 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/scheduler.deps b/external/googleapis/protodeps/scheduler.deps index da299b760ccb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/scheduler.deps +++ b/external/googleapis/protodeps/scheduler.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/secretmanager.deps b/external/googleapis/protodeps/secretmanager.deps index e027a4c044e59..ac9f9bb108292 100644 --- a/external/googleapis/protodeps/secretmanager.deps +++ b/external/googleapis/protodeps/secretmanager.deps @@ -1,11 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/securesourcemanager.deps b/external/googleapis/protodeps/securesourcemanager.deps index 9098b1b674ef2..11efb6f9d66da 100644 --- a/external/googleapis/protodeps/securesourcemanager.deps +++ b/external/googleapis/protodeps/securesourcemanager.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/securitycenter.deps b/external/googleapis/protodeps/securitycenter.deps index c74f9bbf1f0cc..fa07d4ad68c5b 100644 --- a/external/googleapis/protodeps/securitycenter.deps +++ b/external/googleapis/protodeps/securitycenter.deps @@ -1,14 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/securitycentermanagement.deps b/external/googleapis/protodeps/securitycentermanagement.deps index 5f83d2c4fe211..8597ef29e4c83 100644 --- a/external/googleapis/protodeps/securitycentermanagement.deps +++ b/external/googleapis/protodeps/securitycentermanagement.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/servicecontrol.deps b/external/googleapis/protodeps/servicecontrol.deps index 0910235a94fa3..9f374fa21a603 100644 --- a/external/googleapis/protodeps/servicecontrol.deps +++ b/external/googleapis/protodeps/servicecontrol.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:distribution_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/logging/type:type_proto -@com_google_googleapis//google/rpc/context:attribute_context_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:distribution_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/logging/type:type_proto +@googleapis//google/rpc/context:attribute_context_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/servicedirectory.deps b/external/googleapis/protodeps/servicedirectory.deps index e027a4c044e59..ac9f9bb108292 100644 --- a/external/googleapis/protodeps/servicedirectory.deps +++ b/external/googleapis/protodeps/servicedirectory.deps @@ -1,11 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/servicehealth.deps b/external/googleapis/protodeps/servicehealth.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/servicehealth.deps +++ b/external/googleapis/protodeps/servicehealth.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/servicemanagement.deps b/external/googleapis/protodeps/servicemanagement.deps index d8c1c3c97b2e9..1e73905ffe0dd 100644 --- a/external/googleapis/protodeps/servicemanagement.deps +++ b/external/googleapis/protodeps/servicemanagement.deps @@ -1,29 +1,29 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:auth_proto -@com_google_googleapis//google/api:backend_proto -@com_google_googleapis//google/api:billing_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:config_change_proto -@com_google_googleapis//google/api:context_proto -@com_google_googleapis//google/api:control_proto -@com_google_googleapis//google/api:documentation_proto -@com_google_googleapis//google/api:endpoint_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:label_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:log_proto -@com_google_googleapis//google/api:logging_proto -@com_google_googleapis//google/api:metric_proto -@com_google_googleapis//google/api:monitored_resource_proto -@com_google_googleapis//google/api:monitoring_proto -@com_google_googleapis//google/api:policy_proto -@com_google_googleapis//google/api:quota_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:service_proto -@com_google_googleapis//google/api:source_info_proto -@com_google_googleapis//google/api:system_parameter_proto -@com_google_googleapis//google/api:usage_proto -@com_google_googleapis//google/api:visibility_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:auth_proto +@googleapis//google/api:backend_proto +@googleapis//google/api:billing_proto +@googleapis//google/api:client_proto +@googleapis//google/api:config_change_proto +@googleapis//google/api:context_proto +@googleapis//google/api:control_proto +@googleapis//google/api:documentation_proto +@googleapis//google/api:endpoint_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:label_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:log_proto +@googleapis//google/api:logging_proto +@googleapis//google/api:metric_proto +@googleapis//google/api:monitored_resource_proto +@googleapis//google/api:monitoring_proto +@googleapis//google/api:policy_proto +@googleapis//google/api:quota_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:service_proto +@googleapis//google/api:source_info_proto +@googleapis//google/api:system_parameter_proto +@googleapis//google/api:usage_proto +@googleapis//google/api:visibility_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/serviceusage.deps b/external/googleapis/protodeps/serviceusage.deps index 4101bfc533315..63834b543b9e1 100644 --- a/external/googleapis/protodeps/serviceusage.deps +++ b/external/googleapis/protodeps/serviceusage.deps @@ -1,17 +1,17 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:auth_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:documentation_proto -@com_google_googleapis//google/api:endpoint_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:label_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:monitored_resource_proto -@com_google_googleapis//google/api:monitoring_proto -@com_google_googleapis//google/api:quota_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:usage_proto -@com_google_googleapis//google/api:visibility_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:auth_proto +@googleapis//google/api:client_proto +@googleapis//google/api:documentation_proto +@googleapis//google/api:endpoint_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:label_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:monitored_resource_proto +@googleapis//google/api:monitoring_proto +@googleapis//google/api:quota_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:usage_proto +@googleapis//google/api:visibility_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/shell.deps b/external/googleapis/protodeps/shell.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/shell.deps +++ b/external/googleapis/protodeps/shell.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/spanner.deps b/external/googleapis/protodeps/spanner.deps index 9098b1b674ef2..11efb6f9d66da 100644 --- a/external/googleapis/protodeps/spanner.deps +++ b/external/googleapis/protodeps/spanner.deps @@ -1,13 +1,13 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/speech.deps b/external/googleapis/protodeps/speech.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/speech.deps +++ b/external/googleapis/protodeps/speech.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/sql.deps b/external/googleapis/protodeps/sql.deps index 9fab3b1b5e5fb..6312d7a490f63 100644 --- a/external/googleapis/protodeps/sql.deps +++ b/external/googleapis/protodeps/sql.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/storage.deps b/external/googleapis/protodeps/storage.deps index d0ef8487c5bde..c253719c21070 100644 --- a/external/googleapis/protodeps/storage.deps +++ b/external/googleapis/protodeps/storage.deps @@ -1,14 +1,14 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/storagebatchoperations.deps b/external/googleapis/protodeps/storagebatchoperations.deps index 4acfec14be68d..eab9f2cd5cecf 100644 --- a/external/googleapis/protodeps/storagebatchoperations.deps +++ b/external/googleapis/protodeps/storagebatchoperations.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/storagecontrol.deps b/external/googleapis/protodeps/storagecontrol.deps index c592de3ec96f1..82b8f2ed76f34 100644 --- a/external/googleapis/protodeps/storagecontrol.deps +++ b/external/googleapis/protodeps/storagecontrol.deps @@ -1,15 +1,15 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:routing_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:routing_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/storageinsights.deps b/external/googleapis/protodeps/storageinsights.deps index daade2723f218..f2a3876fd991a 100644 --- a/external/googleapis/protodeps/storageinsights.deps +++ b/external/googleapis/protodeps/storageinsights.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:datetime_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:datetime_proto diff --git a/external/googleapis/protodeps/storagetransfer.deps b/external/googleapis/protodeps/storagetransfer.deps index d874c482d341b..02c4f744264c2 100644 --- a/external/googleapis/protodeps/storagetransfer.deps +++ b/external/googleapis/protodeps/storagetransfer.deps @@ -1,11 +1,11 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:code_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:date_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:code_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:date_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/support.deps b/external/googleapis/protodeps/support.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/support.deps +++ b/external/googleapis/protodeps/support.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/talent.deps b/external/googleapis/protodeps/talent.deps index 95aee605883ca..81bb11b047629 100644 --- a/external/googleapis/protodeps/talent.deps +++ b/external/googleapis/protodeps/talent.deps @@ -1,12 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:latlng_proto -@com_google_googleapis//google/type:money_proto -@com_google_googleapis//google/type:postal_address_proto -@com_google_googleapis//google/type:timeofday_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:latlng_proto +@googleapis//google/type:money_proto +@googleapis//google/type:postal_address_proto +@googleapis//google/type:timeofday_proto diff --git a/external/googleapis/protodeps/tasks.deps b/external/googleapis/protodeps/tasks.deps index 8c879a7869b75..ac9f9bb108292 100644 --- a/external/googleapis/protodeps/tasks.deps +++ b/external/googleapis/protodeps/tasks.deps @@ -1,12 +1,12 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:iam_policy_proto -@com_google_googleapis//google/iam/v1:options_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/iam/v1:resource_policy_member_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:iam_policy_proto +@googleapis//google/iam/v1:options_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/iam/v1:resource_policy_member_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/telcoautomation.deps b/external/googleapis/protodeps/telcoautomation.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/telcoautomation.deps +++ b/external/googleapis/protodeps/telcoautomation.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/texttospeech.deps b/external/googleapis/protodeps/texttospeech.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/texttospeech.deps +++ b/external/googleapis/protodeps/texttospeech.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/timeseriesinsights.deps b/external/googleapis/protodeps/timeseriesinsights.deps index da299b760ccb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/timeseriesinsights.deps +++ b/external/googleapis/protodeps/timeseriesinsights.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/tpu.deps b/external/googleapis/protodeps/tpu.deps index 2e6ff1caf713a..4bbe4120b3305 100644 --- a/external/googleapis/protodeps/tpu.deps +++ b/external/googleapis/protodeps/tpu.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:interval_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:interval_proto diff --git a/external/googleapis/protodeps/trace.deps b/external/googleapis/protodeps/trace.deps index da299b760ccb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/trace.deps +++ b/external/googleapis/protodeps/trace.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/translate.deps b/external/googleapis/protodeps/translate.deps index 998ea7357574a..eb22dfc51db28 100644 --- a/external/googleapis/protodeps/translate.deps +++ b/external/googleapis/protodeps/translate.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/iam/v1:policy_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:expr_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/iam/v1:policy_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:expr_proto diff --git a/external/googleapis/protodeps/video.deps b/external/googleapis/protodeps/video.deps index bd1493be2995f..6f45ca705af53 100644 --- a/external/googleapis/protodeps/video.deps +++ b/external/googleapis/protodeps/video.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:datetime_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:datetime_proto diff --git a/external/googleapis/protodeps/videointelligence.deps b/external/googleapis/protodeps/videointelligence.deps index 9fab3b1b5e5fb..6312d7a490f63 100644 --- a/external/googleapis/protodeps/videointelligence.deps +++ b/external/googleapis/protodeps/videointelligence.deps @@ -1,7 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/vision.deps b/external/googleapis/protodeps/vision.deps index 4e2049ed4bd4b..6fd15a7dd96d7 100644 --- a/external/googleapis/protodeps/vision.deps +++ b/external/googleapis/protodeps/vision.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/type:color_proto -@com_google_googleapis//google/type:latlng_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/type:color_proto +@googleapis//google/type:latlng_proto diff --git a/external/googleapis/protodeps/vmmigration.deps b/external/googleapis/protodeps/vmmigration.deps index 549af4e186636..6055d685d86c1 100644 --- a/external/googleapis/protodeps/vmmigration.deps +++ b/external/googleapis/protodeps/vmmigration.deps @@ -1,10 +1,10 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:error_details_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:error_details_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/vmwareengine.deps b/external/googleapis/protodeps/vmwareengine.deps index 3797f67d24463..ce4eebcf1a3ab 100644 --- a/external/googleapis/protodeps/vmwareengine.deps +++ b/external/googleapis/protodeps/vmwareengine.deps @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:field_info_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:field_info_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/vpcaccess.deps b/external/googleapis/protodeps/vpcaccess.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/vpcaccess.deps +++ b/external/googleapis/protodeps/vpcaccess.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/webrisk.deps b/external/googleapis/protodeps/webrisk.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/webrisk.deps +++ b/external/googleapis/protodeps/webrisk.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/websecurityscanner.deps b/external/googleapis/protodeps/websecurityscanner.deps index 2e749051efbb4..5c7b273c6aea4 100644 --- a/external/googleapis/protodeps/websecurityscanner.deps +++ b/external/googleapis/protodeps/websecurityscanner.deps @@ -1,6 +1,7 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/workflows.deps b/external/googleapis/protodeps/workflows.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/workflows.deps +++ b/external/googleapis/protodeps/workflows.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protodeps/workstations.deps b/external/googleapis/protodeps/workstations.deps index 6ef8f9ccdeb73..3a69eb58546e0 100644 --- a/external/googleapis/protodeps/workstations.deps +++ b/external/googleapis/protodeps/workstations.deps @@ -1,8 +1,8 @@ -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:http_proto -@com_google_googleapis//google/api:launch_stage_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:client_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:http_proto +@googleapis//google/api:launch_stage_proto +@googleapis//google/api:resource_proto +@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto diff --git a/external/googleapis/protolists/accessapproval.list b/external/googleapis/protolists/accessapproval.list index 5a99edaabd357..99843cd3e7c0f 100644 --- a/external/googleapis/protolists/accessapproval.list +++ b/external/googleapis/protolists/accessapproval.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/accessapproval/v1:accessapproval.proto +@googleapis//google/cloud/accessapproval/v1:accessapproval.proto diff --git a/external/googleapis/protolists/accesscontextmanager.list b/external/googleapis/protolists/accesscontextmanager.list index 525ee1e644d80..78eee05ee01ce 100644 --- a/external/googleapis/protolists/accesscontextmanager.list +++ b/external/googleapis/protolists/accesscontextmanager.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/identity/accesscontextmanager/type:device_resources.proto -@com_google_googleapis//google/identity/accesscontextmanager/v1:access_context_manager.proto -@com_google_googleapis//google/identity/accesscontextmanager/v1:access_level.proto -@com_google_googleapis//google/identity/accesscontextmanager/v1:access_policy.proto -@com_google_googleapis//google/identity/accesscontextmanager/v1:gcp_user_access_binding.proto -@com_google_googleapis//google/identity/accesscontextmanager/v1:service_perimeter.proto +@googleapis//google/identity/accesscontextmanager/type:device_resources.proto +@googleapis//google/identity/accesscontextmanager/v1:access_context_manager.proto +@googleapis//google/identity/accesscontextmanager/v1:access_level.proto +@googleapis//google/identity/accesscontextmanager/v1:access_policy.proto +@googleapis//google/identity/accesscontextmanager/v1:gcp_user_access_binding.proto +@googleapis//google/identity/accesscontextmanager/v1:service_perimeter.proto diff --git a/external/googleapis/protolists/advisorynotifications.list b/external/googleapis/protolists/advisorynotifications.list index 43db20b963bdd..aaea7387f3e11 100644 --- a/external/googleapis/protolists/advisorynotifications.list +++ b/external/googleapis/protolists/advisorynotifications.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/advisorynotifications/v1:service.proto +@googleapis//google/cloud/advisorynotifications/v1:service.proto diff --git a/external/googleapis/protolists/aiplatform.list b/external/googleapis/protolists/aiplatform.list index 11bb4ba69fa3b..e9320c941d622 100644 --- a/external/googleapis/protolists/aiplatform.list +++ b/external/googleapis/protolists/aiplatform.list @@ -1,159 +1,159 @@ -@com_google_googleapis//google/cloud/aiplatform/logging:prediction.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:image_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:image_object_detection.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:image_segmentation.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:text_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:text_extraction.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:text_sentiment.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:video_action_recognition.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:video_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:video_object_tracking.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:image_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:image_object_detection.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:image_segmentation.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:video_action_recognition.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:video_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:video_object_tracking.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:image_object_detection.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:image_segmentation.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:tabular_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:tabular_regression.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:text_extraction.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:text_sentiment.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:video_action_recognition.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:video_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:video_object_tracking.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_image_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_image_object_detection.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_image_segmentation.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_tables.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_text_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_text_extraction.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_text_sentiment.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_video_action_recognition.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_video_classification.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_video_object_tracking.proto -@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:export_evaluated_data_items_config.proto -@com_google_googleapis//google/cloud/aiplatform/v1:accelerator_type.proto -@com_google_googleapis//google/cloud/aiplatform/v1:annotation.proto -@com_google_googleapis//google/cloud/aiplatform/v1:annotation_spec.proto -@com_google_googleapis//google/cloud/aiplatform/v1:api_auth.proto -@com_google_googleapis//google/cloud/aiplatform/v1:artifact.proto -@com_google_googleapis//google/cloud/aiplatform/v1:batch_prediction_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:cached_content.proto -@com_google_googleapis//google/cloud/aiplatform/v1:completion_stats.proto -@com_google_googleapis//google/cloud/aiplatform/v1:content.proto -@com_google_googleapis//google/cloud/aiplatform/v1:context.proto -@com_google_googleapis//google/cloud/aiplatform/v1:custom_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:data_foundry_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:data_item.proto -@com_google_googleapis//google/cloud/aiplatform/v1:data_labeling_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:dataset.proto -@com_google_googleapis//google/cloud/aiplatform/v1:dataset_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:dataset_version.proto -@com_google_googleapis//google/cloud/aiplatform/v1:deployed_index_ref.proto -@com_google_googleapis//google/cloud/aiplatform/v1:deployed_model_ref.proto -@com_google_googleapis//google/cloud/aiplatform/v1:deployment_resource_pool.proto -@com_google_googleapis//google/cloud/aiplatform/v1:deployment_resource_pool_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:deployment_stage.proto -@com_google_googleapis//google/cloud/aiplatform/v1:encryption_spec.proto -@com_google_googleapis//google/cloud/aiplatform/v1:endpoint.proto -@com_google_googleapis//google/cloud/aiplatform/v1:endpoint_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:entity_type.proto -@com_google_googleapis//google/cloud/aiplatform/v1:env_var.proto -@com_google_googleapis//google/cloud/aiplatform/v1:evaluated_annotation.proto -@com_google_googleapis//google/cloud/aiplatform/v1:evaluation_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:event.proto -@com_google_googleapis//google/cloud/aiplatform/v1:execution.proto -@com_google_googleapis//google/cloud/aiplatform/v1:explanation.proto -@com_google_googleapis//google/cloud/aiplatform/v1:explanation_metadata.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_group.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_monitoring_stats.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_online_store.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_online_store_admin_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_online_store_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_registry_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_selector.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_view.proto -@com_google_googleapis//google/cloud/aiplatform/v1:feature_view_sync.proto -@com_google_googleapis//google/cloud/aiplatform/v1:featurestore.proto -@com_google_googleapis//google/cloud/aiplatform/v1:featurestore_monitoring.proto -@com_google_googleapis//google/cloud/aiplatform/v1:featurestore_online_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:featurestore_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:gen_ai_cache_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:genai_tuning_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:hyperparameter_tuning_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:index.proto -@com_google_googleapis//google/cloud/aiplatform/v1:index_endpoint.proto -@com_google_googleapis//google/cloud/aiplatform/v1:index_endpoint_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:index_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:io.proto -@com_google_googleapis//google/cloud/aiplatform/v1:job_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:job_state.proto -@com_google_googleapis//google/cloud/aiplatform/v1:lineage_subgraph.proto -@com_google_googleapis//google/cloud/aiplatform/v1:llm_utility_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:machine_resources.proto -@com_google_googleapis//google/cloud/aiplatform/v1:manual_batch_tuning_parameters.proto -@com_google_googleapis//google/cloud/aiplatform/v1:match_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:metadata_schema.proto -@com_google_googleapis//google/cloud/aiplatform/v1:metadata_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:metadata_store.proto -@com_google_googleapis//google/cloud/aiplatform/v1:migratable_resource.proto -@com_google_googleapis//google/cloud/aiplatform/v1:migration_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model_deployment_monitoring_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model_evaluation.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model_evaluation_slice.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model_garden_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model_monitoring.proto -@com_google_googleapis//google/cloud/aiplatform/v1:model_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:nas_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:network_spec.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_euc_config.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_execution_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_idle_shutdown_config.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_runtime.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_runtime_template_ref.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:notebook_software_config.proto -@com_google_googleapis//google/cloud/aiplatform/v1:openapi.proto -@com_google_googleapis//google/cloud/aiplatform/v1:operation.proto -@com_google_googleapis//google/cloud/aiplatform/v1:persistent_resource.proto -@com_google_googleapis//google/cloud/aiplatform/v1:persistent_resource_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:pipeline_failure_policy.proto -@com_google_googleapis//google/cloud/aiplatform/v1:pipeline_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:pipeline_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:pipeline_state.proto -@com_google_googleapis//google/cloud/aiplatform/v1:prediction_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:publisher_model.proto -@com_google_googleapis//google/cloud/aiplatform/v1:reasoning_engine.proto -@com_google_googleapis//google/cloud/aiplatform/v1:reasoning_engine_execution_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:reasoning_engine_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:reservation_affinity.proto -@com_google_googleapis//google/cloud/aiplatform/v1:saved_query.proto -@com_google_googleapis//google/cloud/aiplatform/v1:schedule.proto -@com_google_googleapis//google/cloud/aiplatform/v1:schedule_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:service_networking.proto -@com_google_googleapis//google/cloud/aiplatform/v1:specialist_pool.proto -@com_google_googleapis//google/cloud/aiplatform/v1:specialist_pool_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:study.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tensorboard.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tensorboard_data.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tensorboard_experiment.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tensorboard_run.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tensorboard_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tensorboard_time_series.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tool.proto -@com_google_googleapis//google/cloud/aiplatform/v1:training_pipeline.proto -@com_google_googleapis//google/cloud/aiplatform/v1:tuning_job.proto -@com_google_googleapis//google/cloud/aiplatform/v1:types.proto -@com_google_googleapis//google/cloud/aiplatform/v1:unmanaged_container_model.proto -@com_google_googleapis//google/cloud/aiplatform/v1:usage_metadata.proto -@com_google_googleapis//google/cloud/aiplatform/v1:user_action_reference.proto -@com_google_googleapis//google/cloud/aiplatform/v1:value.proto -@com_google_googleapis//google/cloud/aiplatform/v1:vertex_rag_data.proto -@com_google_googleapis//google/cloud/aiplatform/v1:vertex_rag_data_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:vertex_rag_service.proto -@com_google_googleapis//google/cloud/aiplatform/v1:vizier_service.proto +@googleapis//google/cloud/aiplatform/logging:prediction.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:image_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:image_object_detection.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:image_segmentation.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:text_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:text_extraction.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:text_sentiment.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:video_action_recognition.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:video_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:video_object_tracking.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/params:image_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/params:image_object_detection.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/params:image_segmentation.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/params:video_action_recognition.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/params:video_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/params:video_object_tracking.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:image_object_detection.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:image_segmentation.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:tabular_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:tabular_regression.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:text_extraction.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:text_sentiment.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:video_action_recognition.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:video_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:video_object_tracking.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_image_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_image_object_detection.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_image_segmentation.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_tables.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_text_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_text_extraction.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_text_sentiment.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_video_action_recognition.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_video_classification.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:automl_video_object_tracking.proto +@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:export_evaluated_data_items_config.proto +@googleapis//google/cloud/aiplatform/v1:accelerator_type.proto +@googleapis//google/cloud/aiplatform/v1:annotation.proto +@googleapis//google/cloud/aiplatform/v1:annotation_spec.proto +@googleapis//google/cloud/aiplatform/v1:api_auth.proto +@googleapis//google/cloud/aiplatform/v1:artifact.proto +@googleapis//google/cloud/aiplatform/v1:batch_prediction_job.proto +@googleapis//google/cloud/aiplatform/v1:cached_content.proto +@googleapis//google/cloud/aiplatform/v1:completion_stats.proto +@googleapis//google/cloud/aiplatform/v1:content.proto +@googleapis//google/cloud/aiplatform/v1:context.proto +@googleapis//google/cloud/aiplatform/v1:custom_job.proto +@googleapis//google/cloud/aiplatform/v1:data_foundry_service.proto +@googleapis//google/cloud/aiplatform/v1:data_item.proto +@googleapis//google/cloud/aiplatform/v1:data_labeling_job.proto +@googleapis//google/cloud/aiplatform/v1:dataset.proto +@googleapis//google/cloud/aiplatform/v1:dataset_service.proto +@googleapis//google/cloud/aiplatform/v1:dataset_version.proto +@googleapis//google/cloud/aiplatform/v1:deployed_index_ref.proto +@googleapis//google/cloud/aiplatform/v1:deployed_model_ref.proto +@googleapis//google/cloud/aiplatform/v1:deployment_resource_pool.proto +@googleapis//google/cloud/aiplatform/v1:deployment_resource_pool_service.proto +@googleapis//google/cloud/aiplatform/v1:deployment_stage.proto +@googleapis//google/cloud/aiplatform/v1:encryption_spec.proto +@googleapis//google/cloud/aiplatform/v1:endpoint.proto +@googleapis//google/cloud/aiplatform/v1:endpoint_service.proto +@googleapis//google/cloud/aiplatform/v1:entity_type.proto +@googleapis//google/cloud/aiplatform/v1:env_var.proto +@googleapis//google/cloud/aiplatform/v1:evaluated_annotation.proto +@googleapis//google/cloud/aiplatform/v1:evaluation_service.proto +@googleapis//google/cloud/aiplatform/v1:event.proto +@googleapis//google/cloud/aiplatform/v1:execution.proto +@googleapis//google/cloud/aiplatform/v1:explanation.proto +@googleapis//google/cloud/aiplatform/v1:explanation_metadata.proto +@googleapis//google/cloud/aiplatform/v1:feature.proto +@googleapis//google/cloud/aiplatform/v1:feature_group.proto +@googleapis//google/cloud/aiplatform/v1:feature_monitoring_stats.proto +@googleapis//google/cloud/aiplatform/v1:feature_online_store.proto +@googleapis//google/cloud/aiplatform/v1:feature_online_store_admin_service.proto +@googleapis//google/cloud/aiplatform/v1:feature_online_store_service.proto +@googleapis//google/cloud/aiplatform/v1:feature_registry_service.proto +@googleapis//google/cloud/aiplatform/v1:feature_selector.proto +@googleapis//google/cloud/aiplatform/v1:feature_view.proto +@googleapis//google/cloud/aiplatform/v1:feature_view_sync.proto +@googleapis//google/cloud/aiplatform/v1:featurestore.proto +@googleapis//google/cloud/aiplatform/v1:featurestore_monitoring.proto +@googleapis//google/cloud/aiplatform/v1:featurestore_online_service.proto +@googleapis//google/cloud/aiplatform/v1:featurestore_service.proto +@googleapis//google/cloud/aiplatform/v1:gen_ai_cache_service.proto +@googleapis//google/cloud/aiplatform/v1:genai_tuning_service.proto +@googleapis//google/cloud/aiplatform/v1:hyperparameter_tuning_job.proto +@googleapis//google/cloud/aiplatform/v1:index.proto +@googleapis//google/cloud/aiplatform/v1:index_endpoint.proto +@googleapis//google/cloud/aiplatform/v1:index_endpoint_service.proto +@googleapis//google/cloud/aiplatform/v1:index_service.proto +@googleapis//google/cloud/aiplatform/v1:io.proto +@googleapis//google/cloud/aiplatform/v1:job_service.proto +@googleapis//google/cloud/aiplatform/v1:job_state.proto +@googleapis//google/cloud/aiplatform/v1:lineage_subgraph.proto +@googleapis//google/cloud/aiplatform/v1:llm_utility_service.proto +@googleapis//google/cloud/aiplatform/v1:machine_resources.proto +@googleapis//google/cloud/aiplatform/v1:manual_batch_tuning_parameters.proto +@googleapis//google/cloud/aiplatform/v1:match_service.proto +@googleapis//google/cloud/aiplatform/v1:metadata_schema.proto +@googleapis//google/cloud/aiplatform/v1:metadata_service.proto +@googleapis//google/cloud/aiplatform/v1:metadata_store.proto +@googleapis//google/cloud/aiplatform/v1:migratable_resource.proto +@googleapis//google/cloud/aiplatform/v1:migration_service.proto +@googleapis//google/cloud/aiplatform/v1:model.proto +@googleapis//google/cloud/aiplatform/v1:model_deployment_monitoring_job.proto +@googleapis//google/cloud/aiplatform/v1:model_evaluation.proto +@googleapis//google/cloud/aiplatform/v1:model_evaluation_slice.proto +@googleapis//google/cloud/aiplatform/v1:model_garden_service.proto +@googleapis//google/cloud/aiplatform/v1:model_monitoring.proto +@googleapis//google/cloud/aiplatform/v1:model_service.proto +@googleapis//google/cloud/aiplatform/v1:nas_job.proto +@googleapis//google/cloud/aiplatform/v1:network_spec.proto +@googleapis//google/cloud/aiplatform/v1:notebook_euc_config.proto +@googleapis//google/cloud/aiplatform/v1:notebook_execution_job.proto +@googleapis//google/cloud/aiplatform/v1:notebook_idle_shutdown_config.proto +@googleapis//google/cloud/aiplatform/v1:notebook_runtime.proto +@googleapis//google/cloud/aiplatform/v1:notebook_runtime_template_ref.proto +@googleapis//google/cloud/aiplatform/v1:notebook_service.proto +@googleapis//google/cloud/aiplatform/v1:notebook_software_config.proto +@googleapis//google/cloud/aiplatform/v1:openapi.proto +@googleapis//google/cloud/aiplatform/v1:operation.proto +@googleapis//google/cloud/aiplatform/v1:persistent_resource.proto +@googleapis//google/cloud/aiplatform/v1:persistent_resource_service.proto +@googleapis//google/cloud/aiplatform/v1:pipeline_failure_policy.proto +@googleapis//google/cloud/aiplatform/v1:pipeline_job.proto +@googleapis//google/cloud/aiplatform/v1:pipeline_service.proto +@googleapis//google/cloud/aiplatform/v1:pipeline_state.proto +@googleapis//google/cloud/aiplatform/v1:prediction_service.proto +@googleapis//google/cloud/aiplatform/v1:publisher_model.proto +@googleapis//google/cloud/aiplatform/v1:reasoning_engine.proto +@googleapis//google/cloud/aiplatform/v1:reasoning_engine_execution_service.proto +@googleapis//google/cloud/aiplatform/v1:reasoning_engine_service.proto +@googleapis//google/cloud/aiplatform/v1:reservation_affinity.proto +@googleapis//google/cloud/aiplatform/v1:saved_query.proto +@googleapis//google/cloud/aiplatform/v1:schedule.proto +@googleapis//google/cloud/aiplatform/v1:schedule_service.proto +@googleapis//google/cloud/aiplatform/v1:service_networking.proto +@googleapis//google/cloud/aiplatform/v1:specialist_pool.proto +@googleapis//google/cloud/aiplatform/v1:specialist_pool_service.proto +@googleapis//google/cloud/aiplatform/v1:study.proto +@googleapis//google/cloud/aiplatform/v1:tensorboard.proto +@googleapis//google/cloud/aiplatform/v1:tensorboard_data.proto +@googleapis//google/cloud/aiplatform/v1:tensorboard_experiment.proto +@googleapis//google/cloud/aiplatform/v1:tensorboard_run.proto +@googleapis//google/cloud/aiplatform/v1:tensorboard_service.proto +@googleapis//google/cloud/aiplatform/v1:tensorboard_time_series.proto +@googleapis//google/cloud/aiplatform/v1:tool.proto +@googleapis//google/cloud/aiplatform/v1:training_pipeline.proto +@googleapis//google/cloud/aiplatform/v1:tuning_job.proto +@googleapis//google/cloud/aiplatform/v1:types.proto +@googleapis//google/cloud/aiplatform/v1:unmanaged_container_model.proto +@googleapis//google/cloud/aiplatform/v1:usage_metadata.proto +@googleapis//google/cloud/aiplatform/v1:user_action_reference.proto +@googleapis//google/cloud/aiplatform/v1:value.proto +@googleapis//google/cloud/aiplatform/v1:vertex_rag_data.proto +@googleapis//google/cloud/aiplatform/v1:vertex_rag_data_service.proto +@googleapis//google/cloud/aiplatform/v1:vertex_rag_service.proto +@googleapis//google/cloud/aiplatform/v1:vizier_service.proto diff --git a/external/googleapis/protolists/alloydb.list b/external/googleapis/protolists/alloydb.list index ba56b31936a46..bffc9babb8c6b 100644 --- a/external/googleapis/protolists/alloydb.list +++ b/external/googleapis/protolists/alloydb.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/alloydb/v1:csql_resources.proto -@com_google_googleapis//google/cloud/alloydb/v1:csql_service.proto -@com_google_googleapis//google/cloud/alloydb/v1:data_model.proto -@com_google_googleapis//google/cloud/alloydb/v1:resources.proto -@com_google_googleapis//google/cloud/alloydb/v1:service.proto +@googleapis//google/cloud/alloydb/v1:csql_resources.proto +@googleapis//google/cloud/alloydb/v1:csql_service.proto +@googleapis//google/cloud/alloydb/v1:data_model.proto +@googleapis//google/cloud/alloydb/v1:resources.proto +@googleapis//google/cloud/alloydb/v1:service.proto diff --git a/external/googleapis/protolists/apigateway.list b/external/googleapis/protolists/apigateway.list index 45ec3e32801f4..14440962c2dd2 100644 --- a/external/googleapis/protolists/apigateway.list +++ b/external/googleapis/protolists/apigateway.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/apigateway/v1:apigateway.proto -@com_google_googleapis//google/cloud/apigateway/v1:apigateway_service.proto +@googleapis//google/cloud/apigateway/v1:apigateway.proto +@googleapis//google/cloud/apigateway/v1:apigateway_service.proto diff --git a/external/googleapis/protolists/apigeeconnect.list b/external/googleapis/protolists/apigeeconnect.list index df09cb07d7e15..58e521d081404 100644 --- a/external/googleapis/protolists/apigeeconnect.list +++ b/external/googleapis/protolists/apigeeconnect.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/apigeeconnect/v1:connection.proto -@com_google_googleapis//google/cloud/apigeeconnect/v1:tether.proto +@googleapis//google/cloud/apigeeconnect/v1:connection.proto +@googleapis//google/cloud/apigeeconnect/v1:tether.proto diff --git a/external/googleapis/protolists/apikeys.list b/external/googleapis/protolists/apikeys.list index f8d04a268cb20..dcec62e504b39 100644 --- a/external/googleapis/protolists/apikeys.list +++ b/external/googleapis/protolists/apikeys.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/api/apikeys/v2:apikeys.proto -@com_google_googleapis//google/api/apikeys/v2:resources.proto +@googleapis//google/api/apikeys/v2:apikeys.proto +@googleapis//google/api/apikeys/v2:resources.proto diff --git a/external/googleapis/protolists/appengine.list b/external/googleapis/protolists/appengine.list index 251ea26f4e5c8..516ec196250c4 100644 --- a/external/googleapis/protolists/appengine.list +++ b/external/googleapis/protolists/appengine.list @@ -1,18 +1,18 @@ -@com_google_googleapis//google/appengine/legacy:audit_data.proto -@com_google_googleapis//google/appengine/logging/v1:request_log.proto -@com_google_googleapis//google/appengine/v1:app_yaml.proto -@com_google_googleapis//google/appengine/v1:appengine.proto -@com_google_googleapis//google/appengine/v1:application.proto -@com_google_googleapis//google/appengine/v1:audit_data.proto -@com_google_googleapis//google/appengine/v1:certificate.proto -@com_google_googleapis//google/appengine/v1:deploy.proto -@com_google_googleapis//google/appengine/v1:deployed_files.proto -@com_google_googleapis//google/appengine/v1:domain.proto -@com_google_googleapis//google/appengine/v1:domain_mapping.proto -@com_google_googleapis//google/appengine/v1:firewall.proto -@com_google_googleapis//google/appengine/v1:instance.proto -@com_google_googleapis//google/appengine/v1:location.proto -@com_google_googleapis//google/appengine/v1:network_settings.proto -@com_google_googleapis//google/appengine/v1:operation.proto -@com_google_googleapis//google/appengine/v1:service.proto -@com_google_googleapis//google/appengine/v1:version.proto +@googleapis//google/appengine/legacy:audit_data.proto +@googleapis//google/appengine/logging/v1:request_log.proto +@googleapis//google/appengine/v1:app_yaml.proto +@googleapis//google/appengine/v1:appengine.proto +@googleapis//google/appengine/v1:application.proto +@googleapis//google/appengine/v1:audit_data.proto +@googleapis//google/appengine/v1:certificate.proto +@googleapis//google/appengine/v1:deploy.proto +@googleapis//google/appengine/v1:deployed_files.proto +@googleapis//google/appengine/v1:domain.proto +@googleapis//google/appengine/v1:domain_mapping.proto +@googleapis//google/appengine/v1:firewall.proto +@googleapis//google/appengine/v1:instance.proto +@googleapis//google/appengine/v1:location.proto +@googleapis//google/appengine/v1:network_settings.proto +@googleapis//google/appengine/v1:operation.proto +@googleapis//google/appengine/v1:service.proto +@googleapis//google/appengine/v1:version.proto diff --git a/external/googleapis/protolists/apphub.list b/external/googleapis/protolists/apphub.list index 6dc02c5da7f60..aba5a64493d7d 100644 --- a/external/googleapis/protolists/apphub.list +++ b/external/googleapis/protolists/apphub.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/cloud/apphub/v1:apphub_service.proto -@com_google_googleapis//google/cloud/apphub/v1:application.proto -@com_google_googleapis//google/cloud/apphub/v1:attributes.proto -@com_google_googleapis//google/cloud/apphub/v1:service.proto -@com_google_googleapis//google/cloud/apphub/v1:service_project_attachment.proto -@com_google_googleapis//google/cloud/apphub/v1:workload.proto +@googleapis//google/cloud/apphub/v1:apphub_service.proto +@googleapis//google/cloud/apphub/v1:application.proto +@googleapis//google/cloud/apphub/v1:attributes.proto +@googleapis//google/cloud/apphub/v1:service.proto +@googleapis//google/cloud/apphub/v1:service_project_attachment.proto +@googleapis//google/cloud/apphub/v1:workload.proto diff --git a/external/googleapis/protolists/artifactregistry.list b/external/googleapis/protolists/artifactregistry.list index 78b0bbb95740b..6d9b4ea2b6361 100644 --- a/external/googleapis/protolists/artifactregistry.list +++ b/external/googleapis/protolists/artifactregistry.list @@ -1,17 +1,17 @@ -@com_google_googleapis//google/devtools/artifactregistry/v1:apt_artifact.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:artifact.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:attachment.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:export.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:file.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:generic.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:go.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:kfp_artifact.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:package.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:repository.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:rule.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:service.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:settings.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:tag.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:version.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:vpcsc_config.proto -@com_google_googleapis//google/devtools/artifactregistry/v1:yum_artifact.proto +@googleapis//google/devtools/artifactregistry/v1:apt_artifact.proto +@googleapis//google/devtools/artifactregistry/v1:artifact.proto +@googleapis//google/devtools/artifactregistry/v1:attachment.proto +@googleapis//google/devtools/artifactregistry/v1:export.proto +@googleapis//google/devtools/artifactregistry/v1:file.proto +@googleapis//google/devtools/artifactregistry/v1:generic.proto +@googleapis//google/devtools/artifactregistry/v1:go.proto +@googleapis//google/devtools/artifactregistry/v1:kfp_artifact.proto +@googleapis//google/devtools/artifactregistry/v1:package.proto +@googleapis//google/devtools/artifactregistry/v1:repository.proto +@googleapis//google/devtools/artifactregistry/v1:rule.proto +@googleapis//google/devtools/artifactregistry/v1:service.proto +@googleapis//google/devtools/artifactregistry/v1:settings.proto +@googleapis//google/devtools/artifactregistry/v1:tag.proto +@googleapis//google/devtools/artifactregistry/v1:version.proto +@googleapis//google/devtools/artifactregistry/v1:vpcsc_config.proto +@googleapis//google/devtools/artifactregistry/v1:yum_artifact.proto diff --git a/external/googleapis/protolists/asset.list b/external/googleapis/protolists/asset.list index 4ff0d00333e7d..80d6e2ac1b51a 100644 --- a/external/googleapis/protolists/asset.list +++ b/external/googleapis/protolists/asset.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/asset/v1:asset_enrichment_resourceowners.proto -@com_google_googleapis//google/cloud/asset/v1:asset_service.proto -@com_google_googleapis//google/cloud/asset/v1:assets.proto +@googleapis//google/cloud/asset/v1:asset_enrichment_resourceowners.proto +@googleapis//google/cloud/asset/v1:asset_service.proto +@googleapis//google/cloud/asset/v1:assets.proto diff --git a/external/googleapis/protolists/assuredworkloads.list b/external/googleapis/protolists/assuredworkloads.list index df25c7e857683..a121c3154f8ed 100644 --- a/external/googleapis/protolists/assuredworkloads.list +++ b/external/googleapis/protolists/assuredworkloads.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/assuredworkloads/v1:assuredworkloads.proto +@googleapis//google/cloud/assuredworkloads/v1:assuredworkloads.proto diff --git a/external/googleapis/protolists/automl.list b/external/googleapis/protolists/automl.list index 8cf18d3f86de7..b07ce43626863 100644 --- a/external/googleapis/protolists/automl.list +++ b/external/googleapis/protolists/automl.list @@ -1,19 +1,19 @@ -@com_google_googleapis//google/cloud/automl/v1:annotation_payload.proto -@com_google_googleapis//google/cloud/automl/v1:annotation_spec.proto -@com_google_googleapis//google/cloud/automl/v1:classification.proto -@com_google_googleapis//google/cloud/automl/v1:data_items.proto -@com_google_googleapis//google/cloud/automl/v1:dataset.proto -@com_google_googleapis//google/cloud/automl/v1:detection.proto -@com_google_googleapis//google/cloud/automl/v1:geometry.proto -@com_google_googleapis//google/cloud/automl/v1:image.proto -@com_google_googleapis//google/cloud/automl/v1:io.proto -@com_google_googleapis//google/cloud/automl/v1:model.proto -@com_google_googleapis//google/cloud/automl/v1:model_evaluation.proto -@com_google_googleapis//google/cloud/automl/v1:operations.proto -@com_google_googleapis//google/cloud/automl/v1:prediction_service.proto -@com_google_googleapis//google/cloud/automl/v1:service.proto -@com_google_googleapis//google/cloud/automl/v1:text.proto -@com_google_googleapis//google/cloud/automl/v1:text_extraction.proto -@com_google_googleapis//google/cloud/automl/v1:text_segment.proto -@com_google_googleapis//google/cloud/automl/v1:text_sentiment.proto -@com_google_googleapis//google/cloud/automl/v1:translation.proto +@googleapis//google/cloud/automl/v1:annotation_payload.proto +@googleapis//google/cloud/automl/v1:annotation_spec.proto +@googleapis//google/cloud/automl/v1:classification.proto +@googleapis//google/cloud/automl/v1:data_items.proto +@googleapis//google/cloud/automl/v1:dataset.proto +@googleapis//google/cloud/automl/v1:detection.proto +@googleapis//google/cloud/automl/v1:geometry.proto +@googleapis//google/cloud/automl/v1:image.proto +@googleapis//google/cloud/automl/v1:io.proto +@googleapis//google/cloud/automl/v1:model.proto +@googleapis//google/cloud/automl/v1:model_evaluation.proto +@googleapis//google/cloud/automl/v1:operations.proto +@googleapis//google/cloud/automl/v1:prediction_service.proto +@googleapis//google/cloud/automl/v1:service.proto +@googleapis//google/cloud/automl/v1:text.proto +@googleapis//google/cloud/automl/v1:text_extraction.proto +@googleapis//google/cloud/automl/v1:text_segment.proto +@googleapis//google/cloud/automl/v1:text_sentiment.proto +@googleapis//google/cloud/automl/v1:translation.proto diff --git a/external/googleapis/protolists/backupdr.list b/external/googleapis/protolists/backupdr.list index b399a9e57d7ac..acf13c1df24b9 100644 --- a/external/googleapis/protolists/backupdr.list +++ b/external/googleapis/protolists/backupdr.list @@ -1,12 +1,12 @@ -@com_google_googleapis//google/cloud/backupdr/logging/v1:bdr_log.proto -@com_google_googleapis//google/cloud/backupdr/logging/v1:eventlog.proto -@com_google_googleapis//google/cloud/backupdr/logging/v1:reportlog.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupdr.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupplan.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupplanassociation.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupvault.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupvault_ba.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupvault_cloudsql.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupvault_disk.proto -@com_google_googleapis//google/cloud/backupdr/v1:backupvault_gce.proto -@com_google_googleapis//google/cloud/backupdr/v1:datasourcereference.proto +@googleapis//google/cloud/backupdr/logging/v1:bdr_log.proto +@googleapis//google/cloud/backupdr/logging/v1:eventlog.proto +@googleapis//google/cloud/backupdr/logging/v1:reportlog.proto +@googleapis//google/cloud/backupdr/v1:backupdr.proto +@googleapis//google/cloud/backupdr/v1:backupplan.proto +@googleapis//google/cloud/backupdr/v1:backupplanassociation.proto +@googleapis//google/cloud/backupdr/v1:backupvault.proto +@googleapis//google/cloud/backupdr/v1:backupvault_ba.proto +@googleapis//google/cloud/backupdr/v1:backupvault_cloudsql.proto +@googleapis//google/cloud/backupdr/v1:backupvault_disk.proto +@googleapis//google/cloud/backupdr/v1:backupvault_gce.proto +@googleapis//google/cloud/backupdr/v1:datasourcereference.proto diff --git a/external/googleapis/protolists/baremetalsolution.list b/external/googleapis/protolists/baremetalsolution.list index d4f8031e3af14..e0db0788073d7 100644 --- a/external/googleapis/protolists/baremetalsolution.list +++ b/external/googleapis/protolists/baremetalsolution.list @@ -1,11 +1,11 @@ -@com_google_googleapis//google/cloud/baremetalsolution/v2:baremetalsolution.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:common.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:instance.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:lun.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:network.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:nfs_share.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:osimage.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:provisioning.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:ssh_key.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:volume.proto -@com_google_googleapis//google/cloud/baremetalsolution/v2:volume_snapshot.proto +@googleapis//google/cloud/baremetalsolution/v2:baremetalsolution.proto +@googleapis//google/cloud/baremetalsolution/v2:common.proto +@googleapis//google/cloud/baremetalsolution/v2:instance.proto +@googleapis//google/cloud/baremetalsolution/v2:lun.proto +@googleapis//google/cloud/baremetalsolution/v2:network.proto +@googleapis//google/cloud/baremetalsolution/v2:nfs_share.proto +@googleapis//google/cloud/baremetalsolution/v2:osimage.proto +@googleapis//google/cloud/baremetalsolution/v2:provisioning.proto +@googleapis//google/cloud/baremetalsolution/v2:ssh_key.proto +@googleapis//google/cloud/baremetalsolution/v2:volume.proto +@googleapis//google/cloud/baremetalsolution/v2:volume_snapshot.proto diff --git a/external/googleapis/protolists/batch.list b/external/googleapis/protolists/batch.list index 8e615a6b74a8e..368ec70f8a92a 100644 --- a/external/googleapis/protolists/batch.list +++ b/external/googleapis/protolists/batch.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/batch/v1:batch.proto -@com_google_googleapis//google/cloud/batch/v1:job.proto -@com_google_googleapis//google/cloud/batch/v1:task.proto -@com_google_googleapis//google/cloud/batch/v1:volume.proto +@googleapis//google/cloud/batch/v1:batch.proto +@googleapis//google/cloud/batch/v1:job.proto +@googleapis//google/cloud/batch/v1:task.proto +@googleapis//google/cloud/batch/v1:volume.proto diff --git a/external/googleapis/protolists/beyondcorp.list b/external/googleapis/protolists/beyondcorp.list index 10748ee775e2c..d4446e7f910bf 100644 --- a/external/googleapis/protolists/beyondcorp.list +++ b/external/googleapis/protolists/beyondcorp.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/beyondcorp/appconnections/v1:app_connections_service.proto -@com_google_googleapis//google/cloud/beyondcorp/appconnectors/v1:app_connector_instance_config.proto -@com_google_googleapis//google/cloud/beyondcorp/appconnectors/v1:app_connectors_service.proto -@com_google_googleapis//google/cloud/beyondcorp/appconnectors/v1:resource_info.proto -@com_google_googleapis//google/cloud/beyondcorp/appgateways/v1:app_gateways_service.proto +@googleapis//google/cloud/beyondcorp/appconnections/v1:app_connections_service.proto +@googleapis//google/cloud/beyondcorp/appconnectors/v1:app_connector_instance_config.proto +@googleapis//google/cloud/beyondcorp/appconnectors/v1:app_connectors_service.proto +@googleapis//google/cloud/beyondcorp/appconnectors/v1:resource_info.proto +@googleapis//google/cloud/beyondcorp/appgateways/v1:app_gateways_service.proto diff --git a/external/googleapis/protolists/bigquery.list b/external/googleapis/protolists/bigquery.list index ff1e1fee59832..698330da6e199 100644 --- a/external/googleapis/protolists/bigquery.list +++ b/external/googleapis/protolists/bigquery.list @@ -1,25 +1,25 @@ -@com_google_googleapis//google/cloud/bigquery/analyticshub/v1:analyticshub.proto -@com_google_googleapis//google/cloud/bigquery/analyticshub/v1:pubsub.proto -@com_google_googleapis//google/cloud/bigquery/biglake/v1:metastore.proto -@com_google_googleapis//google/cloud/bigquery/connection/v1:connection.proto -@com_google_googleapis//google/cloud/bigquery/datapolicies/v1:datapolicy.proto -@com_google_googleapis//google/cloud/bigquery/datapolicies/v2:datapolicy.proto -@com_google_googleapis//google/cloud/bigquery/datatransfer/v1:datatransfer.proto -@com_google_googleapis//google/cloud/bigquery/datatransfer/v1:transfer.proto -@com_google_googleapis//google/cloud/bigquery/logging/v1:audit_data.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:migration_entities.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:migration_error_details.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:migration_metrics.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:migration_service.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:translation_config.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:translation_details.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:translation_suggestion.proto -@com_google_googleapis//google/cloud/bigquery/migration/v2:translation_usability.proto -@com_google_googleapis//google/cloud/bigquery/reservation/v1:reservation.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:annotations.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:arrow.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:avro.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:protobuf.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:storage.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:stream.proto -@com_google_googleapis//google/cloud/bigquery/storage/v1:table.proto +@googleapis//google/cloud/bigquery/analyticshub/v1:analyticshub.proto +@googleapis//google/cloud/bigquery/analyticshub/v1:pubsub.proto +@googleapis//google/cloud/bigquery/biglake/v1:metastore.proto +@googleapis//google/cloud/bigquery/connection/v1:connection.proto +@googleapis//google/cloud/bigquery/datapolicies/v1:datapolicy.proto +@googleapis//google/cloud/bigquery/datapolicies/v2:datapolicy.proto +@googleapis//google/cloud/bigquery/datatransfer/v1:datatransfer.proto +@googleapis//google/cloud/bigquery/datatransfer/v1:transfer.proto +@googleapis//google/cloud/bigquery/logging/v1:audit_data.proto +@googleapis//google/cloud/bigquery/migration/v2:migration_entities.proto +@googleapis//google/cloud/bigquery/migration/v2:migration_error_details.proto +@googleapis//google/cloud/bigquery/migration/v2:migration_metrics.proto +@googleapis//google/cloud/bigquery/migration/v2:migration_service.proto +@googleapis//google/cloud/bigquery/migration/v2:translation_config.proto +@googleapis//google/cloud/bigquery/migration/v2:translation_details.proto +@googleapis//google/cloud/bigquery/migration/v2:translation_suggestion.proto +@googleapis//google/cloud/bigquery/migration/v2:translation_usability.proto +@googleapis//google/cloud/bigquery/reservation/v1:reservation.proto +@googleapis//google/cloud/bigquery/storage/v1:annotations.proto +@googleapis//google/cloud/bigquery/storage/v1:arrow.proto +@googleapis//google/cloud/bigquery/storage/v1:avro.proto +@googleapis//google/cloud/bigquery/storage/v1:protobuf.proto +@googleapis//google/cloud/bigquery/storage/v1:storage.proto +@googleapis//google/cloud/bigquery/storage/v1:stream.proto +@googleapis//google/cloud/bigquery/storage/v1:table.proto diff --git a/external/googleapis/protolists/bigquerycontrol.list b/external/googleapis/protolists/bigquerycontrol.list index a63307013bf8c..24283eeabae6e 100644 --- a/external/googleapis/protolists/bigquerycontrol.list +++ b/external/googleapis/protolists/bigquerycontrol.list @@ -1,45 +1,45 @@ -@com_google_googleapis//google/cloud/bigquery/v2:biglake_config.proto -@com_google_googleapis//google/cloud/bigquery/v2:clustering.proto -@com_google_googleapis//google/cloud/bigquery/v2:data_format_options.proto -@com_google_googleapis//google/cloud/bigquery/v2:dataset.proto -@com_google_googleapis//google/cloud/bigquery/v2:dataset_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:decimal_target_types.proto -@com_google_googleapis//google/cloud/bigquery/v2:encryption_config.proto -@com_google_googleapis//google/cloud/bigquery/v2:error.proto -@com_google_googleapis//google/cloud/bigquery/v2:external_catalog_dataset_options.proto -@com_google_googleapis//google/cloud/bigquery/v2:external_catalog_table_options.proto -@com_google_googleapis//google/cloud/bigquery/v2:external_data_config.proto -@com_google_googleapis//google/cloud/bigquery/v2:external_dataset_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:file_set_specification_type.proto -@com_google_googleapis//google/cloud/bigquery/v2:hive_partitioning.proto -@com_google_googleapis//google/cloud/bigquery/v2:job.proto -@com_google_googleapis//google/cloud/bigquery/v2:job_config.proto -@com_google_googleapis//google/cloud/bigquery/v2:job_creation_reason.proto -@com_google_googleapis//google/cloud/bigquery/v2:job_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:job_stats.proto -@com_google_googleapis//google/cloud/bigquery/v2:job_status.proto -@com_google_googleapis//google/cloud/bigquery/v2:json_extension.proto -@com_google_googleapis//google/cloud/bigquery/v2:location_metadata.proto -@com_google_googleapis//google/cloud/bigquery/v2:managed_table_type.proto -@com_google_googleapis//google/cloud/bigquery/v2:map_target_type.proto -@com_google_googleapis//google/cloud/bigquery/v2:model.proto -@com_google_googleapis//google/cloud/bigquery/v2:model_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:partitioning_definition.proto -@com_google_googleapis//google/cloud/bigquery/v2:privacy_policy.proto -@com_google_googleapis//google/cloud/bigquery/v2:project.proto -@com_google_googleapis//google/cloud/bigquery/v2:query_parameter.proto -@com_google_googleapis//google/cloud/bigquery/v2:range_partitioning.proto -@com_google_googleapis//google/cloud/bigquery/v2:restriction_config.proto -@com_google_googleapis//google/cloud/bigquery/v2:routine.proto -@com_google_googleapis//google/cloud/bigquery/v2:routine_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:row_access_policy.proto -@com_google_googleapis//google/cloud/bigquery/v2:row_access_policy_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:session_info.proto -@com_google_googleapis//google/cloud/bigquery/v2:standard_sql.proto -@com_google_googleapis//google/cloud/bigquery/v2:system_variable.proto -@com_google_googleapis//google/cloud/bigquery/v2:table.proto -@com_google_googleapis//google/cloud/bigquery/v2:table_constraints.proto -@com_google_googleapis//google/cloud/bigquery/v2:table_reference.proto -@com_google_googleapis//google/cloud/bigquery/v2:table_schema.proto -@com_google_googleapis//google/cloud/bigquery/v2:time_partitioning.proto -@com_google_googleapis//google/cloud/bigquery/v2:udf_resource.proto +@googleapis//google/cloud/bigquery/v2:biglake_config.proto +@googleapis//google/cloud/bigquery/v2:clustering.proto +@googleapis//google/cloud/bigquery/v2:data_format_options.proto +@googleapis//google/cloud/bigquery/v2:dataset.proto +@googleapis//google/cloud/bigquery/v2:dataset_reference.proto +@googleapis//google/cloud/bigquery/v2:decimal_target_types.proto +@googleapis//google/cloud/bigquery/v2:encryption_config.proto +@googleapis//google/cloud/bigquery/v2:error.proto +@googleapis//google/cloud/bigquery/v2:external_catalog_dataset_options.proto +@googleapis//google/cloud/bigquery/v2:external_catalog_table_options.proto +@googleapis//google/cloud/bigquery/v2:external_data_config.proto +@googleapis//google/cloud/bigquery/v2:external_dataset_reference.proto +@googleapis//google/cloud/bigquery/v2:file_set_specification_type.proto +@googleapis//google/cloud/bigquery/v2:hive_partitioning.proto +@googleapis//google/cloud/bigquery/v2:job.proto +@googleapis//google/cloud/bigquery/v2:job_config.proto +@googleapis//google/cloud/bigquery/v2:job_creation_reason.proto +@googleapis//google/cloud/bigquery/v2:job_reference.proto +@googleapis//google/cloud/bigquery/v2:job_stats.proto +@googleapis//google/cloud/bigquery/v2:job_status.proto +@googleapis//google/cloud/bigquery/v2:json_extension.proto +@googleapis//google/cloud/bigquery/v2:location_metadata.proto +@googleapis//google/cloud/bigquery/v2:managed_table_type.proto +@googleapis//google/cloud/bigquery/v2:map_target_type.proto +@googleapis//google/cloud/bigquery/v2:model.proto +@googleapis//google/cloud/bigquery/v2:model_reference.proto +@googleapis//google/cloud/bigquery/v2:partitioning_definition.proto +@googleapis//google/cloud/bigquery/v2:privacy_policy.proto +@googleapis//google/cloud/bigquery/v2:project.proto +@googleapis//google/cloud/bigquery/v2:query_parameter.proto +@googleapis//google/cloud/bigquery/v2:range_partitioning.proto +@googleapis//google/cloud/bigquery/v2:restriction_config.proto +@googleapis//google/cloud/bigquery/v2:routine.proto +@googleapis//google/cloud/bigquery/v2:routine_reference.proto +@googleapis//google/cloud/bigquery/v2:row_access_policy.proto +@googleapis//google/cloud/bigquery/v2:row_access_policy_reference.proto +@googleapis//google/cloud/bigquery/v2:session_info.proto +@googleapis//google/cloud/bigquery/v2:standard_sql.proto +@googleapis//google/cloud/bigquery/v2:system_variable.proto +@googleapis//google/cloud/bigquery/v2:table.proto +@googleapis//google/cloud/bigquery/v2:table_constraints.proto +@googleapis//google/cloud/bigquery/v2:table_reference.proto +@googleapis//google/cloud/bigquery/v2:table_schema.proto +@googleapis//google/cloud/bigquery/v2:time_partitioning.proto +@googleapis//google/cloud/bigquery/v2:udf_resource.proto diff --git a/external/googleapis/protolists/bigtable.list b/external/googleapis/protolists/bigtable.list index 04cbd7ae40fe2..11a5e6f60c84f 100644 --- a/external/googleapis/protolists/bigtable.list +++ b/external/googleapis/protolists/bigtable.list @@ -1,13 +1,13 @@ -@com_google_googleapis//google/bigtable/admin/v2:bigtable_instance_admin.proto -@com_google_googleapis//google/bigtable/admin/v2:bigtable_table_admin.proto -@com_google_googleapis//google/bigtable/admin/v2:common.proto -@com_google_googleapis//google/bigtable/admin/v2:instance.proto -@com_google_googleapis//google/bigtable/admin/v2:table.proto -@com_google_googleapis//google/bigtable/admin/v2:types.proto -@com_google_googleapis//google/bigtable/v2:bigtable.proto -@com_google_googleapis//google/bigtable/v2:data.proto -@com_google_googleapis//google/bigtable/v2:feature_flags.proto -@com_google_googleapis//google/bigtable/v2:peer_info.proto -@com_google_googleapis//google/bigtable/v2:request_stats.proto -@com_google_googleapis//google/bigtable/v2:response_params.proto -@com_google_googleapis//google/bigtable/v2:types.proto +@googleapis//google/bigtable/admin/v2:bigtable_instance_admin.proto +@googleapis//google/bigtable/admin/v2:bigtable_table_admin.proto +@googleapis//google/bigtable/admin/v2:common.proto +@googleapis//google/bigtable/admin/v2:instance.proto +@googleapis//google/bigtable/admin/v2:table.proto +@googleapis//google/bigtable/admin/v2:types.proto +@googleapis//google/bigtable/v2:bigtable.proto +@googleapis//google/bigtable/v2:data.proto +@googleapis//google/bigtable/v2:feature_flags.proto +@googleapis//google/bigtable/v2:peer_info.proto +@googleapis//google/bigtable/v2:request_stats.proto +@googleapis//google/bigtable/v2:response_params.proto +@googleapis//google/bigtable/v2:types.proto diff --git a/external/googleapis/protolists/billing.list b/external/googleapis/protolists/billing.list index 4af71adda7eae..cbf0ce79640cf 100644 --- a/external/googleapis/protolists/billing.list +++ b/external/googleapis/protolists/billing.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/billing/budgets/v1:budget_model.proto -@com_google_googleapis//google/cloud/billing/budgets/v1:budget_service.proto -@com_google_googleapis//google/cloud/billing/v1:cloud_billing.proto -@com_google_googleapis//google/cloud/billing/v1:cloud_catalog.proto +@googleapis//google/cloud/billing/budgets/v1:budget_model.proto +@googleapis//google/cloud/billing/budgets/v1:budget_service.proto +@googleapis//google/cloud/billing/v1:cloud_billing.proto +@googleapis//google/cloud/billing/v1:cloud_catalog.proto diff --git a/external/googleapis/protolists/binaryauthorization.list b/external/googleapis/protolists/binaryauthorization.list index 41f5317c7311b..8d26c8c896bdc 100644 --- a/external/googleapis/protolists/binaryauthorization.list +++ b/external/googleapis/protolists/binaryauthorization.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/binaryauthorization/v1:resources.proto -@com_google_googleapis//google/cloud/binaryauthorization/v1:service.proto +@googleapis//google/cloud/binaryauthorization/v1:resources.proto +@googleapis//google/cloud/binaryauthorization/v1:service.proto diff --git a/external/googleapis/protolists/certificatemanager.list b/external/googleapis/protolists/certificatemanager.list index d11935b471f25..48ca808eede2c 100644 --- a/external/googleapis/protolists/certificatemanager.list +++ b/external/googleapis/protolists/certificatemanager.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/certificatemanager/logging/v1:logs.proto -@com_google_googleapis//google/cloud/certificatemanager/v1:certificate_issuance_config.proto -@com_google_googleapis//google/cloud/certificatemanager/v1:certificate_manager.proto -@com_google_googleapis//google/cloud/certificatemanager/v1:trust_config.proto +@googleapis//google/cloud/certificatemanager/logging/v1:logs.proto +@googleapis//google/cloud/certificatemanager/v1:certificate_issuance_config.proto +@googleapis//google/cloud/certificatemanager/v1:certificate_manager.proto +@googleapis//google/cloud/certificatemanager/v1:trust_config.proto diff --git a/external/googleapis/protolists/channel.list b/external/googleapis/protolists/channel.list index 919472ea6530f..4f766a7eb934f 100644 --- a/external/googleapis/protolists/channel.list +++ b/external/googleapis/protolists/channel.list @@ -1,13 +1,13 @@ -@com_google_googleapis//google/cloud/channel/v1:billing_accounts.proto -@com_google_googleapis//google/cloud/channel/v1:channel_partner_links.proto -@com_google_googleapis//google/cloud/channel/v1:common.proto -@com_google_googleapis//google/cloud/channel/v1:customers.proto -@com_google_googleapis//google/cloud/channel/v1:entitlement_changes.proto -@com_google_googleapis//google/cloud/channel/v1:entitlements.proto -@com_google_googleapis//google/cloud/channel/v1:offers.proto -@com_google_googleapis//google/cloud/channel/v1:operations.proto -@com_google_googleapis//google/cloud/channel/v1:products.proto -@com_google_googleapis//google/cloud/channel/v1:reports_service.proto -@com_google_googleapis//google/cloud/channel/v1:repricing.proto -@com_google_googleapis//google/cloud/channel/v1:service.proto -@com_google_googleapis//google/cloud/channel/v1:subscriber_event.proto +@googleapis//google/cloud/channel/v1:billing_accounts.proto +@googleapis//google/cloud/channel/v1:channel_partner_links.proto +@googleapis//google/cloud/channel/v1:common.proto +@googleapis//google/cloud/channel/v1:customers.proto +@googleapis//google/cloud/channel/v1:entitlement_changes.proto +@googleapis//google/cloud/channel/v1:entitlements.proto +@googleapis//google/cloud/channel/v1:offers.proto +@googleapis//google/cloud/channel/v1:operations.proto +@googleapis//google/cloud/channel/v1:products.proto +@googleapis//google/cloud/channel/v1:reports_service.proto +@googleapis//google/cloud/channel/v1:repricing.proto +@googleapis//google/cloud/channel/v1:service.proto +@googleapis//google/cloud/channel/v1:subscriber_event.proto diff --git a/external/googleapis/protolists/chronicle.list b/external/googleapis/protolists/chronicle.list index a294e00e28651..e05a4e8606f15 100644 --- a/external/googleapis/protolists/chronicle.list +++ b/external/googleapis/protolists/chronicle.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/chronicle/v1:data_access_control.proto -@com_google_googleapis//google/cloud/chronicle/v1:entity.proto -@com_google_googleapis//google/cloud/chronicle/v1:instance.proto -@com_google_googleapis//google/cloud/chronicle/v1:reference_list.proto -@com_google_googleapis//google/cloud/chronicle/v1:rule.proto +@googleapis//google/cloud/chronicle/v1:data_access_control.proto +@googleapis//google/cloud/chronicle/v1:entity.proto +@googleapis//google/cloud/chronicle/v1:instance.proto +@googleapis//google/cloud/chronicle/v1:reference_list.proto +@googleapis//google/cloud/chronicle/v1:rule.proto diff --git a/external/googleapis/protolists/cloudbuild.list b/external/googleapis/protolists/cloudbuild.list index 1e26f22148d64..4afb9ed5272c4 100644 --- a/external/googleapis/protolists/cloudbuild.list +++ b/external/googleapis/protolists/cloudbuild.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/devtools/cloudbuild/v1:cloudbuild.proto -@com_google_googleapis//google/devtools/cloudbuild/v2:cloudbuild.proto -@com_google_googleapis//google/devtools/cloudbuild/v2:repositories.proto +@googleapis//google/devtools/cloudbuild/v1:cloudbuild.proto +@googleapis//google/devtools/cloudbuild/v2:cloudbuild.proto +@googleapis//google/devtools/cloudbuild/v2:repositories.proto diff --git a/external/googleapis/protolists/cloudcontrolspartner.list b/external/googleapis/protolists/cloudcontrolspartner.list index 84f72822624a4..3d10ba213c1e9 100644 --- a/external/googleapis/protolists/cloudcontrolspartner.list +++ b/external/googleapis/protolists/cloudcontrolspartner.list @@ -1,10 +1,10 @@ -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:access_approval_requests.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:completion_state.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:core.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:customer_workloads.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:customers.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:ekm_connections.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:monitoring.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:partner_permissions.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:partners.proto -@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:violations.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:access_approval_requests.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:completion_state.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:core.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:customer_workloads.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:customers.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:ekm_connections.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:monitoring.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:partner_permissions.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:partners.proto +@googleapis//google/cloud/cloudcontrolspartner/v1:violations.proto diff --git a/external/googleapis/protolists/cloudquotas.list b/external/googleapis/protolists/cloudquotas.list index f40de87299fd9..bbc5f30d7016c 100644 --- a/external/googleapis/protolists/cloudquotas.list +++ b/external/googleapis/protolists/cloudquotas.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/api/cloudquotas/v1:cloudquotas.proto -@com_google_googleapis//google/api/cloudquotas/v1:resources.proto +@googleapis//google/api/cloudquotas/v1:cloudquotas.proto +@googleapis//google/api/cloudquotas/v1:resources.proto diff --git a/external/googleapis/protolists/cloudsecuritycompliance.list b/external/googleapis/protolists/cloudsecuritycompliance.list index a7bde6c85dccf..b998f802c1039 100644 --- a/external/googleapis/protolists/cloudsecuritycompliance.list +++ b/external/googleapis/protolists/cloudsecuritycompliance.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:audit.proto -@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:cm_enrollment_service.proto -@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:common.proto -@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:config.proto -@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:deployment.proto -@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:monitoring.proto +@googleapis//google/cloud/cloudsecuritycompliance/v1:audit.proto +@googleapis//google/cloud/cloudsecuritycompliance/v1:cm_enrollment_service.proto +@googleapis//google/cloud/cloudsecuritycompliance/v1:common.proto +@googleapis//google/cloud/cloudsecuritycompliance/v1:config.proto +@googleapis//google/cloud/cloudsecuritycompliance/v1:deployment.proto +@googleapis//google/cloud/cloudsecuritycompliance/v1:monitoring.proto diff --git a/external/googleapis/protolists/commerce.list b/external/googleapis/protolists/commerce.list index 002d4d2a5b930..1c6c2bb5de357 100644 --- a/external/googleapis/protolists/commerce.list +++ b/external/googleapis/protolists/commerce.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/commerce/consumer/procurement/v1:license_management_service.proto -@com_google_googleapis//google/cloud/commerce/consumer/procurement/v1:order.proto -@com_google_googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_service.proto +@googleapis//google/cloud/commerce/consumer/procurement/v1:license_management_service.proto +@googleapis//google/cloud/commerce/consumer/procurement/v1:order.proto +@googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_service.proto diff --git a/external/googleapis/protolists/common.list b/external/googleapis/protolists/common.list index 67a3ab77f8387..a0cb24dea2b98 100644 --- a/external/googleapis/protolists/common.list +++ b/external/googleapis/protolists/common.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/common:operation_metadata.proto +@googleapis//google/cloud/common:operation_metadata.proto diff --git a/external/googleapis/protolists/composer.list b/external/googleapis/protolists/composer.list index cb3d1f7ea017d..bffa84ffd8040 100644 --- a/external/googleapis/protolists/composer.list +++ b/external/googleapis/protolists/composer.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/orchestration/airflow/service/v1:environments.proto -@com_google_googleapis//google/cloud/orchestration/airflow/service/v1:image_versions.proto -@com_google_googleapis//google/cloud/orchestration/airflow/service/v1:operations.proto +@googleapis//google/cloud/orchestration/airflow/service/v1:environments.proto +@googleapis//google/cloud/orchestration/airflow/service/v1:image_versions.proto +@googleapis//google/cloud/orchestration/airflow/service/v1:operations.proto diff --git a/external/googleapis/protolists/confidentialcomputing.list b/external/googleapis/protolists/confidentialcomputing.list index 64493bb25a660..194675ea9cafe 100644 --- a/external/googleapis/protolists/confidentialcomputing.list +++ b/external/googleapis/protolists/confidentialcomputing.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/confidentialcomputing/v1:service.proto +@googleapis//google/cloud/confidentialcomputing/v1:service.proto diff --git a/external/googleapis/protolists/config.list b/external/googleapis/protolists/config.list index b04623d899593..43d1cb13a8179 100644 --- a/external/googleapis/protolists/config.list +++ b/external/googleapis/protolists/config.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/config/v1:config.proto +@googleapis//google/cloud/config/v1:config.proto diff --git a/external/googleapis/protolists/configdelivery.list b/external/googleapis/protolists/configdelivery.list index 5188314ee93f1..55475568c20e4 100644 --- a/external/googleapis/protolists/configdelivery.list +++ b/external/googleapis/protolists/configdelivery.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/configdelivery/v1:config_delivery.proto +@googleapis//google/cloud/configdelivery/v1:config_delivery.proto diff --git a/external/googleapis/protolists/connectors.list b/external/googleapis/protolists/connectors.list index abe5ebbba3cda..e3cf9badab54f 100644 --- a/external/googleapis/protolists/connectors.list +++ b/external/googleapis/protolists/connectors.list @@ -1,11 +1,11 @@ -@com_google_googleapis//google/cloud/connectors/v1:authconfig.proto -@com_google_googleapis//google/cloud/connectors/v1:common.proto -@com_google_googleapis//google/cloud/connectors/v1:connection.proto -@com_google_googleapis//google/cloud/connectors/v1:connector.proto -@com_google_googleapis//google/cloud/connectors/v1:connector_version.proto -@com_google_googleapis//google/cloud/connectors/v1:connectors_service.proto -@com_google_googleapis//google/cloud/connectors/v1:destination_config.proto -@com_google_googleapis//google/cloud/connectors/v1:provider.proto -@com_google_googleapis//google/cloud/connectors/v1:runtime.proto -@com_google_googleapis//google/cloud/connectors/v1:settings.proto -@com_google_googleapis//google/cloud/connectors/v1:ssl_config.proto +@googleapis//google/cloud/connectors/v1:authconfig.proto +@googleapis//google/cloud/connectors/v1:common.proto +@googleapis//google/cloud/connectors/v1:connection.proto +@googleapis//google/cloud/connectors/v1:connector.proto +@googleapis//google/cloud/connectors/v1:connector_version.proto +@googleapis//google/cloud/connectors/v1:connectors_service.proto +@googleapis//google/cloud/connectors/v1:destination_config.proto +@googleapis//google/cloud/connectors/v1:provider.proto +@googleapis//google/cloud/connectors/v1:runtime.proto +@googleapis//google/cloud/connectors/v1:settings.proto +@googleapis//google/cloud/connectors/v1:ssl_config.proto diff --git a/external/googleapis/protolists/contactcenterinsights.list b/external/googleapis/protolists/contactcenterinsights.list index 462afe82f2ed3..19c2eee697f1c 100644 --- a/external/googleapis/protolists/contactcenterinsights.list +++ b/external/googleapis/protolists/contactcenterinsights.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/contactcenterinsights/v1:contact_center_insights.proto -@com_google_googleapis//google/cloud/contactcenterinsights/v1:resources.proto +@googleapis//google/cloud/contactcenterinsights/v1:contact_center_insights.proto +@googleapis//google/cloud/contactcenterinsights/v1:resources.proto diff --git a/external/googleapis/protolists/container.list b/external/googleapis/protolists/container.list index 387306c1dcf8f..b1d4a753de836 100644 --- a/external/googleapis/protolists/container.list +++ b/external/googleapis/protolists/container.list @@ -1 +1 @@ -@com_google_googleapis//google/container/v1:cluster_service.proto +@googleapis//google/container/v1:cluster_service.proto diff --git a/external/googleapis/protolists/containeranalysis.list b/external/googleapis/protolists/containeranalysis.list index cf04e89e6ceb3..665fd476ce103 100644 --- a/external/googleapis/protolists/containeranalysis.list +++ b/external/googleapis/protolists/containeranalysis.list @@ -1 +1 @@ -@com_google_googleapis//google/devtools/containeranalysis/v1:containeranalysis.proto +@googleapis//google/devtools/containeranalysis/v1:containeranalysis.proto diff --git a/external/googleapis/protolists/contentwarehouse.list b/external/googleapis/protolists/contentwarehouse.list index 206b4c4364062..71d026e2307fa 100644 --- a/external/googleapis/protolists/contentwarehouse.list +++ b/external/googleapis/protolists/contentwarehouse.list @@ -1,18 +1,18 @@ -@com_google_googleapis//google/cloud/contentwarehouse/v1:async_document_service_request.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:common.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:document.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:document_link_service.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:document_schema.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:document_schema_service.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:document_service.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:document_service_request.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:filters.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:histogram.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:pipeline_service.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:pipelines.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:rule_engine.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:ruleset_service.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:ruleset_service_request.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:synonymset.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:synonymset_service.proto -@com_google_googleapis//google/cloud/contentwarehouse/v1:synonymset_service_request.proto +@googleapis//google/cloud/contentwarehouse/v1:async_document_service_request.proto +@googleapis//google/cloud/contentwarehouse/v1:common.proto +@googleapis//google/cloud/contentwarehouse/v1:document.proto +@googleapis//google/cloud/contentwarehouse/v1:document_link_service.proto +@googleapis//google/cloud/contentwarehouse/v1:document_schema.proto +@googleapis//google/cloud/contentwarehouse/v1:document_schema_service.proto +@googleapis//google/cloud/contentwarehouse/v1:document_service.proto +@googleapis//google/cloud/contentwarehouse/v1:document_service_request.proto +@googleapis//google/cloud/contentwarehouse/v1:filters.proto +@googleapis//google/cloud/contentwarehouse/v1:histogram.proto +@googleapis//google/cloud/contentwarehouse/v1:pipeline_service.proto +@googleapis//google/cloud/contentwarehouse/v1:pipelines.proto +@googleapis//google/cloud/contentwarehouse/v1:rule_engine.proto +@googleapis//google/cloud/contentwarehouse/v1:ruleset_service.proto +@googleapis//google/cloud/contentwarehouse/v1:ruleset_service_request.proto +@googleapis//google/cloud/contentwarehouse/v1:synonymset.proto +@googleapis//google/cloud/contentwarehouse/v1:synonymset_service.proto +@googleapis//google/cloud/contentwarehouse/v1:synonymset_service_request.proto diff --git a/external/googleapis/protolists/datacatalog.list b/external/googleapis/protolists/datacatalog.list index 2eb2ef0147769..f801de4561991 100644 --- a/external/googleapis/protolists/datacatalog.list +++ b/external/googleapis/protolists/datacatalog.list @@ -1,17 +1,17 @@ -@com_google_googleapis//google/cloud/datacatalog/lineage/v1:lineage.proto -@com_google_googleapis//google/cloud/datacatalog/v1:bigquery.proto -@com_google_googleapis//google/cloud/datacatalog/v1:common.proto -@com_google_googleapis//google/cloud/datacatalog/v1:data_source.proto -@com_google_googleapis//google/cloud/datacatalog/v1:datacatalog.proto -@com_google_googleapis//google/cloud/datacatalog/v1:dataplex_spec.proto -@com_google_googleapis//google/cloud/datacatalog/v1:dump_content.proto -@com_google_googleapis//google/cloud/datacatalog/v1:gcs_fileset_spec.proto -@com_google_googleapis//google/cloud/datacatalog/v1:physical_schema.proto -@com_google_googleapis//google/cloud/datacatalog/v1:policytagmanager.proto -@com_google_googleapis//google/cloud/datacatalog/v1:policytagmanagerserialization.proto -@com_google_googleapis//google/cloud/datacatalog/v1:schema.proto -@com_google_googleapis//google/cloud/datacatalog/v1:search.proto -@com_google_googleapis//google/cloud/datacatalog/v1:table_spec.proto -@com_google_googleapis//google/cloud/datacatalog/v1:tags.proto -@com_google_googleapis//google/cloud/datacatalog/v1:timestamps.proto -@com_google_googleapis//google/cloud/datacatalog/v1:usage.proto +@googleapis//google/cloud/datacatalog/lineage/v1:lineage.proto +@googleapis//google/cloud/datacatalog/v1:bigquery.proto +@googleapis//google/cloud/datacatalog/v1:common.proto +@googleapis//google/cloud/datacatalog/v1:data_source.proto +@googleapis//google/cloud/datacatalog/v1:datacatalog.proto +@googleapis//google/cloud/datacatalog/v1:dataplex_spec.proto +@googleapis//google/cloud/datacatalog/v1:dump_content.proto +@googleapis//google/cloud/datacatalog/v1:gcs_fileset_spec.proto +@googleapis//google/cloud/datacatalog/v1:physical_schema.proto +@googleapis//google/cloud/datacatalog/v1:policytagmanager.proto +@googleapis//google/cloud/datacatalog/v1:policytagmanagerserialization.proto +@googleapis//google/cloud/datacatalog/v1:schema.proto +@googleapis//google/cloud/datacatalog/v1:search.proto +@googleapis//google/cloud/datacatalog/v1:table_spec.proto +@googleapis//google/cloud/datacatalog/v1:tags.proto +@googleapis//google/cloud/datacatalog/v1:timestamps.proto +@googleapis//google/cloud/datacatalog/v1:usage.proto diff --git a/external/googleapis/protolists/dataform.list b/external/googleapis/protolists/dataform.list index 5b8e73cbd5f39..23b44a266c1c8 100644 --- a/external/googleapis/protolists/dataform.list +++ b/external/googleapis/protolists/dataform.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/dataform/logging/v1:logging.proto -@com_google_googleapis//google/cloud/dataform/v1:dataform.proto +@googleapis//google/cloud/dataform/logging/v1:logging.proto +@googleapis//google/cloud/dataform/v1:dataform.proto diff --git a/external/googleapis/protolists/datafusion.list b/external/googleapis/protolists/datafusion.list index c736d23ac29e2..04d7053087438 100644 --- a/external/googleapis/protolists/datafusion.list +++ b/external/googleapis/protolists/datafusion.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/datafusion/v1:datafusion.proto +@googleapis//google/cloud/datafusion/v1:datafusion.proto diff --git a/external/googleapis/protolists/datamigration.list b/external/googleapis/protolists/datamigration.list index 52a5b20a1a382..da87ace35d0c7 100644 --- a/external/googleapis/protolists/datamigration.list +++ b/external/googleapis/protolists/datamigration.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/clouddms/logging/v1:clouddms_platform_logs.proto -@com_google_googleapis//google/cloud/clouddms/v1:clouddms.proto -@com_google_googleapis//google/cloud/clouddms/v1:clouddms_resources.proto -@com_google_googleapis//google/cloud/clouddms/v1:conversionworkspace_resources.proto +@googleapis//google/cloud/clouddms/logging/v1:clouddms_platform_logs.proto +@googleapis//google/cloud/clouddms/v1:clouddms.proto +@googleapis//google/cloud/clouddms/v1:clouddms_resources.proto +@googleapis//google/cloud/clouddms/v1:conversionworkspace_resources.proto diff --git a/external/googleapis/protolists/dataplex.list b/external/googleapis/protolists/dataplex.list index de426ab75fe68..c0e82abf6c348 100644 --- a/external/googleapis/protolists/dataplex.list +++ b/external/googleapis/protolists/dataplex.list @@ -1,19 +1,19 @@ -@com_google_googleapis//google/cloud/dataplex/v1:analyze.proto -@com_google_googleapis//google/cloud/dataplex/v1:business_glossary.proto -@com_google_googleapis//google/cloud/dataplex/v1:catalog.proto -@com_google_googleapis//google/cloud/dataplex/v1:cmek.proto -@com_google_googleapis//google/cloud/dataplex/v1:content.proto -@com_google_googleapis//google/cloud/dataplex/v1:data_discovery.proto -@com_google_googleapis//google/cloud/dataplex/v1:data_documentation.proto -@com_google_googleapis//google/cloud/dataplex/v1:data_profile.proto -@com_google_googleapis//google/cloud/dataplex/v1:data_quality.proto -@com_google_googleapis//google/cloud/dataplex/v1:data_taxonomy.proto -@com_google_googleapis//google/cloud/dataplex/v1:datascans.proto -@com_google_googleapis//google/cloud/dataplex/v1:datascans_common.proto -@com_google_googleapis//google/cloud/dataplex/v1:logs.proto -@com_google_googleapis//google/cloud/dataplex/v1:metadata.proto -@com_google_googleapis//google/cloud/dataplex/v1:processing.proto -@com_google_googleapis//google/cloud/dataplex/v1:resources.proto -@com_google_googleapis//google/cloud/dataplex/v1:security.proto -@com_google_googleapis//google/cloud/dataplex/v1:service.proto -@com_google_googleapis//google/cloud/dataplex/v1:tasks.proto +@googleapis//google/cloud/dataplex/v1:analyze.proto +@googleapis//google/cloud/dataplex/v1:business_glossary.proto +@googleapis//google/cloud/dataplex/v1:catalog.proto +@googleapis//google/cloud/dataplex/v1:cmek.proto +@googleapis//google/cloud/dataplex/v1:content.proto +@googleapis//google/cloud/dataplex/v1:data_discovery.proto +@googleapis//google/cloud/dataplex/v1:data_documentation.proto +@googleapis//google/cloud/dataplex/v1:data_profile.proto +@googleapis//google/cloud/dataplex/v1:data_quality.proto +@googleapis//google/cloud/dataplex/v1:data_taxonomy.proto +@googleapis//google/cloud/dataplex/v1:datascans.proto +@googleapis//google/cloud/dataplex/v1:datascans_common.proto +@googleapis//google/cloud/dataplex/v1:logs.proto +@googleapis//google/cloud/dataplex/v1:metadata.proto +@googleapis//google/cloud/dataplex/v1:processing.proto +@googleapis//google/cloud/dataplex/v1:resources.proto +@googleapis//google/cloud/dataplex/v1:security.proto +@googleapis//google/cloud/dataplex/v1:service.proto +@googleapis//google/cloud/dataplex/v1:tasks.proto diff --git a/external/googleapis/protolists/dataproc.list b/external/googleapis/protolists/dataproc.list index f1bb983c092d2..3deb2d2c6ed17 100644 --- a/external/googleapis/protolists/dataproc.list +++ b/external/googleapis/protolists/dataproc.list @@ -1,10 +1,10 @@ -@com_google_googleapis//google/cloud/dataproc/v1:autoscaling_policies.proto -@com_google_googleapis//google/cloud/dataproc/v1:batches.proto -@com_google_googleapis//google/cloud/dataproc/v1:clusters.proto -@com_google_googleapis//google/cloud/dataproc/v1:jobs.proto -@com_google_googleapis//google/cloud/dataproc/v1:node_groups.proto -@com_google_googleapis//google/cloud/dataproc/v1:operations.proto -@com_google_googleapis//google/cloud/dataproc/v1:session_templates.proto -@com_google_googleapis//google/cloud/dataproc/v1:sessions.proto -@com_google_googleapis//google/cloud/dataproc/v1:shared.proto -@com_google_googleapis//google/cloud/dataproc/v1:workflow_templates.proto +@googleapis//google/cloud/dataproc/v1:autoscaling_policies.proto +@googleapis//google/cloud/dataproc/v1:batches.proto +@googleapis//google/cloud/dataproc/v1:clusters.proto +@googleapis//google/cloud/dataproc/v1:jobs.proto +@googleapis//google/cloud/dataproc/v1:node_groups.proto +@googleapis//google/cloud/dataproc/v1:operations.proto +@googleapis//google/cloud/dataproc/v1:session_templates.proto +@googleapis//google/cloud/dataproc/v1:sessions.proto +@googleapis//google/cloud/dataproc/v1:shared.proto +@googleapis//google/cloud/dataproc/v1:workflow_templates.proto diff --git a/external/googleapis/protolists/datastore.list b/external/googleapis/protolists/datastore.list index 81374f05b4dee..70073fa25517e 100644 --- a/external/googleapis/protolists/datastore.list +++ b/external/googleapis/protolists/datastore.list @@ -1,8 +1,8 @@ -@com_google_googleapis//google/datastore/admin/v1:datastore_admin.proto -@com_google_googleapis//google/datastore/admin/v1:index.proto -@com_google_googleapis//google/datastore/admin/v1:migration.proto -@com_google_googleapis//google/datastore/v1:aggregation_result.proto -@com_google_googleapis//google/datastore/v1:datastore.proto -@com_google_googleapis//google/datastore/v1:entity.proto -@com_google_googleapis//google/datastore/v1:query.proto -@com_google_googleapis//google/datastore/v1:query_profile.proto +@googleapis//google/datastore/admin/v1:datastore_admin.proto +@googleapis//google/datastore/admin/v1:index.proto +@googleapis//google/datastore/admin/v1:migration.proto +@googleapis//google/datastore/v1:aggregation_result.proto +@googleapis//google/datastore/v1:datastore.proto +@googleapis//google/datastore/v1:entity.proto +@googleapis//google/datastore/v1:query.proto +@googleapis//google/datastore/v1:query_profile.proto diff --git a/external/googleapis/protolists/datastream.list b/external/googleapis/protolists/datastream.list index 233efb1ae8250..5edaf8e9c2dce 100644 --- a/external/googleapis/protolists/datastream.list +++ b/external/googleapis/protolists/datastream.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/datastream/v1:datastream.proto -@com_google_googleapis//google/cloud/datastream/v1:datastream_resources.proto +@googleapis//google/cloud/datastream/v1:datastream.proto +@googleapis//google/cloud/datastream/v1:datastream_resources.proto diff --git a/external/googleapis/protolists/deploy.list b/external/googleapis/protolists/deploy.list index e8c7143200875..62c077abb0fce 100644 --- a/external/googleapis/protolists/deploy.list +++ b/external/googleapis/protolists/deploy.list @@ -1,14 +1,14 @@ -@com_google_googleapis//google/cloud/deploy/v1:automation_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:automationrun_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:cloud_deploy.proto -@com_google_googleapis//google/cloud/deploy/v1:customtargettype_notification_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:deliverypipeline_notification_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:deploypolicy_evaluation_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:deploypolicy_notification_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:jobrun_notification_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:log_enums.proto -@com_google_googleapis//google/cloud/deploy/v1:release_notification_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:release_render_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:rollout_notification_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:rollout_update_payload.proto -@com_google_googleapis//google/cloud/deploy/v1:target_notification_payload.proto +@googleapis//google/cloud/deploy/v1:automation_payload.proto +@googleapis//google/cloud/deploy/v1:automationrun_payload.proto +@googleapis//google/cloud/deploy/v1:cloud_deploy.proto +@googleapis//google/cloud/deploy/v1:customtargettype_notification_payload.proto +@googleapis//google/cloud/deploy/v1:deliverypipeline_notification_payload.proto +@googleapis//google/cloud/deploy/v1:deploypolicy_evaluation_payload.proto +@googleapis//google/cloud/deploy/v1:deploypolicy_notification_payload.proto +@googleapis//google/cloud/deploy/v1:jobrun_notification_payload.proto +@googleapis//google/cloud/deploy/v1:log_enums.proto +@googleapis//google/cloud/deploy/v1:release_notification_payload.proto +@googleapis//google/cloud/deploy/v1:release_render_payload.proto +@googleapis//google/cloud/deploy/v1:rollout_notification_payload.proto +@googleapis//google/cloud/deploy/v1:rollout_update_payload.proto +@googleapis//google/cloud/deploy/v1:target_notification_payload.proto diff --git a/external/googleapis/protolists/developerconnect.list b/external/googleapis/protolists/developerconnect.list index b720197c889da..df705e8e37e11 100644 --- a/external/googleapis/protolists/developerconnect.list +++ b/external/googleapis/protolists/developerconnect.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/developerconnect/v1:developer_connect.proto -@com_google_googleapis//google/cloud/developerconnect/v1:insights_config.proto +@googleapis//google/cloud/developerconnect/v1:developer_connect.proto +@googleapis//google/cloud/developerconnect/v1:insights_config.proto diff --git a/external/googleapis/protolists/devicestreaming.list b/external/googleapis/protolists/devicestreaming.list index bfa0c525f0b4d..11db2904bc6e5 100644 --- a/external/googleapis/protolists/devicestreaming.list +++ b/external/googleapis/protolists/devicestreaming.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/devicestreaming/v1:adb_service.proto -@com_google_googleapis//google/cloud/devicestreaming/v1:service.proto +@googleapis//google/cloud/devicestreaming/v1:adb_service.proto +@googleapis//google/cloud/devicestreaming/v1:service.proto diff --git a/external/googleapis/protolists/dialogflow_cx.list b/external/googleapis/protolists/dialogflow_cx.list index c04a5c6ac7c98..6cc5e822334a2 100644 --- a/external/googleapis/protolists/dialogflow_cx.list +++ b/external/googleapis/protolists/dialogflow_cx.list @@ -1,28 +1,28 @@ -@com_google_googleapis//google/cloud/dialogflow/cx/v3:advanced_settings.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:agent.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:audio_config.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:changelog.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:data_store_connection.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:deployment.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:entity_type.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:environment.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:experiment.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:flow.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:fulfillment.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:gcs.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:generative_settings.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:generator.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:import_strategy.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:inline.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:intent.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:page.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:response_message.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:safety_settings.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:security_settings.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:session.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:session_entity_type.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:test_case.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:transition_route_group.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:validation_message.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:version.proto -@com_google_googleapis//google/cloud/dialogflow/cx/v3:webhook.proto +@googleapis//google/cloud/dialogflow/cx/v3:advanced_settings.proto +@googleapis//google/cloud/dialogflow/cx/v3:agent.proto +@googleapis//google/cloud/dialogflow/cx/v3:audio_config.proto +@googleapis//google/cloud/dialogflow/cx/v3:changelog.proto +@googleapis//google/cloud/dialogflow/cx/v3:data_store_connection.proto +@googleapis//google/cloud/dialogflow/cx/v3:deployment.proto +@googleapis//google/cloud/dialogflow/cx/v3:entity_type.proto +@googleapis//google/cloud/dialogflow/cx/v3:environment.proto +@googleapis//google/cloud/dialogflow/cx/v3:experiment.proto +@googleapis//google/cloud/dialogflow/cx/v3:flow.proto +@googleapis//google/cloud/dialogflow/cx/v3:fulfillment.proto +@googleapis//google/cloud/dialogflow/cx/v3:gcs.proto +@googleapis//google/cloud/dialogflow/cx/v3:generative_settings.proto +@googleapis//google/cloud/dialogflow/cx/v3:generator.proto +@googleapis//google/cloud/dialogflow/cx/v3:import_strategy.proto +@googleapis//google/cloud/dialogflow/cx/v3:inline.proto +@googleapis//google/cloud/dialogflow/cx/v3:intent.proto +@googleapis//google/cloud/dialogflow/cx/v3:page.proto +@googleapis//google/cloud/dialogflow/cx/v3:response_message.proto +@googleapis//google/cloud/dialogflow/cx/v3:safety_settings.proto +@googleapis//google/cloud/dialogflow/cx/v3:security_settings.proto +@googleapis//google/cloud/dialogflow/cx/v3:session.proto +@googleapis//google/cloud/dialogflow/cx/v3:session_entity_type.proto +@googleapis//google/cloud/dialogflow/cx/v3:test_case.proto +@googleapis//google/cloud/dialogflow/cx/v3:transition_route_group.proto +@googleapis//google/cloud/dialogflow/cx/v3:validation_message.proto +@googleapis//google/cloud/dialogflow/cx/v3:version.proto +@googleapis//google/cloud/dialogflow/cx/v3:webhook.proto diff --git a/external/googleapis/protolists/dialogflow_es.list b/external/googleapis/protolists/dialogflow_es.list index a1fe998abd586..8a0eb4099ad2d 100644 --- a/external/googleapis/protolists/dialogflow_es.list +++ b/external/googleapis/protolists/dialogflow_es.list @@ -1,25 +1,25 @@ -@com_google_googleapis//google/cloud/dialogflow/v2:agent.proto -@com_google_googleapis//google/cloud/dialogflow/v2:answer_record.proto -@com_google_googleapis//google/cloud/dialogflow/v2:audio_config.proto -@com_google_googleapis//google/cloud/dialogflow/v2:context.proto -@com_google_googleapis//google/cloud/dialogflow/v2:conversation.proto -@com_google_googleapis//google/cloud/dialogflow/v2:conversation_dataset.proto -@com_google_googleapis//google/cloud/dialogflow/v2:conversation_event.proto -@com_google_googleapis//google/cloud/dialogflow/v2:conversation_model.proto -@com_google_googleapis//google/cloud/dialogflow/v2:conversation_profile.proto -@com_google_googleapis//google/cloud/dialogflow/v2:document.proto -@com_google_googleapis//google/cloud/dialogflow/v2:encryption_spec.proto -@com_google_googleapis//google/cloud/dialogflow/v2:entity_type.proto -@com_google_googleapis//google/cloud/dialogflow/v2:environment.proto -@com_google_googleapis//google/cloud/dialogflow/v2:fulfillment.proto -@com_google_googleapis//google/cloud/dialogflow/v2:gcs.proto -@com_google_googleapis//google/cloud/dialogflow/v2:generator.proto -@com_google_googleapis//google/cloud/dialogflow/v2:human_agent_assistant_event.proto -@com_google_googleapis//google/cloud/dialogflow/v2:intent.proto -@com_google_googleapis//google/cloud/dialogflow/v2:knowledge_base.proto -@com_google_googleapis//google/cloud/dialogflow/v2:participant.proto -@com_google_googleapis//google/cloud/dialogflow/v2:session.proto -@com_google_googleapis//google/cloud/dialogflow/v2:session_entity_type.proto -@com_google_googleapis//google/cloud/dialogflow/v2:validation_result.proto -@com_google_googleapis//google/cloud/dialogflow/v2:version.proto -@com_google_googleapis//google/cloud/dialogflow/v2:webhook.proto +@googleapis//google/cloud/dialogflow/v2:agent.proto +@googleapis//google/cloud/dialogflow/v2:answer_record.proto +@googleapis//google/cloud/dialogflow/v2:audio_config.proto +@googleapis//google/cloud/dialogflow/v2:context.proto +@googleapis//google/cloud/dialogflow/v2:conversation.proto +@googleapis//google/cloud/dialogflow/v2:conversation_dataset.proto +@googleapis//google/cloud/dialogflow/v2:conversation_event.proto +@googleapis//google/cloud/dialogflow/v2:conversation_model.proto +@googleapis//google/cloud/dialogflow/v2:conversation_profile.proto +@googleapis//google/cloud/dialogflow/v2:document.proto +@googleapis//google/cloud/dialogflow/v2:encryption_spec.proto +@googleapis//google/cloud/dialogflow/v2:entity_type.proto +@googleapis//google/cloud/dialogflow/v2:environment.proto +@googleapis//google/cloud/dialogflow/v2:fulfillment.proto +@googleapis//google/cloud/dialogflow/v2:gcs.proto +@googleapis//google/cloud/dialogflow/v2:generator.proto +@googleapis//google/cloud/dialogflow/v2:human_agent_assistant_event.proto +@googleapis//google/cloud/dialogflow/v2:intent.proto +@googleapis//google/cloud/dialogflow/v2:knowledge_base.proto +@googleapis//google/cloud/dialogflow/v2:participant.proto +@googleapis//google/cloud/dialogflow/v2:session.proto +@googleapis//google/cloud/dialogflow/v2:session_entity_type.proto +@googleapis//google/cloud/dialogflow/v2:validation_result.proto +@googleapis//google/cloud/dialogflow/v2:version.proto +@googleapis//google/cloud/dialogflow/v2:webhook.proto diff --git a/external/googleapis/protolists/discoveryengine.list b/external/googleapis/protolists/discoveryengine.list index 7894ead553ed7..7e5db77358599 100644 --- a/external/googleapis/protolists/discoveryengine.list +++ b/external/googleapis/protolists/discoveryengine.list @@ -1,46 +1,46 @@ -@com_google_googleapis//google/cloud/discoveryengine/v1:answer.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:assist_answer.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:assistant.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:assistant_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:chunk.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:cmek_config_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:common.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:completion.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:completion_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:control.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:control_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:conversation.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:conversational_search_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:custom_tuning_model.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:data_store.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:data_store_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:document.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:document_processing_config.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:document_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:engine.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:engine_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:grounded_generation_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:grounding.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:identity_mapping_store.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:identity_mapping_store_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:import_config.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:project.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:project_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:purge_config.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:rank_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:recommendation_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:safety.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:schema.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:schema_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:search_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:search_tuning_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:serving_config.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:serving_config_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:session.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:session_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:site_search_engine.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:site_search_engine_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:user_event.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:user_event_service.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:user_license.proto -@com_google_googleapis//google/cloud/discoveryengine/v1:user_license_service.proto +@googleapis//google/cloud/discoveryengine/v1:answer.proto +@googleapis//google/cloud/discoveryengine/v1:assist_answer.proto +@googleapis//google/cloud/discoveryengine/v1:assistant.proto +@googleapis//google/cloud/discoveryengine/v1:assistant_service.proto +@googleapis//google/cloud/discoveryengine/v1:chunk.proto +@googleapis//google/cloud/discoveryengine/v1:cmek_config_service.proto +@googleapis//google/cloud/discoveryengine/v1:common.proto +@googleapis//google/cloud/discoveryengine/v1:completion.proto +@googleapis//google/cloud/discoveryengine/v1:completion_service.proto +@googleapis//google/cloud/discoveryengine/v1:control.proto +@googleapis//google/cloud/discoveryengine/v1:control_service.proto +@googleapis//google/cloud/discoveryengine/v1:conversation.proto +@googleapis//google/cloud/discoveryengine/v1:conversational_search_service.proto +@googleapis//google/cloud/discoveryengine/v1:custom_tuning_model.proto +@googleapis//google/cloud/discoveryengine/v1:data_store.proto +@googleapis//google/cloud/discoveryengine/v1:data_store_service.proto +@googleapis//google/cloud/discoveryengine/v1:document.proto +@googleapis//google/cloud/discoveryengine/v1:document_processing_config.proto +@googleapis//google/cloud/discoveryengine/v1:document_service.proto +@googleapis//google/cloud/discoveryengine/v1:engine.proto +@googleapis//google/cloud/discoveryengine/v1:engine_service.proto +@googleapis//google/cloud/discoveryengine/v1:grounded_generation_service.proto +@googleapis//google/cloud/discoveryengine/v1:grounding.proto +@googleapis//google/cloud/discoveryengine/v1:identity_mapping_store.proto +@googleapis//google/cloud/discoveryengine/v1:identity_mapping_store_service.proto +@googleapis//google/cloud/discoveryengine/v1:import_config.proto +@googleapis//google/cloud/discoveryengine/v1:project.proto +@googleapis//google/cloud/discoveryengine/v1:project_service.proto +@googleapis//google/cloud/discoveryengine/v1:purge_config.proto +@googleapis//google/cloud/discoveryengine/v1:rank_service.proto +@googleapis//google/cloud/discoveryengine/v1:recommendation_service.proto +@googleapis//google/cloud/discoveryengine/v1:safety.proto +@googleapis//google/cloud/discoveryengine/v1:schema.proto +@googleapis//google/cloud/discoveryengine/v1:schema_service.proto +@googleapis//google/cloud/discoveryengine/v1:search_service.proto +@googleapis//google/cloud/discoveryengine/v1:search_tuning_service.proto +@googleapis//google/cloud/discoveryengine/v1:serving_config.proto +@googleapis//google/cloud/discoveryengine/v1:serving_config_service.proto +@googleapis//google/cloud/discoveryengine/v1:session.proto +@googleapis//google/cloud/discoveryengine/v1:session_service.proto +@googleapis//google/cloud/discoveryengine/v1:site_search_engine.proto +@googleapis//google/cloud/discoveryengine/v1:site_search_engine_service.proto +@googleapis//google/cloud/discoveryengine/v1:user_event.proto +@googleapis//google/cloud/discoveryengine/v1:user_event_service.proto +@googleapis//google/cloud/discoveryengine/v1:user_license.proto +@googleapis//google/cloud/discoveryengine/v1:user_license_service.proto diff --git a/external/googleapis/protolists/dlp.list b/external/googleapis/protolists/dlp.list index 838d602acb8fa..2756d9a964737 100644 --- a/external/googleapis/protolists/dlp.list +++ b/external/googleapis/protolists/dlp.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/privacy/dlp/v2:dlp.proto -@com_google_googleapis//google/privacy/dlp/v2:storage.proto +@googleapis//google/privacy/dlp/v2:dlp.proto +@googleapis//google/privacy/dlp/v2:storage.proto diff --git a/external/googleapis/protolists/documentai.list b/external/googleapis/protolists/documentai.list index 1b7c34821f90f..39b5627cb0721 100644 --- a/external/googleapis/protolists/documentai.list +++ b/external/googleapis/protolists/documentai.list @@ -1,10 +1,10 @@ -@com_google_googleapis//google/cloud/documentai/v1:barcode.proto -@com_google_googleapis//google/cloud/documentai/v1:document.proto -@com_google_googleapis//google/cloud/documentai/v1:document_io.proto -@com_google_googleapis//google/cloud/documentai/v1:document_processor_service.proto -@com_google_googleapis//google/cloud/documentai/v1:document_schema.proto -@com_google_googleapis//google/cloud/documentai/v1:evaluation.proto -@com_google_googleapis//google/cloud/documentai/v1:geometry.proto -@com_google_googleapis//google/cloud/documentai/v1:operation_metadata.proto -@com_google_googleapis//google/cloud/documentai/v1:processor.proto -@com_google_googleapis//google/cloud/documentai/v1:processor_type.proto +@googleapis//google/cloud/documentai/v1:barcode.proto +@googleapis//google/cloud/documentai/v1:document.proto +@googleapis//google/cloud/documentai/v1:document_io.proto +@googleapis//google/cloud/documentai/v1:document_processor_service.proto +@googleapis//google/cloud/documentai/v1:document_schema.proto +@googleapis//google/cloud/documentai/v1:evaluation.proto +@googleapis//google/cloud/documentai/v1:geometry.proto +@googleapis//google/cloud/documentai/v1:operation_metadata.proto +@googleapis//google/cloud/documentai/v1:processor.proto +@googleapis//google/cloud/documentai/v1:processor_type.proto diff --git a/external/googleapis/protolists/domains.list b/external/googleapis/protolists/domains.list index ed603a3e1e19d..9e7caf1d1a2a1 100644 --- a/external/googleapis/protolists/domains.list +++ b/external/googleapis/protolists/domains.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/domains/v1:domains.proto +@googleapis//google/cloud/domains/v1:domains.proto diff --git a/external/googleapis/protolists/edgecontainer.list b/external/googleapis/protolists/edgecontainer.list index 202b5f564d04b..b00cffcf74969 100644 --- a/external/googleapis/protolists/edgecontainer.list +++ b/external/googleapis/protolists/edgecontainer.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/edgecontainer/v1:resources.proto -@com_google_googleapis//google/cloud/edgecontainer/v1:service.proto +@googleapis//google/cloud/edgecontainer/v1:resources.proto +@googleapis//google/cloud/edgecontainer/v1:service.proto diff --git a/external/googleapis/protolists/edgenetwork.list b/external/googleapis/protolists/edgenetwork.list index 3c3fdd55292ec..05ca1e671fed6 100644 --- a/external/googleapis/protolists/edgenetwork.list +++ b/external/googleapis/protolists/edgenetwork.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/edgenetwork/v1:resources.proto -@com_google_googleapis//google/cloud/edgenetwork/v1:service.proto +@googleapis//google/cloud/edgenetwork/v1:resources.proto +@googleapis//google/cloud/edgenetwork/v1:service.proto diff --git a/external/googleapis/protolists/essentialcontacts.list b/external/googleapis/protolists/essentialcontacts.list index cc8480f3683e0..fba232072ea0f 100644 --- a/external/googleapis/protolists/essentialcontacts.list +++ b/external/googleapis/protolists/essentialcontacts.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/essentialcontacts/v1:enums.proto -@com_google_googleapis//google/cloud/essentialcontacts/v1:service.proto +@googleapis//google/cloud/essentialcontacts/v1:enums.proto +@googleapis//google/cloud/essentialcontacts/v1:service.proto diff --git a/external/googleapis/protolists/eventarc.list b/external/googleapis/protolists/eventarc.list index fd0efedc3d1e1..414237bceebe9 100644 --- a/external/googleapis/protolists/eventarc.list +++ b/external/googleapis/protolists/eventarc.list @@ -1,14 +1,14 @@ -@com_google_googleapis//google/cloud/eventarc/publishing/v1:cloud_event.proto -@com_google_googleapis//google/cloud/eventarc/publishing/v1:publisher.proto -@com_google_googleapis//google/cloud/eventarc/v1:channel.proto -@com_google_googleapis//google/cloud/eventarc/v1:channel_connection.proto -@com_google_googleapis//google/cloud/eventarc/v1:discovery.proto -@com_google_googleapis//google/cloud/eventarc/v1:enrollment.proto -@com_google_googleapis//google/cloud/eventarc/v1:eventarc.proto -@com_google_googleapis//google/cloud/eventarc/v1:google_api_source.proto -@com_google_googleapis//google/cloud/eventarc/v1:google_channel_config.proto -@com_google_googleapis//google/cloud/eventarc/v1:logging_config.proto -@com_google_googleapis//google/cloud/eventarc/v1:message_bus.proto -@com_google_googleapis//google/cloud/eventarc/v1:network_config.proto -@com_google_googleapis//google/cloud/eventarc/v1:pipeline.proto -@com_google_googleapis//google/cloud/eventarc/v1:trigger.proto +@googleapis//google/cloud/eventarc/publishing/v1:cloud_event.proto +@googleapis//google/cloud/eventarc/publishing/v1:publisher.proto +@googleapis//google/cloud/eventarc/v1:channel.proto +@googleapis//google/cloud/eventarc/v1:channel_connection.proto +@googleapis//google/cloud/eventarc/v1:discovery.proto +@googleapis//google/cloud/eventarc/v1:enrollment.proto +@googleapis//google/cloud/eventarc/v1:eventarc.proto +@googleapis//google/cloud/eventarc/v1:google_api_source.proto +@googleapis//google/cloud/eventarc/v1:google_channel_config.proto +@googleapis//google/cloud/eventarc/v1:logging_config.proto +@googleapis//google/cloud/eventarc/v1:message_bus.proto +@googleapis//google/cloud/eventarc/v1:network_config.proto +@googleapis//google/cloud/eventarc/v1:pipeline.proto +@googleapis//google/cloud/eventarc/v1:trigger.proto diff --git a/external/googleapis/protolists/filestore.list b/external/googleapis/protolists/filestore.list index 8c5f3f8f8ecd2..0e5008b2f3abf 100644 --- a/external/googleapis/protolists/filestore.list +++ b/external/googleapis/protolists/filestore.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/filestore/v1:cloud_filestore_service.proto +@googleapis//google/cloud/filestore/v1:cloud_filestore_service.proto diff --git a/external/googleapis/protolists/financialservices.list b/external/googleapis/protolists/financialservices.list index e4feb668f9ac4..9becdd0d23b0d 100644 --- a/external/googleapis/protolists/financialservices.list +++ b/external/googleapis/protolists/financialservices.list @@ -1,10 +1,10 @@ -@com_google_googleapis//google/cloud/financialservices/v1:backtest_result.proto -@com_google_googleapis//google/cloud/financialservices/v1:bigquery_destination.proto -@com_google_googleapis//google/cloud/financialservices/v1:dataset.proto -@com_google_googleapis//google/cloud/financialservices/v1:engine_config.proto -@com_google_googleapis//google/cloud/financialservices/v1:engine_version.proto -@com_google_googleapis//google/cloud/financialservices/v1:instance.proto -@com_google_googleapis//google/cloud/financialservices/v1:line_of_business.proto -@com_google_googleapis//google/cloud/financialservices/v1:model.proto -@com_google_googleapis//google/cloud/financialservices/v1:prediction_result.proto -@com_google_googleapis//google/cloud/financialservices/v1:service.proto +@googleapis//google/cloud/financialservices/v1:backtest_result.proto +@googleapis//google/cloud/financialservices/v1:bigquery_destination.proto +@googleapis//google/cloud/financialservices/v1:dataset.proto +@googleapis//google/cloud/financialservices/v1:engine_config.proto +@googleapis//google/cloud/financialservices/v1:engine_version.proto +@googleapis//google/cloud/financialservices/v1:instance.proto +@googleapis//google/cloud/financialservices/v1:line_of_business.proto +@googleapis//google/cloud/financialservices/v1:model.proto +@googleapis//google/cloud/financialservices/v1:prediction_result.proto +@googleapis//google/cloud/financialservices/v1:service.proto diff --git a/external/googleapis/protolists/functions.list b/external/googleapis/protolists/functions.list index 78831280d291f..bbeee9c6a1161 100644 --- a/external/googleapis/protolists/functions.list +++ b/external/googleapis/protolists/functions.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/functions/v1:functions.proto -@com_google_googleapis//google/cloud/functions/v1:operations.proto -@com_google_googleapis//google/cloud/functions/v2:functions.proto +@googleapis//google/cloud/functions/v1:functions.proto +@googleapis//google/cloud/functions/v1:operations.proto +@googleapis//google/cloud/functions/v2:functions.proto diff --git a/external/googleapis/protolists/gkebackup.list b/external/googleapis/protolists/gkebackup.list index 3fabfe7539177..a6223295cfd56 100644 --- a/external/googleapis/protolists/gkebackup.list +++ b/external/googleapis/protolists/gkebackup.list @@ -1,21 +1,21 @@ -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_backup.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_backup_channel.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_backup_plan.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_backup_plan_metadata.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_common.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_restore.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_restore_channel.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_restore_plan.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logged_restore_plan_metadata.proto -@com_google_googleapis//google/cloud/gkebackup/logging/v1:logging.proto -@com_google_googleapis//google/cloud/gkebackup/v1:backup.proto -@com_google_googleapis//google/cloud/gkebackup/v1:backup_channel.proto -@com_google_googleapis//google/cloud/gkebackup/v1:backup_plan.proto -@com_google_googleapis//google/cloud/gkebackup/v1:backup_plan_binding.proto -@com_google_googleapis//google/cloud/gkebackup/v1:common.proto -@com_google_googleapis//google/cloud/gkebackup/v1:gkebackup.proto -@com_google_googleapis//google/cloud/gkebackup/v1:restore.proto -@com_google_googleapis//google/cloud/gkebackup/v1:restore_channel.proto -@com_google_googleapis//google/cloud/gkebackup/v1:restore_plan.proto -@com_google_googleapis//google/cloud/gkebackup/v1:restore_plan_binding.proto -@com_google_googleapis//google/cloud/gkebackup/v1:volume.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_backup.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_backup_channel.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_backup_plan.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_backup_plan_metadata.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_common.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_restore.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_restore_channel.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_restore_plan.proto +@googleapis//google/cloud/gkebackup/logging/v1:logged_restore_plan_metadata.proto +@googleapis//google/cloud/gkebackup/logging/v1:logging.proto +@googleapis//google/cloud/gkebackup/v1:backup.proto +@googleapis//google/cloud/gkebackup/v1:backup_channel.proto +@googleapis//google/cloud/gkebackup/v1:backup_plan.proto +@googleapis//google/cloud/gkebackup/v1:backup_plan_binding.proto +@googleapis//google/cloud/gkebackup/v1:common.proto +@googleapis//google/cloud/gkebackup/v1:gkebackup.proto +@googleapis//google/cloud/gkebackup/v1:restore.proto +@googleapis//google/cloud/gkebackup/v1:restore_channel.proto +@googleapis//google/cloud/gkebackup/v1:restore_plan.proto +@googleapis//google/cloud/gkebackup/v1:restore_plan_binding.proto +@googleapis//google/cloud/gkebackup/v1:volume.proto diff --git a/external/googleapis/protolists/gkeconnect.list b/external/googleapis/protolists/gkeconnect.list index 72af37af9a2d5..c12f99bec9986 100644 --- a/external/googleapis/protolists/gkeconnect.list +++ b/external/googleapis/protolists/gkeconnect.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/gkeconnect/gateway/v1:control.proto +@googleapis//google/cloud/gkeconnect/gateway/v1:control.proto diff --git a/external/googleapis/protolists/gkehub.list b/external/googleapis/protolists/gkehub.list index 5f5e8a1e61f01..9f9e124972213 100644 --- a/external/googleapis/protolists/gkehub.list +++ b/external/googleapis/protolists/gkehub.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/gkehub/v1/configmanagement:configmanagement.proto -@com_google_googleapis//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress.proto -@com_google_googleapis//google/cloud/gkehub/v1:feature.proto -@com_google_googleapis//google/cloud/gkehub/v1:membership.proto -@com_google_googleapis//google/cloud/gkehub/v1:service.proto +@googleapis//google/cloud/gkehub/v1/configmanagement:configmanagement.proto +@googleapis//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress.proto +@googleapis//google/cloud/gkehub/v1:feature.proto +@googleapis//google/cloud/gkehub/v1:membership.proto +@googleapis//google/cloud/gkehub/v1:service.proto diff --git a/external/googleapis/protolists/gkemulticloud.list b/external/googleapis/protolists/gkemulticloud.list index fac2cdbe82867..5134e66e34a58 100644 --- a/external/googleapis/protolists/gkemulticloud.list +++ b/external/googleapis/protolists/gkemulticloud.list @@ -1,7 +1,7 @@ -@com_google_googleapis//google/cloud/gkemulticloud/v1:attached_resources.proto -@com_google_googleapis//google/cloud/gkemulticloud/v1:attached_service.proto -@com_google_googleapis//google/cloud/gkemulticloud/v1:aws_resources.proto -@com_google_googleapis//google/cloud/gkemulticloud/v1:aws_service.proto -@com_google_googleapis//google/cloud/gkemulticloud/v1:azure_resources.proto -@com_google_googleapis//google/cloud/gkemulticloud/v1:azure_service.proto -@com_google_googleapis//google/cloud/gkemulticloud/v1:common_resources.proto +@googleapis//google/cloud/gkemulticloud/v1:attached_resources.proto +@googleapis//google/cloud/gkemulticloud/v1:attached_service.proto +@googleapis//google/cloud/gkemulticloud/v1:aws_resources.proto +@googleapis//google/cloud/gkemulticloud/v1:aws_service.proto +@googleapis//google/cloud/gkemulticloud/v1:azure_resources.proto +@googleapis//google/cloud/gkemulticloud/v1:azure_service.proto +@googleapis//google/cloud/gkemulticloud/v1:common_resources.proto diff --git a/external/googleapis/protolists/grafeas.list b/external/googleapis/protolists/grafeas.list index 0f400a2055976..43832823976e7 100644 --- a/external/googleapis/protolists/grafeas.list +++ b/external/googleapis/protolists/grafeas.list @@ -1,22 +1,22 @@ -@com_google_googleapis//grafeas/v1:attestation.proto -@com_google_googleapis//grafeas/v1:build.proto -@com_google_googleapis//grafeas/v1:common.proto -@com_google_googleapis//grafeas/v1:compliance.proto -@com_google_googleapis//grafeas/v1:cvss.proto -@com_google_googleapis//grafeas/v1:deployment.proto -@com_google_googleapis//grafeas/v1:discovery.proto -@com_google_googleapis//grafeas/v1:dsse_attestation.proto -@com_google_googleapis//grafeas/v1:grafeas.proto -@com_google_googleapis//grafeas/v1:image.proto -@com_google_googleapis//grafeas/v1:intoto_provenance.proto -@com_google_googleapis//grafeas/v1:intoto_statement.proto -@com_google_googleapis//grafeas/v1:package.proto -@com_google_googleapis//grafeas/v1:provenance.proto -@com_google_googleapis//grafeas/v1:sbom.proto -@com_google_googleapis//grafeas/v1:secret.proto -@com_google_googleapis//grafeas/v1:severity.proto -@com_google_googleapis//grafeas/v1:slsa_provenance.proto -@com_google_googleapis//grafeas/v1:slsa_provenance_zero_two.proto -@com_google_googleapis//grafeas/v1:upgrade.proto -@com_google_googleapis//grafeas/v1:vex.proto -@com_google_googleapis//grafeas/v1:vulnerability.proto +@googleapis//grafeas/v1:attestation.proto +@googleapis//grafeas/v1:build.proto +@googleapis//grafeas/v1:common.proto +@googleapis//grafeas/v1:compliance.proto +@googleapis//grafeas/v1:cvss.proto +@googleapis//grafeas/v1:deployment.proto +@googleapis//grafeas/v1:discovery.proto +@googleapis//grafeas/v1:dsse_attestation.proto +@googleapis//grafeas/v1:grafeas.proto +@googleapis//grafeas/v1:image.proto +@googleapis//grafeas/v1:intoto_provenance.proto +@googleapis//grafeas/v1:intoto_statement.proto +@googleapis//grafeas/v1:package.proto +@googleapis//grafeas/v1:provenance.proto +@googleapis//grafeas/v1:sbom.proto +@googleapis//grafeas/v1:secret.proto +@googleapis//grafeas/v1:severity.proto +@googleapis//grafeas/v1:slsa_provenance.proto +@googleapis//grafeas/v1:slsa_provenance_zero_two.proto +@googleapis//grafeas/v1:upgrade.proto +@googleapis//grafeas/v1:vex.proto +@googleapis//grafeas/v1:vulnerability.proto diff --git a/external/googleapis/protolists/iam.list b/external/googleapis/protolists/iam.list index e5736a9cc1674..dacc4a809a0ee 100644 --- a/external/googleapis/protolists/iam.list +++ b/external/googleapis/protolists/iam.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/iam/admin/v1:audit_data.proto -@com_google_googleapis//google/iam/admin/v1:iam.proto +@googleapis//google/iam/admin/v1:audit_data.proto +@googleapis//google/iam/admin/v1:iam.proto diff --git a/external/googleapis/protolists/iam_v2.list b/external/googleapis/protolists/iam_v2.list index 8fb4a963d1c1e..64654a95e5f27 100644 --- a/external/googleapis/protolists/iam_v2.list +++ b/external/googleapis/protolists/iam_v2.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/iam/v2:deny.proto -@com_google_googleapis//google/iam/v2:policy.proto +@googleapis//google/iam/v2:deny.proto +@googleapis//google/iam/v2:policy.proto diff --git a/external/googleapis/protolists/iam_v3.list b/external/googleapis/protolists/iam_v3.list index da1849ff962ab..a72437f0c6fca 100644 --- a/external/googleapis/protolists/iam_v3.list +++ b/external/googleapis/protolists/iam_v3.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/iam/v3:operation_metadata.proto -@com_google_googleapis//google/iam/v3:policy_binding_resources.proto -@com_google_googleapis//google/iam/v3:policy_bindings_service.proto -@com_google_googleapis//google/iam/v3:principal_access_boundary_policies_service.proto -@com_google_googleapis//google/iam/v3:principal_access_boundary_policy_resources.proto +@googleapis//google/iam/v3:operation_metadata.proto +@googleapis//google/iam/v3:policy_binding_resources.proto +@googleapis//google/iam/v3:policy_bindings_service.proto +@googleapis//google/iam/v3:principal_access_boundary_policies_service.proto +@googleapis//google/iam/v3:principal_access_boundary_policy_resources.proto diff --git a/external/googleapis/protolists/iap.list b/external/googleapis/protolists/iap.list index c9fe8a86f48a4..d3d7a76642492 100644 --- a/external/googleapis/protolists/iap.list +++ b/external/googleapis/protolists/iap.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/iap/v1:service.proto +@googleapis//google/cloud/iap/v1:service.proto diff --git a/external/googleapis/protolists/ids.list b/external/googleapis/protolists/ids.list index a1a43f91d8a13..faa82693da1f9 100644 --- a/external/googleapis/protolists/ids.list +++ b/external/googleapis/protolists/ids.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/ids/v1:ids.proto +@googleapis//google/cloud/ids/v1:ids.proto diff --git a/external/googleapis/protolists/kms.list b/external/googleapis/protolists/kms.list index a89e92f8c8a97..6d21af30d9d9d 100644 --- a/external/googleapis/protolists/kms.list +++ b/external/googleapis/protolists/kms.list @@ -1,7 +1,7 @@ -@com_google_googleapis//google/cloud/kms/inventory/v1:key_dashboard_service.proto -@com_google_googleapis//google/cloud/kms/inventory/v1:key_tracking_service.proto -@com_google_googleapis//google/cloud/kms/v1:autokey.proto -@com_google_googleapis//google/cloud/kms/v1:autokey_admin.proto -@com_google_googleapis//google/cloud/kms/v1:ekm_service.proto -@com_google_googleapis//google/cloud/kms/v1:resources.proto -@com_google_googleapis//google/cloud/kms/v1:service.proto +@googleapis//google/cloud/kms/inventory/v1:key_dashboard_service.proto +@googleapis//google/cloud/kms/inventory/v1:key_tracking_service.proto +@googleapis//google/cloud/kms/v1:autokey.proto +@googleapis//google/cloud/kms/v1:autokey_admin.proto +@googleapis//google/cloud/kms/v1:ekm_service.proto +@googleapis//google/cloud/kms/v1:resources.proto +@googleapis//google/cloud/kms/v1:service.proto diff --git a/external/googleapis/protolists/language.list b/external/googleapis/protolists/language.list index 11fcee13ff4fa..dce1ed7c2dfc5 100644 --- a/external/googleapis/protolists/language.list +++ b/external/googleapis/protolists/language.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/language/v1:language_service.proto -@com_google_googleapis//google/cloud/language/v2:language_service.proto +@googleapis//google/cloud/language/v1:language_service.proto +@googleapis//google/cloud/language/v2:language_service.proto diff --git a/external/googleapis/protolists/licensemanager.list b/external/googleapis/protolists/licensemanager.list index b8b737b22443a..0c2346a801804 100644 --- a/external/googleapis/protolists/licensemanager.list +++ b/external/googleapis/protolists/licensemanager.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/licensemanager/v1:api_entities.proto -@com_google_googleapis//google/cloud/licensemanager/v1:licensemanager.proto +@googleapis//google/cloud/licensemanager/v1:api_entities.proto +@googleapis//google/cloud/licensemanager/v1:licensemanager.proto diff --git a/external/googleapis/protolists/logging.list b/external/googleapis/protolists/logging.list index c17233e432056..7a32e64762b6d 100644 --- a/external/googleapis/protolists/logging.list +++ b/external/googleapis/protolists/logging.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/logging/v2:log_entry.proto -@com_google_googleapis//google/logging/v2:logging.proto -@com_google_googleapis//google/logging/v2:logging_config.proto -@com_google_googleapis//google/logging/v2:logging_metrics.proto +@googleapis//google/logging/v2:log_entry.proto +@googleapis//google/logging/v2:logging.proto +@googleapis//google/logging/v2:logging_config.proto +@googleapis//google/logging/v2:logging_metrics.proto diff --git a/external/googleapis/protolists/logging_type.list b/external/googleapis/protolists/logging_type.list index fde81c913e41d..40039bc218ed6 100644 --- a/external/googleapis/protolists/logging_type.list +++ b/external/googleapis/protolists/logging_type.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/logging/type:http_request.proto -@com_google_googleapis//google/logging/type:log_severity.proto +@googleapis//google/logging/type:http_request.proto +@googleapis//google/logging/type:log_severity.proto diff --git a/external/googleapis/protolists/lustre.list b/external/googleapis/protolists/lustre.list index 676a40809c361..9da3687a2546e 100644 --- a/external/googleapis/protolists/lustre.list +++ b/external/googleapis/protolists/lustre.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/lustre/v1:instance.proto -@com_google_googleapis//google/cloud/lustre/v1:lustre.proto -@com_google_googleapis//google/cloud/lustre/v1:transfer.proto +@googleapis//google/cloud/lustre/v1:instance.proto +@googleapis//google/cloud/lustre/v1:lustre.proto +@googleapis//google/cloud/lustre/v1:transfer.proto diff --git a/external/googleapis/protolists/maintenance.list b/external/googleapis/protolists/maintenance.list index 3c118b13d3f73..1d214e3500b23 100644 --- a/external/googleapis/protolists/maintenance.list +++ b/external/googleapis/protolists/maintenance.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/maintenance/api/v1:maintenance_service.proto +@googleapis//google/cloud/maintenance/api/v1:maintenance_service.proto diff --git a/external/googleapis/protolists/managedidentities.list b/external/googleapis/protolists/managedidentities.list index 86337eb3002af..f986905ce8a24 100644 --- a/external/googleapis/protolists/managedidentities.list +++ b/external/googleapis/protolists/managedidentities.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/managedidentities/v1:managed_identities_service.proto -@com_google_googleapis//google/cloud/managedidentities/v1:resource.proto +@googleapis//google/cloud/managedidentities/v1:managed_identities_service.proto +@googleapis//google/cloud/managedidentities/v1:resource.proto diff --git a/external/googleapis/protolists/managedkafka.list b/external/googleapis/protolists/managedkafka.list index b359d9053f2d4..4187899be663a 100644 --- a/external/googleapis/protolists/managedkafka.list +++ b/external/googleapis/protolists/managedkafka.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/managedkafka/schemaregistry/v1:schema_registry.proto -@com_google_googleapis//google/cloud/managedkafka/schemaregistry/v1:schema_registry_resources.proto -@com_google_googleapis//google/cloud/managedkafka/v1:managed_kafka.proto -@com_google_googleapis//google/cloud/managedkafka/v1:managed_kafka_connect.proto -@com_google_googleapis//google/cloud/managedkafka/v1:resources.proto +@googleapis//google/cloud/managedkafka/schemaregistry/v1:schema_registry.proto +@googleapis//google/cloud/managedkafka/schemaregistry/v1:schema_registry_resources.proto +@googleapis//google/cloud/managedkafka/v1:managed_kafka.proto +@googleapis//google/cloud/managedkafka/v1:managed_kafka_connect.proto +@googleapis//google/cloud/managedkafka/v1:resources.proto diff --git a/external/googleapis/protolists/memcache.list b/external/googleapis/protolists/memcache.list index 3e67d6855bf9c..6e6962ff4823a 100644 --- a/external/googleapis/protolists/memcache.list +++ b/external/googleapis/protolists/memcache.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/memcache/v1:cloud_memcache.proto +@googleapis//google/cloud/memcache/v1:cloud_memcache.proto diff --git a/external/googleapis/protolists/memorystore.list b/external/googleapis/protolists/memorystore.list index 2b9be63a9d600..4d7355e8fd396 100644 --- a/external/googleapis/protolists/memorystore.list +++ b/external/googleapis/protolists/memorystore.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/memorystore/v1:memorystore.proto +@googleapis//google/cloud/memorystore/v1:memorystore.proto diff --git a/external/googleapis/protolists/metastore.list b/external/googleapis/protolists/metastore.list index 5eb58d3e1c6f4..744e3350a2fcc 100644 --- a/external/googleapis/protolists/metastore.list +++ b/external/googleapis/protolists/metastore.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/metastore/logging/v1:log_streams.proto -@com_google_googleapis//google/cloud/metastore/v1:metastore.proto -@com_google_googleapis//google/cloud/metastore/v1:metastore_federation.proto +@googleapis//google/cloud/metastore/logging/v1:log_streams.proto +@googleapis//google/cloud/metastore/v1:metastore.proto +@googleapis//google/cloud/metastore/v1:metastore_federation.proto diff --git a/external/googleapis/protolists/migrationcenter.list b/external/googleapis/protolists/migrationcenter.list index f08c9c1eab9b1..bdb3b2aa300c4 100644 --- a/external/googleapis/protolists/migrationcenter.list +++ b/external/googleapis/protolists/migrationcenter.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/migrationcenter/v1:migrationcenter.proto +@googleapis//google/cloud/migrationcenter/v1:migrationcenter.proto diff --git a/external/googleapis/protolists/monitoring.list b/external/googleapis/protolists/monitoring.list index 378157448fd33..68b7571fb8705 100644 --- a/external/googleapis/protolists/monitoring.list +++ b/external/googleapis/protolists/monitoring.list @@ -1,43 +1,43 @@ -@com_google_googleapis//google/monitoring/dashboard/v1:alertchart.proto -@com_google_googleapis//google/monitoring/dashboard/v1:collapsible_group.proto -@com_google_googleapis//google/monitoring/dashboard/v1:common.proto -@com_google_googleapis//google/monitoring/dashboard/v1:dashboard.proto -@com_google_googleapis//google/monitoring/dashboard/v1:dashboard_filter.proto -@com_google_googleapis//google/monitoring/dashboard/v1:dashboards_service.proto -@com_google_googleapis//google/monitoring/dashboard/v1:drilldowns.proto -@com_google_googleapis//google/monitoring/dashboard/v1:error_reporting_panel.proto -@com_google_googleapis//google/monitoring/dashboard/v1:incident_list.proto -@com_google_googleapis//google/monitoring/dashboard/v1:layouts.proto -@com_google_googleapis//google/monitoring/dashboard/v1:logs_panel.proto -@com_google_googleapis//google/monitoring/dashboard/v1:metrics.proto -@com_google_googleapis//google/monitoring/dashboard/v1:piechart.proto -@com_google_googleapis//google/monitoring/dashboard/v1:scorecard.proto -@com_google_googleapis//google/monitoring/dashboard/v1:section_header.proto -@com_google_googleapis//google/monitoring/dashboard/v1:service.proto -@com_google_googleapis//google/monitoring/dashboard/v1:single_view_group.proto -@com_google_googleapis//google/monitoring/dashboard/v1:table.proto -@com_google_googleapis//google/monitoring/dashboard/v1:table_display_options.proto -@com_google_googleapis//google/monitoring/dashboard/v1:text.proto -@com_google_googleapis//google/monitoring/dashboard/v1:widget.proto -@com_google_googleapis//google/monitoring/dashboard/v1:xychart.proto -@com_google_googleapis//google/monitoring/metricsscope/v1:metrics_scope.proto -@com_google_googleapis//google/monitoring/metricsscope/v1:metrics_scopes.proto -@com_google_googleapis//google/monitoring/v3:alert.proto -@com_google_googleapis//google/monitoring/v3:alert_service.proto -@com_google_googleapis//google/monitoring/v3:common.proto -@com_google_googleapis//google/monitoring/v3:dropped_labels.proto -@com_google_googleapis//google/monitoring/v3:group.proto -@com_google_googleapis//google/monitoring/v3:group_service.proto -@com_google_googleapis//google/monitoring/v3:metric.proto -@com_google_googleapis//google/monitoring/v3:metric_service.proto -@com_google_googleapis//google/monitoring/v3:mutation_record.proto -@com_google_googleapis//google/monitoring/v3:notification.proto -@com_google_googleapis//google/monitoring/v3:notification_service.proto -@com_google_googleapis//google/monitoring/v3:query_service.proto -@com_google_googleapis//google/monitoring/v3:service.proto -@com_google_googleapis//google/monitoring/v3:service_service.proto -@com_google_googleapis//google/monitoring/v3:snooze.proto -@com_google_googleapis//google/monitoring/v3:snooze_service.proto -@com_google_googleapis//google/monitoring/v3:span_context.proto -@com_google_googleapis//google/monitoring/v3:uptime.proto -@com_google_googleapis//google/monitoring/v3:uptime_service.proto +@googleapis//google/monitoring/dashboard/v1:alertchart.proto +@googleapis//google/monitoring/dashboard/v1:collapsible_group.proto +@googleapis//google/monitoring/dashboard/v1:common.proto +@googleapis//google/monitoring/dashboard/v1:dashboard.proto +@googleapis//google/monitoring/dashboard/v1:dashboard_filter.proto +@googleapis//google/monitoring/dashboard/v1:dashboards_service.proto +@googleapis//google/monitoring/dashboard/v1:drilldowns.proto +@googleapis//google/monitoring/dashboard/v1:error_reporting_panel.proto +@googleapis//google/monitoring/dashboard/v1:incident_list.proto +@googleapis//google/monitoring/dashboard/v1:layouts.proto +@googleapis//google/monitoring/dashboard/v1:logs_panel.proto +@googleapis//google/monitoring/dashboard/v1:metrics.proto +@googleapis//google/monitoring/dashboard/v1:piechart.proto +@googleapis//google/monitoring/dashboard/v1:scorecard.proto +@googleapis//google/monitoring/dashboard/v1:section_header.proto +@googleapis//google/monitoring/dashboard/v1:service.proto +@googleapis//google/monitoring/dashboard/v1:single_view_group.proto +@googleapis//google/monitoring/dashboard/v1:table.proto +@googleapis//google/monitoring/dashboard/v1:table_display_options.proto +@googleapis//google/monitoring/dashboard/v1:text.proto +@googleapis//google/monitoring/dashboard/v1:widget.proto +@googleapis//google/monitoring/dashboard/v1:xychart.proto +@googleapis//google/monitoring/metricsscope/v1:metrics_scope.proto +@googleapis//google/monitoring/metricsscope/v1:metrics_scopes.proto +@googleapis//google/monitoring/v3:alert.proto +@googleapis//google/monitoring/v3:alert_service.proto +@googleapis//google/monitoring/v3:common.proto +@googleapis//google/monitoring/v3:dropped_labels.proto +@googleapis//google/monitoring/v3:group.proto +@googleapis//google/monitoring/v3:group_service.proto +@googleapis//google/monitoring/v3:metric.proto +@googleapis//google/monitoring/v3:metric_service.proto +@googleapis//google/monitoring/v3:mutation_record.proto +@googleapis//google/monitoring/v3:notification.proto +@googleapis//google/monitoring/v3:notification_service.proto +@googleapis//google/monitoring/v3:query_service.proto +@googleapis//google/monitoring/v3:service.proto +@googleapis//google/monitoring/v3:service_service.proto +@googleapis//google/monitoring/v3:snooze.proto +@googleapis//google/monitoring/v3:snooze_service.proto +@googleapis//google/monitoring/v3:span_context.proto +@googleapis//google/monitoring/v3:uptime.proto +@googleapis//google/monitoring/v3:uptime_service.proto diff --git a/external/googleapis/protolists/netapp.list b/external/googleapis/protolists/netapp.list index eb290c582022c..c214f59988487 100644 --- a/external/googleapis/protolists/netapp.list +++ b/external/googleapis/protolists/netapp.list @@ -1,12 +1,12 @@ -@com_google_googleapis//google/cloud/netapp/v1:active_directory.proto -@com_google_googleapis//google/cloud/netapp/v1:backup.proto -@com_google_googleapis//google/cloud/netapp/v1:backup_policy.proto -@com_google_googleapis//google/cloud/netapp/v1:backup_vault.proto -@com_google_googleapis//google/cloud/netapp/v1:cloud_netapp_service.proto -@com_google_googleapis//google/cloud/netapp/v1:common.proto -@com_google_googleapis//google/cloud/netapp/v1:kms.proto -@com_google_googleapis//google/cloud/netapp/v1:quota_rule.proto -@com_google_googleapis//google/cloud/netapp/v1:replication.proto -@com_google_googleapis//google/cloud/netapp/v1:snapshot.proto -@com_google_googleapis//google/cloud/netapp/v1:storage_pool.proto -@com_google_googleapis//google/cloud/netapp/v1:volume.proto +@googleapis//google/cloud/netapp/v1:active_directory.proto +@googleapis//google/cloud/netapp/v1:backup.proto +@googleapis//google/cloud/netapp/v1:backup_policy.proto +@googleapis//google/cloud/netapp/v1:backup_vault.proto +@googleapis//google/cloud/netapp/v1:cloud_netapp_service.proto +@googleapis//google/cloud/netapp/v1:common.proto +@googleapis//google/cloud/netapp/v1:kms.proto +@googleapis//google/cloud/netapp/v1:quota_rule.proto +@googleapis//google/cloud/netapp/v1:replication.proto +@googleapis//google/cloud/netapp/v1:snapshot.proto +@googleapis//google/cloud/netapp/v1:storage_pool.proto +@googleapis//google/cloud/netapp/v1:volume.proto diff --git a/external/googleapis/protolists/networkconnectivity.list b/external/googleapis/protolists/networkconnectivity.list index ae27f5c6d90b3..a1edd2a0e982a 100644 --- a/external/googleapis/protolists/networkconnectivity.list +++ b/external/googleapis/protolists/networkconnectivity.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/cloud/networkconnectivity/v1:common.proto -@com_google_googleapis//google/cloud/networkconnectivity/v1:cross_network_automation.proto -@com_google_googleapis//google/cloud/networkconnectivity/v1:data_transfer.proto -@com_google_googleapis//google/cloud/networkconnectivity/v1:hub.proto -@com_google_googleapis//google/cloud/networkconnectivity/v1:internal_range.proto -@com_google_googleapis//google/cloud/networkconnectivity/v1:policy_based_routing.proto +@googleapis//google/cloud/networkconnectivity/v1:common.proto +@googleapis//google/cloud/networkconnectivity/v1:cross_network_automation.proto +@googleapis//google/cloud/networkconnectivity/v1:data_transfer.proto +@googleapis//google/cloud/networkconnectivity/v1:hub.proto +@googleapis//google/cloud/networkconnectivity/v1:internal_range.proto +@googleapis//google/cloud/networkconnectivity/v1:policy_based_routing.proto diff --git a/external/googleapis/protolists/networkmanagement.list b/external/googleapis/protolists/networkmanagement.list index fb9f1ff700015..2ac265aa9d7eb 100644 --- a/external/googleapis/protolists/networkmanagement.list +++ b/external/googleapis/protolists/networkmanagement.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/networkmanagement/v1:connectivity_test.proto -@com_google_googleapis//google/cloud/networkmanagement/v1:reachability.proto -@com_google_googleapis//google/cloud/networkmanagement/v1:trace.proto -@com_google_googleapis//google/cloud/networkmanagement/v1:vpc_flow_logs.proto -@com_google_googleapis//google/cloud/networkmanagement/v1:vpc_flow_logs_config.proto +@googleapis//google/cloud/networkmanagement/v1:connectivity_test.proto +@googleapis//google/cloud/networkmanagement/v1:reachability.proto +@googleapis//google/cloud/networkmanagement/v1:trace.proto +@googleapis//google/cloud/networkmanagement/v1:vpc_flow_logs.proto +@googleapis//google/cloud/networkmanagement/v1:vpc_flow_logs_config.proto diff --git a/external/googleapis/protolists/networksecurity.list b/external/googleapis/protolists/networksecurity.list index 4303002c9cd51..917cc32161b26 100644 --- a/external/googleapis/protolists/networksecurity.list +++ b/external/googleapis/protolists/networksecurity.list @@ -1,7 +1,7 @@ -@com_google_googleapis//google/cloud/networksecurity/v1:address_group.proto -@com_google_googleapis//google/cloud/networksecurity/v1:authorization_policy.proto -@com_google_googleapis//google/cloud/networksecurity/v1:client_tls_policy.proto -@com_google_googleapis//google/cloud/networksecurity/v1:common.proto -@com_google_googleapis//google/cloud/networksecurity/v1:network_security.proto -@com_google_googleapis//google/cloud/networksecurity/v1:server_tls_policy.proto -@com_google_googleapis//google/cloud/networksecurity/v1:tls.proto +@googleapis//google/cloud/networksecurity/v1:address_group.proto +@googleapis//google/cloud/networksecurity/v1:authorization_policy.proto +@googleapis//google/cloud/networksecurity/v1:client_tls_policy.proto +@googleapis//google/cloud/networksecurity/v1:common.proto +@googleapis//google/cloud/networksecurity/v1:network_security.proto +@googleapis//google/cloud/networksecurity/v1:server_tls_policy.proto +@googleapis//google/cloud/networksecurity/v1:tls.proto diff --git a/external/googleapis/protolists/networkservices.list b/external/googleapis/protolists/networkservices.list index b74da16242691..92670c8db8031 100644 --- a/external/googleapis/protolists/networkservices.list +++ b/external/googleapis/protolists/networkservices.list @@ -1,14 +1,14 @@ -@com_google_googleapis//google/cloud/networkservices/v1:common.proto -@com_google_googleapis//google/cloud/networkservices/v1:dep.proto -@com_google_googleapis//google/cloud/networkservices/v1:endpoint_policy.proto -@com_google_googleapis//google/cloud/networkservices/v1:extensibility.proto -@com_google_googleapis//google/cloud/networkservices/v1:gateway.proto -@com_google_googleapis//google/cloud/networkservices/v1:grpc_route.proto -@com_google_googleapis//google/cloud/networkservices/v1:http_route.proto -@com_google_googleapis//google/cloud/networkservices/v1:mesh.proto -@com_google_googleapis//google/cloud/networkservices/v1:network_services.proto -@com_google_googleapis//google/cloud/networkservices/v1:route_view.proto -@com_google_googleapis//google/cloud/networkservices/v1:service_binding.proto -@com_google_googleapis//google/cloud/networkservices/v1:service_lb_policy.proto -@com_google_googleapis//google/cloud/networkservices/v1:tcp_route.proto -@com_google_googleapis//google/cloud/networkservices/v1:tls_route.proto +@googleapis//google/cloud/networkservices/v1:common.proto +@googleapis//google/cloud/networkservices/v1:dep.proto +@googleapis//google/cloud/networkservices/v1:endpoint_policy.proto +@googleapis//google/cloud/networkservices/v1:extensibility.proto +@googleapis//google/cloud/networkservices/v1:gateway.proto +@googleapis//google/cloud/networkservices/v1:grpc_route.proto +@googleapis//google/cloud/networkservices/v1:http_route.proto +@googleapis//google/cloud/networkservices/v1:mesh.proto +@googleapis//google/cloud/networkservices/v1:network_services.proto +@googleapis//google/cloud/networkservices/v1:route_view.proto +@googleapis//google/cloud/networkservices/v1:service_binding.proto +@googleapis//google/cloud/networkservices/v1:service_lb_policy.proto +@googleapis//google/cloud/networkservices/v1:tcp_route.proto +@googleapis//google/cloud/networkservices/v1:tls_route.proto diff --git a/external/googleapis/protolists/notebooks.list b/external/googleapis/protolists/notebooks.list index 4d8373e3848dc..9fb3b4aa7e793 100644 --- a/external/googleapis/protolists/notebooks.list +++ b/external/googleapis/protolists/notebooks.list @@ -1,15 +1,15 @@ -@com_google_googleapis//google/cloud/notebooks/v1:diagnostic_config.proto -@com_google_googleapis//google/cloud/notebooks/v1:environment.proto -@com_google_googleapis//google/cloud/notebooks/v1:event.proto -@com_google_googleapis//google/cloud/notebooks/v1:execution.proto -@com_google_googleapis//google/cloud/notebooks/v1:instance.proto -@com_google_googleapis//google/cloud/notebooks/v1:instance_config.proto -@com_google_googleapis//google/cloud/notebooks/v1:managed_service.proto -@com_google_googleapis//google/cloud/notebooks/v1:runtime.proto -@com_google_googleapis//google/cloud/notebooks/v1:schedule.proto -@com_google_googleapis//google/cloud/notebooks/v1:service.proto -@com_google_googleapis//google/cloud/notebooks/v2:diagnostic_config.proto -@com_google_googleapis//google/cloud/notebooks/v2:event.proto -@com_google_googleapis//google/cloud/notebooks/v2:gce_setup.proto -@com_google_googleapis//google/cloud/notebooks/v2:instance.proto -@com_google_googleapis//google/cloud/notebooks/v2:service.proto +@googleapis//google/cloud/notebooks/v1:diagnostic_config.proto +@googleapis//google/cloud/notebooks/v1:environment.proto +@googleapis//google/cloud/notebooks/v1:event.proto +@googleapis//google/cloud/notebooks/v1:execution.proto +@googleapis//google/cloud/notebooks/v1:instance.proto +@googleapis//google/cloud/notebooks/v1:instance_config.proto +@googleapis//google/cloud/notebooks/v1:managed_service.proto +@googleapis//google/cloud/notebooks/v1:runtime.proto +@googleapis//google/cloud/notebooks/v1:schedule.proto +@googleapis//google/cloud/notebooks/v1:service.proto +@googleapis//google/cloud/notebooks/v2:diagnostic_config.proto +@googleapis//google/cloud/notebooks/v2:event.proto +@googleapis//google/cloud/notebooks/v2:gce_setup.proto +@googleapis//google/cloud/notebooks/v2:instance.proto +@googleapis//google/cloud/notebooks/v2:service.proto diff --git a/external/googleapis/protolists/optimization.list b/external/googleapis/protolists/optimization.list index cede1e4935509..99c814ce70592 100644 --- a/external/googleapis/protolists/optimization.list +++ b/external/googleapis/protolists/optimization.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/optimization/v1:async_model.proto -@com_google_googleapis//google/cloud/optimization/v1:fleet_routing.proto +@googleapis//google/cloud/optimization/v1:async_model.proto +@googleapis//google/cloud/optimization/v1:fleet_routing.proto diff --git a/external/googleapis/protolists/oracledatabase.list b/external/googleapis/protolists/oracledatabase.list index 4ab863e29dead..b2175edf2ace3 100644 --- a/external/googleapis/protolists/oracledatabase.list +++ b/external/googleapis/protolists/oracledatabase.list @@ -1,25 +1,25 @@ -@com_google_googleapis//google/cloud/oracledatabase/v1:autonomous_database.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:autonomous_database_character_set.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:autonomous_db_backup.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:autonomous_db_version.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:common.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:database.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:database_character_set.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:db_node.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:db_server.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:db_system.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:db_system_initial_storage_size.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:db_system_shape.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:db_version.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:entitlement.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:exadata_infra.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:exadb_vm_cluster.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:exascale_db_storage_vault.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:gi_version.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:location_metadata.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:minor_version.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:odb_network.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:odb_subnet.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:oracledatabase.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:pluggable_database.proto -@com_google_googleapis//google/cloud/oracledatabase/v1:vm_cluster.proto +@googleapis//google/cloud/oracledatabase/v1:autonomous_database.proto +@googleapis//google/cloud/oracledatabase/v1:autonomous_database_character_set.proto +@googleapis//google/cloud/oracledatabase/v1:autonomous_db_backup.proto +@googleapis//google/cloud/oracledatabase/v1:autonomous_db_version.proto +@googleapis//google/cloud/oracledatabase/v1:common.proto +@googleapis//google/cloud/oracledatabase/v1:database.proto +@googleapis//google/cloud/oracledatabase/v1:database_character_set.proto +@googleapis//google/cloud/oracledatabase/v1:db_node.proto +@googleapis//google/cloud/oracledatabase/v1:db_server.proto +@googleapis//google/cloud/oracledatabase/v1:db_system.proto +@googleapis//google/cloud/oracledatabase/v1:db_system_initial_storage_size.proto +@googleapis//google/cloud/oracledatabase/v1:db_system_shape.proto +@googleapis//google/cloud/oracledatabase/v1:db_version.proto +@googleapis//google/cloud/oracledatabase/v1:entitlement.proto +@googleapis//google/cloud/oracledatabase/v1:exadata_infra.proto +@googleapis//google/cloud/oracledatabase/v1:exadb_vm_cluster.proto +@googleapis//google/cloud/oracledatabase/v1:exascale_db_storage_vault.proto +@googleapis//google/cloud/oracledatabase/v1:gi_version.proto +@googleapis//google/cloud/oracledatabase/v1:location_metadata.proto +@googleapis//google/cloud/oracledatabase/v1:minor_version.proto +@googleapis//google/cloud/oracledatabase/v1:odb_network.proto +@googleapis//google/cloud/oracledatabase/v1:odb_subnet.proto +@googleapis//google/cloud/oracledatabase/v1:oracledatabase.proto +@googleapis//google/cloud/oracledatabase/v1:pluggable_database.proto +@googleapis//google/cloud/oracledatabase/v1:vm_cluster.proto diff --git a/external/googleapis/protolists/orgpolicy.list b/external/googleapis/protolists/orgpolicy.list index d817d0f1df97a..d635a01563a49 100644 --- a/external/googleapis/protolists/orgpolicy.list +++ b/external/googleapis/protolists/orgpolicy.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/orgpolicy/v2:constraint.proto -@com_google_googleapis//google/cloud/orgpolicy/v2:orgpolicy.proto +@googleapis//google/cloud/orgpolicy/v2:constraint.proto +@googleapis//google/cloud/orgpolicy/v2:orgpolicy.proto diff --git a/external/googleapis/protolists/osconfig.list b/external/googleapis/protolists/osconfig.list index f5eeb05afd294..97685bee903a2 100644 --- a/external/googleapis/protolists/osconfig.list +++ b/external/googleapis/protolists/osconfig.list @@ -1,16 +1,16 @@ -@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:agentendpoint.proto -@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:config_common.proto -@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:inventory.proto -@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:os_policy.proto -@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:patch_jobs.proto -@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:tasks.proto -@com_google_googleapis//google/cloud/osconfig/v1:inventory.proto -@com_google_googleapis//google/cloud/osconfig/v1:os_policy.proto -@com_google_googleapis//google/cloud/osconfig/v1:os_policy_assignment_reports.proto -@com_google_googleapis//google/cloud/osconfig/v1:os_policy_assignments.proto -@com_google_googleapis//google/cloud/osconfig/v1:osconfig_common.proto -@com_google_googleapis//google/cloud/osconfig/v1:osconfig_service.proto -@com_google_googleapis//google/cloud/osconfig/v1:osconfig_zonal_service.proto -@com_google_googleapis//google/cloud/osconfig/v1:patch_deployments.proto -@com_google_googleapis//google/cloud/osconfig/v1:patch_jobs.proto -@com_google_googleapis//google/cloud/osconfig/v1:vulnerability.proto +@googleapis//google/cloud/osconfig/agentendpoint/v1:agentendpoint.proto +@googleapis//google/cloud/osconfig/agentendpoint/v1:config_common.proto +@googleapis//google/cloud/osconfig/agentendpoint/v1:inventory.proto +@googleapis//google/cloud/osconfig/agentendpoint/v1:os_policy.proto +@googleapis//google/cloud/osconfig/agentendpoint/v1:patch_jobs.proto +@googleapis//google/cloud/osconfig/agentendpoint/v1:tasks.proto +@googleapis//google/cloud/osconfig/v1:inventory.proto +@googleapis//google/cloud/osconfig/v1:os_policy.proto +@googleapis//google/cloud/osconfig/v1:os_policy_assignment_reports.proto +@googleapis//google/cloud/osconfig/v1:os_policy_assignments.proto +@googleapis//google/cloud/osconfig/v1:osconfig_common.proto +@googleapis//google/cloud/osconfig/v1:osconfig_service.proto +@googleapis//google/cloud/osconfig/v1:osconfig_zonal_service.proto +@googleapis//google/cloud/osconfig/v1:patch_deployments.proto +@googleapis//google/cloud/osconfig/v1:patch_jobs.proto +@googleapis//google/cloud/osconfig/v1:vulnerability.proto diff --git a/external/googleapis/protolists/oslogin.list b/external/googleapis/protolists/oslogin.list index 17d4b36451e60..65132fc0a09eb 100644 --- a/external/googleapis/protolists/oslogin.list +++ b/external/googleapis/protolists/oslogin.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/oslogin/common:common.proto -@com_google_googleapis//google/cloud/oslogin/v1:oslogin.proto +@googleapis//google/cloud/oslogin/common:common.proto +@googleapis//google/cloud/oslogin/v1:oslogin.proto diff --git a/external/googleapis/protolists/parallelstore.list b/external/googleapis/protolists/parallelstore.list index f2bba8e97dc84..3db79b6e13a1e 100644 --- a/external/googleapis/protolists/parallelstore.list +++ b/external/googleapis/protolists/parallelstore.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/parallelstore/v1:parallelstore.proto +@googleapis//google/cloud/parallelstore/v1:parallelstore.proto diff --git a/external/googleapis/protolists/parametermanager.list b/external/googleapis/protolists/parametermanager.list index 1667aadb7cd15..897b0def96d3f 100644 --- a/external/googleapis/protolists/parametermanager.list +++ b/external/googleapis/protolists/parametermanager.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/parametermanager/v1:service.proto +@googleapis//google/cloud/parametermanager/v1:service.proto diff --git a/external/googleapis/protolists/policysimulator.list b/external/googleapis/protolists/policysimulator.list index b142102b80ac5..5a1fecd4689a6 100644 --- a/external/googleapis/protolists/policysimulator.list +++ b/external/googleapis/protolists/policysimulator.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/policysimulator/v1:explanations.proto -@com_google_googleapis//google/cloud/policysimulator/v1:orgpolicy.proto -@com_google_googleapis//google/cloud/policysimulator/v1:simulator.proto +@googleapis//google/cloud/policysimulator/v1:explanations.proto +@googleapis//google/cloud/policysimulator/v1:orgpolicy.proto +@googleapis//google/cloud/policysimulator/v1:simulator.proto diff --git a/external/googleapis/protolists/policytroubleshooter.list b/external/googleapis/protolists/policytroubleshooter.list index d1eee16bdb7a6..f1069d1a0fc09 100644 --- a/external/googleapis/protolists/policytroubleshooter.list +++ b/external/googleapis/protolists/policytroubleshooter.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/policytroubleshooter/iam/v3:troubleshooter.proto -@com_google_googleapis//google/cloud/policytroubleshooter/v1:checker.proto -@com_google_googleapis//google/cloud/policytroubleshooter/v1:explanations.proto +@googleapis//google/cloud/policytroubleshooter/iam/v3:troubleshooter.proto +@googleapis//google/cloud/policytroubleshooter/v1:checker.proto +@googleapis//google/cloud/policytroubleshooter/v1:explanations.proto diff --git a/external/googleapis/protolists/privateca.list b/external/googleapis/protolists/privateca.list index daecfec413538..a98563539c742 100644 --- a/external/googleapis/protolists/privateca.list +++ b/external/googleapis/protolists/privateca.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/security/privateca/v1:resources.proto -@com_google_googleapis//google/cloud/security/privateca/v1:service.proto +@googleapis//google/cloud/security/privateca/v1:resources.proto +@googleapis//google/cloud/security/privateca/v1:service.proto diff --git a/external/googleapis/protolists/privilegedaccessmanager.list b/external/googleapis/protolists/privilegedaccessmanager.list index a62ebaa12a002..7d87db5e5f273 100644 --- a/external/googleapis/protolists/privilegedaccessmanager.list +++ b/external/googleapis/protolists/privilegedaccessmanager.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/privilegedaccessmanager/v1:privilegedaccessmanager.proto +@googleapis//google/cloud/privilegedaccessmanager/v1:privilegedaccessmanager.proto diff --git a/external/googleapis/protolists/profiler.list b/external/googleapis/protolists/profiler.list index 890099f603643..bcb4aa7fad9df 100644 --- a/external/googleapis/protolists/profiler.list +++ b/external/googleapis/protolists/profiler.list @@ -1 +1 @@ -@com_google_googleapis//google/devtools/cloudprofiler/v2:profiler.proto +@googleapis//google/devtools/cloudprofiler/v2:profiler.proto diff --git a/external/googleapis/protolists/publicca.list b/external/googleapis/protolists/publicca.list index ef80cc31777a5..26d3fcece6206 100644 --- a/external/googleapis/protolists/publicca.list +++ b/external/googleapis/protolists/publicca.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/security/publicca/v1:resources.proto -@com_google_googleapis//google/cloud/security/publicca/v1:service.proto +@googleapis//google/cloud/security/publicca/v1:resources.proto +@googleapis//google/cloud/security/publicca/v1:service.proto diff --git a/external/googleapis/protolists/pubsub.list b/external/googleapis/protolists/pubsub.list index 613ad8287ac85..b87f07346559e 100644 --- a/external/googleapis/protolists/pubsub.list +++ b/external/googleapis/protolists/pubsub.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/pubsub/v1:pubsub.proto -@com_google_googleapis//google/pubsub/v1:schema.proto +@googleapis//google/pubsub/v1:pubsub.proto +@googleapis//google/pubsub/v1:schema.proto diff --git a/external/googleapis/protolists/pubsublite.list b/external/googleapis/protolists/pubsublite.list index 432660ba52f1a..12e8c33cbd52b 100644 --- a/external/googleapis/protolists/pubsublite.list +++ b/external/googleapis/protolists/pubsublite.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/cloud/pubsublite/v1:admin.proto -@com_google_googleapis//google/cloud/pubsublite/v1:common.proto -@com_google_googleapis//google/cloud/pubsublite/v1:cursor.proto -@com_google_googleapis//google/cloud/pubsublite/v1:publisher.proto -@com_google_googleapis//google/cloud/pubsublite/v1:subscriber.proto -@com_google_googleapis//google/cloud/pubsublite/v1:topic_stats.proto +@googleapis//google/cloud/pubsublite/v1:admin.proto +@googleapis//google/cloud/pubsublite/v1:common.proto +@googleapis//google/cloud/pubsublite/v1:cursor.proto +@googleapis//google/cloud/pubsublite/v1:publisher.proto +@googleapis//google/cloud/pubsublite/v1:subscriber.proto +@googleapis//google/cloud/pubsublite/v1:topic_stats.proto diff --git a/external/googleapis/protolists/rapidmigrationassessment.list b/external/googleapis/protolists/rapidmigrationassessment.list index 381b0b6cea239..172e900b5a555 100644 --- a/external/googleapis/protolists/rapidmigrationassessment.list +++ b/external/googleapis/protolists/rapidmigrationassessment.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/rapidmigrationassessment/v1:api_entities.proto -@com_google_googleapis//google/cloud/rapidmigrationassessment/v1:rapidmigrationassessment.proto +@googleapis//google/cloud/rapidmigrationassessment/v1:api_entities.proto +@googleapis//google/cloud/rapidmigrationassessment/v1:rapidmigrationassessment.proto diff --git a/external/googleapis/protolists/recaptchaenterprise.list b/external/googleapis/protolists/recaptchaenterprise.list index 29a1d833e7a85..5f891628c92bc 100644 --- a/external/googleapis/protolists/recaptchaenterprise.list +++ b/external/googleapis/protolists/recaptchaenterprise.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/recaptchaenterprise/v1:recaptchaenterprise.proto +@googleapis//google/cloud/recaptchaenterprise/v1:recaptchaenterprise.proto diff --git a/external/googleapis/protolists/recommender.list b/external/googleapis/protolists/recommender.list index 26eec6bcc5fa1..28e011f336ff9 100644 --- a/external/googleapis/protolists/recommender.list +++ b/external/googleapis/protolists/recommender.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/cloud/recommender/logging/v1:action_log.proto -@com_google_googleapis//google/cloud/recommender/v1:insight.proto -@com_google_googleapis//google/cloud/recommender/v1:insight_type_config.proto -@com_google_googleapis//google/cloud/recommender/v1:recommendation.proto -@com_google_googleapis//google/cloud/recommender/v1:recommender_config.proto -@com_google_googleapis//google/cloud/recommender/v1:recommender_service.proto +@googleapis//google/cloud/recommender/logging/v1:action_log.proto +@googleapis//google/cloud/recommender/v1:insight.proto +@googleapis//google/cloud/recommender/v1:insight_type_config.proto +@googleapis//google/cloud/recommender/v1:recommendation.proto +@googleapis//google/cloud/recommender/v1:recommender_config.proto +@googleapis//google/cloud/recommender/v1:recommender_service.proto diff --git a/external/googleapis/protolists/redis.list b/external/googleapis/protolists/redis.list index 4586e2a40350b..84cb8152dd6d7 100644 --- a/external/googleapis/protolists/redis.list +++ b/external/googleapis/protolists/redis.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/redis/cluster/v1:cloud_redis_cluster.proto -@com_google_googleapis//google/cloud/redis/v1:cloud_redis.proto +@googleapis//google/cloud/redis/cluster/v1:cloud_redis_cluster.proto +@googleapis//google/cloud/redis/v1:cloud_redis.proto diff --git a/external/googleapis/protolists/resourcemanager.list b/external/googleapis/protolists/resourcemanager.list index 60f81aa13deb3..1b773586eb59b 100644 --- a/external/googleapis/protolists/resourcemanager.list +++ b/external/googleapis/protolists/resourcemanager.list @@ -1,7 +1,7 @@ -@com_google_googleapis//google/cloud/resourcemanager/v3:folders.proto -@com_google_googleapis//google/cloud/resourcemanager/v3:organizations.proto -@com_google_googleapis//google/cloud/resourcemanager/v3:projects.proto -@com_google_googleapis//google/cloud/resourcemanager/v3:tag_bindings.proto -@com_google_googleapis//google/cloud/resourcemanager/v3:tag_holds.proto -@com_google_googleapis//google/cloud/resourcemanager/v3:tag_keys.proto -@com_google_googleapis//google/cloud/resourcemanager/v3:tag_values.proto +@googleapis//google/cloud/resourcemanager/v3:folders.proto +@googleapis//google/cloud/resourcemanager/v3:organizations.proto +@googleapis//google/cloud/resourcemanager/v3:projects.proto +@googleapis//google/cloud/resourcemanager/v3:tag_bindings.proto +@googleapis//google/cloud/resourcemanager/v3:tag_holds.proto +@googleapis//google/cloud/resourcemanager/v3:tag_keys.proto +@googleapis//google/cloud/resourcemanager/v3:tag_values.proto diff --git a/external/googleapis/protolists/retail.list b/external/googleapis/protolists/retail.list index 58372766eea06..e3fe13ffb2a5e 100644 --- a/external/googleapis/protolists/retail.list +++ b/external/googleapis/protolists/retail.list @@ -1,25 +1,25 @@ -@com_google_googleapis//google/cloud/retail/v2:analytics_service.proto -@com_google_googleapis//google/cloud/retail/v2:catalog.proto -@com_google_googleapis//google/cloud/retail/v2:catalog_service.proto -@com_google_googleapis//google/cloud/retail/v2:common.proto -@com_google_googleapis//google/cloud/retail/v2:completion_service.proto -@com_google_googleapis//google/cloud/retail/v2:control.proto -@com_google_googleapis//google/cloud/retail/v2:control_service.proto -@com_google_googleapis//google/cloud/retail/v2:conversational_search_service.proto -@com_google_googleapis//google/cloud/retail/v2:export_config.proto -@com_google_googleapis//google/cloud/retail/v2:generative_question.proto -@com_google_googleapis//google/cloud/retail/v2:generative_question_service.proto -@com_google_googleapis//google/cloud/retail/v2:import_config.proto -@com_google_googleapis//google/cloud/retail/v2:model.proto -@com_google_googleapis//google/cloud/retail/v2:model_service.proto -@com_google_googleapis//google/cloud/retail/v2:prediction_service.proto -@com_google_googleapis//google/cloud/retail/v2:product.proto -@com_google_googleapis//google/cloud/retail/v2:product_service.proto -@com_google_googleapis//google/cloud/retail/v2:promotion.proto -@com_google_googleapis//google/cloud/retail/v2:purge_config.proto -@com_google_googleapis//google/cloud/retail/v2:safety.proto -@com_google_googleapis//google/cloud/retail/v2:search_service.proto -@com_google_googleapis//google/cloud/retail/v2:serving_config.proto -@com_google_googleapis//google/cloud/retail/v2:serving_config_service.proto -@com_google_googleapis//google/cloud/retail/v2:user_event.proto -@com_google_googleapis//google/cloud/retail/v2:user_event_service.proto +@googleapis//google/cloud/retail/v2:analytics_service.proto +@googleapis//google/cloud/retail/v2:catalog.proto +@googleapis//google/cloud/retail/v2:catalog_service.proto +@googleapis//google/cloud/retail/v2:common.proto +@googleapis//google/cloud/retail/v2:completion_service.proto +@googleapis//google/cloud/retail/v2:control.proto +@googleapis//google/cloud/retail/v2:control_service.proto +@googleapis//google/cloud/retail/v2:conversational_search_service.proto +@googleapis//google/cloud/retail/v2:export_config.proto +@googleapis//google/cloud/retail/v2:generative_question.proto +@googleapis//google/cloud/retail/v2:generative_question_service.proto +@googleapis//google/cloud/retail/v2:import_config.proto +@googleapis//google/cloud/retail/v2:model.proto +@googleapis//google/cloud/retail/v2:model_service.proto +@googleapis//google/cloud/retail/v2:prediction_service.proto +@googleapis//google/cloud/retail/v2:product.proto +@googleapis//google/cloud/retail/v2:product_service.proto +@googleapis//google/cloud/retail/v2:promotion.proto +@googleapis//google/cloud/retail/v2:purge_config.proto +@googleapis//google/cloud/retail/v2:safety.proto +@googleapis//google/cloud/retail/v2:search_service.proto +@googleapis//google/cloud/retail/v2:serving_config.proto +@googleapis//google/cloud/retail/v2:serving_config_service.proto +@googleapis//google/cloud/retail/v2:user_event.proto +@googleapis//google/cloud/retail/v2:user_event_service.proto diff --git a/external/googleapis/protolists/run.list b/external/googleapis/protolists/run.list index 6714ed45253b4..c5db1c5575aa7 100644 --- a/external/googleapis/protolists/run.list +++ b/external/googleapis/protolists/run.list @@ -1,17 +1,17 @@ -@com_google_googleapis//google/cloud/run/v2:build.proto -@com_google_googleapis//google/cloud/run/v2:condition.proto -@com_google_googleapis//google/cloud/run/v2:execution.proto -@com_google_googleapis//google/cloud/run/v2:execution_template.proto -@com_google_googleapis//google/cloud/run/v2:instance_split.proto -@com_google_googleapis//google/cloud/run/v2:job.proto -@com_google_googleapis//google/cloud/run/v2:k8s.min.proto -@com_google_googleapis//google/cloud/run/v2:revision.proto -@com_google_googleapis//google/cloud/run/v2:revision_template.proto -@com_google_googleapis//google/cloud/run/v2:service.proto -@com_google_googleapis//google/cloud/run/v2:status.proto -@com_google_googleapis//google/cloud/run/v2:task.proto -@com_google_googleapis//google/cloud/run/v2:task_template.proto -@com_google_googleapis//google/cloud/run/v2:traffic_target.proto -@com_google_googleapis//google/cloud/run/v2:vendor_settings.proto -@com_google_googleapis//google/cloud/run/v2:worker_pool.proto -@com_google_googleapis//google/cloud/run/v2:worker_pool_revision_template.proto +@googleapis//google/cloud/run/v2:build.proto +@googleapis//google/cloud/run/v2:condition.proto +@googleapis//google/cloud/run/v2:execution.proto +@googleapis//google/cloud/run/v2:execution_template.proto +@googleapis//google/cloud/run/v2:instance_split.proto +@googleapis//google/cloud/run/v2:job.proto +@googleapis//google/cloud/run/v2:k8s.min.proto +@googleapis//google/cloud/run/v2:revision.proto +@googleapis//google/cloud/run/v2:revision_template.proto +@googleapis//google/cloud/run/v2:service.proto +@googleapis//google/cloud/run/v2:status.proto +@googleapis//google/cloud/run/v2:task.proto +@googleapis//google/cloud/run/v2:task_template.proto +@googleapis//google/cloud/run/v2:traffic_target.proto +@googleapis//google/cloud/run/v2:vendor_settings.proto +@googleapis//google/cloud/run/v2:worker_pool.proto +@googleapis//google/cloud/run/v2:worker_pool_revision_template.proto diff --git a/external/googleapis/protolists/scheduler.list b/external/googleapis/protolists/scheduler.list index 9e9a8cfd27a51..c2ece6488eb77 100644 --- a/external/googleapis/protolists/scheduler.list +++ b/external/googleapis/protolists/scheduler.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/scheduler/v1:cloudscheduler.proto -@com_google_googleapis//google/cloud/scheduler/v1:job.proto -@com_google_googleapis//google/cloud/scheduler/v1:target.proto +@googleapis//google/cloud/scheduler/v1:cloudscheduler.proto +@googleapis//google/cloud/scheduler/v1:job.proto +@googleapis//google/cloud/scheduler/v1:target.proto diff --git a/external/googleapis/protolists/secretmanager.list b/external/googleapis/protolists/secretmanager.list index 5837622371b8e..eef868e48221c 100644 --- a/external/googleapis/protolists/secretmanager.list +++ b/external/googleapis/protolists/secretmanager.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/secretmanager/logging/v1:secret_event.proto -@com_google_googleapis//google/cloud/secretmanager/v1:resources.proto -@com_google_googleapis//google/cloud/secretmanager/v1:service.proto +@googleapis//google/cloud/secretmanager/logging/v1:secret_event.proto +@googleapis//google/cloud/secretmanager/v1:resources.proto +@googleapis//google/cloud/secretmanager/v1:service.proto diff --git a/external/googleapis/protolists/securesourcemanager.list b/external/googleapis/protolists/securesourcemanager.list index fe6a032f39e7a..79260e37a6055 100644 --- a/external/googleapis/protolists/securesourcemanager.list +++ b/external/googleapis/protolists/securesourcemanager.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/securesourcemanager/v1:secure_source_manager.proto +@googleapis//google/cloud/securesourcemanager/v1:secure_source_manager.proto diff --git a/external/googleapis/protolists/securitycenter.list b/external/googleapis/protolists/securitycenter.list index bca33514fa290..f40643817ce87 100644 --- a/external/googleapis/protolists/securitycenter.list +++ b/external/googleapis/protolists/securitycenter.list @@ -1,108 +1,108 @@ -@com_google_googleapis//google/cloud/securitycenter/v1:access.proto -@com_google_googleapis//google/cloud/securitycenter/v1:application.proto -@com_google_googleapis//google/cloud/securitycenter/v1:asset.proto -@com_google_googleapis//google/cloud/securitycenter/v1:attack_exposure.proto -@com_google_googleapis//google/cloud/securitycenter/v1:attack_path.proto -@com_google_googleapis//google/cloud/securitycenter/v1:backup_disaster_recovery.proto -@com_google_googleapis//google/cloud/securitycenter/v1:bigquery_export.proto -@com_google_googleapis//google/cloud/securitycenter/v1:cloud_armor.proto -@com_google_googleapis//google/cloud/securitycenter/v1:cloud_dlp_data_profile.proto -@com_google_googleapis//google/cloud/securitycenter/v1:cloud_dlp_inspection.proto -@com_google_googleapis//google/cloud/securitycenter/v1:compliance.proto -@com_google_googleapis//google/cloud/securitycenter/v1:connection.proto -@com_google_googleapis//google/cloud/securitycenter/v1:contact_details.proto -@com_google_googleapis//google/cloud/securitycenter/v1:container.proto -@com_google_googleapis//google/cloud/securitycenter/v1:database.proto -@com_google_googleapis//google/cloud/securitycenter/v1:effective_event_threat_detection_custom_module.proto -@com_google_googleapis//google/cloud/securitycenter/v1:effective_security_health_analytics_custom_module.proto -@com_google_googleapis//google/cloud/securitycenter/v1:event_threat_detection_custom_module.proto -@com_google_googleapis//google/cloud/securitycenter/v1:event_threat_detection_custom_module_validation_errors.proto -@com_google_googleapis//google/cloud/securitycenter/v1:exfiltration.proto -@com_google_googleapis//google/cloud/securitycenter/v1:external_system.proto -@com_google_googleapis//google/cloud/securitycenter/v1:file.proto -@com_google_googleapis//google/cloud/securitycenter/v1:finding.proto -@com_google_googleapis//google/cloud/securitycenter/v1:folder.proto -@com_google_googleapis//google/cloud/securitycenter/v1:group_membership.proto -@com_google_googleapis//google/cloud/securitycenter/v1:iam_binding.proto -@com_google_googleapis//google/cloud/securitycenter/v1:indicator.proto -@com_google_googleapis//google/cloud/securitycenter/v1:kernel_rootkit.proto -@com_google_googleapis//google/cloud/securitycenter/v1:kubernetes.proto -@com_google_googleapis//google/cloud/securitycenter/v1:label.proto -@com_google_googleapis//google/cloud/securitycenter/v1:load_balancer.proto -@com_google_googleapis//google/cloud/securitycenter/v1:log_entry.proto -@com_google_googleapis//google/cloud/securitycenter/v1:mitre_attack.proto -@com_google_googleapis//google/cloud/securitycenter/v1:mute_config.proto -@com_google_googleapis//google/cloud/securitycenter/v1:notebook.proto -@com_google_googleapis//google/cloud/securitycenter/v1:notification_config.proto -@com_google_googleapis//google/cloud/securitycenter/v1:notification_message.proto -@com_google_googleapis//google/cloud/securitycenter/v1:org_policy.proto -@com_google_googleapis//google/cloud/securitycenter/v1:organization_settings.proto -@com_google_googleapis//google/cloud/securitycenter/v1:process.proto -@com_google_googleapis//google/cloud/securitycenter/v1:resource.proto -@com_google_googleapis//google/cloud/securitycenter/v1:resource_value_config.proto -@com_google_googleapis//google/cloud/securitycenter/v1:run_asset_discovery_response.proto -@com_google_googleapis//google/cloud/securitycenter/v1:security_health_analytics_custom_config.proto -@com_google_googleapis//google/cloud/securitycenter/v1:security_health_analytics_custom_module.proto -@com_google_googleapis//google/cloud/securitycenter/v1:security_marks.proto -@com_google_googleapis//google/cloud/securitycenter/v1:security_posture.proto -@com_google_googleapis//google/cloud/securitycenter/v1:securitycenter_service.proto -@com_google_googleapis//google/cloud/securitycenter/v1:simulation.proto -@com_google_googleapis//google/cloud/securitycenter/v1:source.proto -@com_google_googleapis//google/cloud/securitycenter/v1:toxic_combination.proto -@com_google_googleapis//google/cloud/securitycenter/v1:valued_resource.proto -@com_google_googleapis//google/cloud/securitycenter/v1:vulnerability.proto -@com_google_googleapis//google/cloud/securitycenter/v2:access.proto -@com_google_googleapis//google/cloud/securitycenter/v2:affected_resources.proto -@com_google_googleapis//google/cloud/securitycenter/v2:ai_model.proto -@com_google_googleapis//google/cloud/securitycenter/v2:application.proto -@com_google_googleapis//google/cloud/securitycenter/v2:attack_exposure.proto -@com_google_googleapis//google/cloud/securitycenter/v2:attack_path.proto -@com_google_googleapis//google/cloud/securitycenter/v2:backup_disaster_recovery.proto -@com_google_googleapis//google/cloud/securitycenter/v2:bigquery_export.proto -@com_google_googleapis//google/cloud/securitycenter/v2:chokepoint.proto -@com_google_googleapis//google/cloud/securitycenter/v2:cloud_armor.proto -@com_google_googleapis//google/cloud/securitycenter/v2:cloud_dlp_data_profile.proto -@com_google_googleapis//google/cloud/securitycenter/v2:cloud_dlp_inspection.proto -@com_google_googleapis//google/cloud/securitycenter/v2:compliance.proto -@com_google_googleapis//google/cloud/securitycenter/v2:connection.proto -@com_google_googleapis//google/cloud/securitycenter/v2:contact_details.proto -@com_google_googleapis//google/cloud/securitycenter/v2:container.proto -@com_google_googleapis//google/cloud/securitycenter/v2:data_access_event.proto -@com_google_googleapis//google/cloud/securitycenter/v2:data_flow_event.proto -@com_google_googleapis//google/cloud/securitycenter/v2:data_retention_deletion_event.proto -@com_google_googleapis//google/cloud/securitycenter/v2:database.proto -@com_google_googleapis//google/cloud/securitycenter/v2:disk.proto -@com_google_googleapis//google/cloud/securitycenter/v2:exfiltration.proto -@com_google_googleapis//google/cloud/securitycenter/v2:external_system.proto -@com_google_googleapis//google/cloud/securitycenter/v2:file.proto -@com_google_googleapis//google/cloud/securitycenter/v2:finding.proto -@com_google_googleapis//google/cloud/securitycenter/v2:folder.proto -@com_google_googleapis//google/cloud/securitycenter/v2:group_membership.proto -@com_google_googleapis//google/cloud/securitycenter/v2:iam_binding.proto -@com_google_googleapis//google/cloud/securitycenter/v2:indicator.proto -@com_google_googleapis//google/cloud/securitycenter/v2:ip_rules.proto -@com_google_googleapis//google/cloud/securitycenter/v2:job.proto -@com_google_googleapis//google/cloud/securitycenter/v2:kernel_rootkit.proto -@com_google_googleapis//google/cloud/securitycenter/v2:kubernetes.proto -@com_google_googleapis//google/cloud/securitycenter/v2:label.proto -@com_google_googleapis//google/cloud/securitycenter/v2:load_balancer.proto -@com_google_googleapis//google/cloud/securitycenter/v2:log_entry.proto -@com_google_googleapis//google/cloud/securitycenter/v2:mitre_attack.proto -@com_google_googleapis//google/cloud/securitycenter/v2:mute_config.proto -@com_google_googleapis//google/cloud/securitycenter/v2:network.proto -@com_google_googleapis//google/cloud/securitycenter/v2:notebook.proto -@com_google_googleapis//google/cloud/securitycenter/v2:notification_config.proto -@com_google_googleapis//google/cloud/securitycenter/v2:notification_message.proto -@com_google_googleapis//google/cloud/securitycenter/v2:org_policy.proto -@com_google_googleapis//google/cloud/securitycenter/v2:process.proto -@com_google_googleapis//google/cloud/securitycenter/v2:resource.proto -@com_google_googleapis//google/cloud/securitycenter/v2:resource_value_config.proto -@com_google_googleapis//google/cloud/securitycenter/v2:security_marks.proto -@com_google_googleapis//google/cloud/securitycenter/v2:security_posture.proto -@com_google_googleapis//google/cloud/securitycenter/v2:securitycenter_service.proto -@com_google_googleapis//google/cloud/securitycenter/v2:simulation.proto -@com_google_googleapis//google/cloud/securitycenter/v2:source.proto -@com_google_googleapis//google/cloud/securitycenter/v2:toxic_combination.proto -@com_google_googleapis//google/cloud/securitycenter/v2:valued_resource.proto -@com_google_googleapis//google/cloud/securitycenter/v2:vertex_ai.proto -@com_google_googleapis//google/cloud/securitycenter/v2:vulnerability.proto +@googleapis//google/cloud/securitycenter/v1:access.proto +@googleapis//google/cloud/securitycenter/v1:application.proto +@googleapis//google/cloud/securitycenter/v1:asset.proto +@googleapis//google/cloud/securitycenter/v1:attack_exposure.proto +@googleapis//google/cloud/securitycenter/v1:attack_path.proto +@googleapis//google/cloud/securitycenter/v1:backup_disaster_recovery.proto +@googleapis//google/cloud/securitycenter/v1:bigquery_export.proto +@googleapis//google/cloud/securitycenter/v1:cloud_armor.proto +@googleapis//google/cloud/securitycenter/v1:cloud_dlp_data_profile.proto +@googleapis//google/cloud/securitycenter/v1:cloud_dlp_inspection.proto +@googleapis//google/cloud/securitycenter/v1:compliance.proto +@googleapis//google/cloud/securitycenter/v1:connection.proto +@googleapis//google/cloud/securitycenter/v1:contact_details.proto +@googleapis//google/cloud/securitycenter/v1:container.proto +@googleapis//google/cloud/securitycenter/v1:database.proto +@googleapis//google/cloud/securitycenter/v1:effective_event_threat_detection_custom_module.proto +@googleapis//google/cloud/securitycenter/v1:effective_security_health_analytics_custom_module.proto +@googleapis//google/cloud/securitycenter/v1:event_threat_detection_custom_module.proto +@googleapis//google/cloud/securitycenter/v1:event_threat_detection_custom_module_validation_errors.proto +@googleapis//google/cloud/securitycenter/v1:exfiltration.proto +@googleapis//google/cloud/securitycenter/v1:external_system.proto +@googleapis//google/cloud/securitycenter/v1:file.proto +@googleapis//google/cloud/securitycenter/v1:finding.proto +@googleapis//google/cloud/securitycenter/v1:folder.proto +@googleapis//google/cloud/securitycenter/v1:group_membership.proto +@googleapis//google/cloud/securitycenter/v1:iam_binding.proto +@googleapis//google/cloud/securitycenter/v1:indicator.proto +@googleapis//google/cloud/securitycenter/v1:kernel_rootkit.proto +@googleapis//google/cloud/securitycenter/v1:kubernetes.proto +@googleapis//google/cloud/securitycenter/v1:label.proto +@googleapis//google/cloud/securitycenter/v1:load_balancer.proto +@googleapis//google/cloud/securitycenter/v1:log_entry.proto +@googleapis//google/cloud/securitycenter/v1:mitre_attack.proto +@googleapis//google/cloud/securitycenter/v1:mute_config.proto +@googleapis//google/cloud/securitycenter/v1:notebook.proto +@googleapis//google/cloud/securitycenter/v1:notification_config.proto +@googleapis//google/cloud/securitycenter/v1:notification_message.proto +@googleapis//google/cloud/securitycenter/v1:org_policy.proto +@googleapis//google/cloud/securitycenter/v1:organization_settings.proto +@googleapis//google/cloud/securitycenter/v1:process.proto +@googleapis//google/cloud/securitycenter/v1:resource.proto +@googleapis//google/cloud/securitycenter/v1:resource_value_config.proto +@googleapis//google/cloud/securitycenter/v1:run_asset_discovery_response.proto +@googleapis//google/cloud/securitycenter/v1:security_health_analytics_custom_config.proto +@googleapis//google/cloud/securitycenter/v1:security_health_analytics_custom_module.proto +@googleapis//google/cloud/securitycenter/v1:security_marks.proto +@googleapis//google/cloud/securitycenter/v1:security_posture.proto +@googleapis//google/cloud/securitycenter/v1:securitycenter_service.proto +@googleapis//google/cloud/securitycenter/v1:simulation.proto +@googleapis//google/cloud/securitycenter/v1:source.proto +@googleapis//google/cloud/securitycenter/v1:toxic_combination.proto +@googleapis//google/cloud/securitycenter/v1:valued_resource.proto +@googleapis//google/cloud/securitycenter/v1:vulnerability.proto +@googleapis//google/cloud/securitycenter/v2:access.proto +@googleapis//google/cloud/securitycenter/v2:affected_resources.proto +@googleapis//google/cloud/securitycenter/v2:ai_model.proto +@googleapis//google/cloud/securitycenter/v2:application.proto +@googleapis//google/cloud/securitycenter/v2:attack_exposure.proto +@googleapis//google/cloud/securitycenter/v2:attack_path.proto +@googleapis//google/cloud/securitycenter/v2:backup_disaster_recovery.proto +@googleapis//google/cloud/securitycenter/v2:bigquery_export.proto +@googleapis//google/cloud/securitycenter/v2:chokepoint.proto +@googleapis//google/cloud/securitycenter/v2:cloud_armor.proto +@googleapis//google/cloud/securitycenter/v2:cloud_dlp_data_profile.proto +@googleapis//google/cloud/securitycenter/v2:cloud_dlp_inspection.proto +@googleapis//google/cloud/securitycenter/v2:compliance.proto +@googleapis//google/cloud/securitycenter/v2:connection.proto +@googleapis//google/cloud/securitycenter/v2:contact_details.proto +@googleapis//google/cloud/securitycenter/v2:container.proto +@googleapis//google/cloud/securitycenter/v2:data_access_event.proto +@googleapis//google/cloud/securitycenter/v2:data_flow_event.proto +@googleapis//google/cloud/securitycenter/v2:data_retention_deletion_event.proto +@googleapis//google/cloud/securitycenter/v2:database.proto +@googleapis//google/cloud/securitycenter/v2:disk.proto +@googleapis//google/cloud/securitycenter/v2:exfiltration.proto +@googleapis//google/cloud/securitycenter/v2:external_system.proto +@googleapis//google/cloud/securitycenter/v2:file.proto +@googleapis//google/cloud/securitycenter/v2:finding.proto +@googleapis//google/cloud/securitycenter/v2:folder.proto +@googleapis//google/cloud/securitycenter/v2:group_membership.proto +@googleapis//google/cloud/securitycenter/v2:iam_binding.proto +@googleapis//google/cloud/securitycenter/v2:indicator.proto +@googleapis//google/cloud/securitycenter/v2:ip_rules.proto +@googleapis//google/cloud/securitycenter/v2:job.proto +@googleapis//google/cloud/securitycenter/v2:kernel_rootkit.proto +@googleapis//google/cloud/securitycenter/v2:kubernetes.proto +@googleapis//google/cloud/securitycenter/v2:label.proto +@googleapis//google/cloud/securitycenter/v2:load_balancer.proto +@googleapis//google/cloud/securitycenter/v2:log_entry.proto +@googleapis//google/cloud/securitycenter/v2:mitre_attack.proto +@googleapis//google/cloud/securitycenter/v2:mute_config.proto +@googleapis//google/cloud/securitycenter/v2:network.proto +@googleapis//google/cloud/securitycenter/v2:notebook.proto +@googleapis//google/cloud/securitycenter/v2:notification_config.proto +@googleapis//google/cloud/securitycenter/v2:notification_message.proto +@googleapis//google/cloud/securitycenter/v2:org_policy.proto +@googleapis//google/cloud/securitycenter/v2:process.proto +@googleapis//google/cloud/securitycenter/v2:resource.proto +@googleapis//google/cloud/securitycenter/v2:resource_value_config.proto +@googleapis//google/cloud/securitycenter/v2:security_marks.proto +@googleapis//google/cloud/securitycenter/v2:security_posture.proto +@googleapis//google/cloud/securitycenter/v2:securitycenter_service.proto +@googleapis//google/cloud/securitycenter/v2:simulation.proto +@googleapis//google/cloud/securitycenter/v2:source.proto +@googleapis//google/cloud/securitycenter/v2:toxic_combination.proto +@googleapis//google/cloud/securitycenter/v2:valued_resource.proto +@googleapis//google/cloud/securitycenter/v2:vertex_ai.proto +@googleapis//google/cloud/securitycenter/v2:vulnerability.proto diff --git a/external/googleapis/protolists/securitycentermanagement.list b/external/googleapis/protolists/securitycentermanagement.list index 4304ce74912e9..fcbb29181b7b0 100644 --- a/external/googleapis/protolists/securitycentermanagement.list +++ b/external/googleapis/protolists/securitycentermanagement.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/securitycentermanagement/v1:security_center_management.proto +@googleapis//google/cloud/securitycentermanagement/v1:security_center_management.proto diff --git a/external/googleapis/protolists/servicecontrol.list b/external/googleapis/protolists/servicecontrol.list index fdc8678cf5f34..62ff470c9430b 100644 --- a/external/googleapis/protolists/servicecontrol.list +++ b/external/googleapis/protolists/servicecontrol.list @@ -1,9 +1,9 @@ -@com_google_googleapis//google/api/servicecontrol/v1:check_error.proto -@com_google_googleapis//google/api/servicecontrol/v1:distribution.proto -@com_google_googleapis//google/api/servicecontrol/v1:http_request.proto -@com_google_googleapis//google/api/servicecontrol/v1:log_entry.proto -@com_google_googleapis//google/api/servicecontrol/v1:metric_value.proto -@com_google_googleapis//google/api/servicecontrol/v1:operation.proto -@com_google_googleapis//google/api/servicecontrol/v1:quota_controller.proto -@com_google_googleapis//google/api/servicecontrol/v1:service_controller.proto -@com_google_googleapis//google/api/servicecontrol/v2:service_controller.proto +@googleapis//google/api/servicecontrol/v1:check_error.proto +@googleapis//google/api/servicecontrol/v1:distribution.proto +@googleapis//google/api/servicecontrol/v1:http_request.proto +@googleapis//google/api/servicecontrol/v1:log_entry.proto +@googleapis//google/api/servicecontrol/v1:metric_value.proto +@googleapis//google/api/servicecontrol/v1:operation.proto +@googleapis//google/api/servicecontrol/v1:quota_controller.proto +@googleapis//google/api/servicecontrol/v1:service_controller.proto +@googleapis//google/api/servicecontrol/v2:service_controller.proto diff --git a/external/googleapis/protolists/servicedirectory.list b/external/googleapis/protolists/servicedirectory.list index 9050ad50aa26f..e6089ac3a7115 100644 --- a/external/googleapis/protolists/servicedirectory.list +++ b/external/googleapis/protolists/servicedirectory.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/servicedirectory/v1:endpoint.proto -@com_google_googleapis//google/cloud/servicedirectory/v1:lookup_service.proto -@com_google_googleapis//google/cloud/servicedirectory/v1:namespace.proto -@com_google_googleapis//google/cloud/servicedirectory/v1:registration_service.proto -@com_google_googleapis//google/cloud/servicedirectory/v1:service.proto +@googleapis//google/cloud/servicedirectory/v1:endpoint.proto +@googleapis//google/cloud/servicedirectory/v1:lookup_service.proto +@googleapis//google/cloud/servicedirectory/v1:namespace.proto +@googleapis//google/cloud/servicedirectory/v1:registration_service.proto +@googleapis//google/cloud/servicedirectory/v1:service.proto diff --git a/external/googleapis/protolists/servicehealth.list b/external/googleapis/protolists/servicehealth.list index 371f08183aa41..6e1111e738ff1 100644 --- a/external/googleapis/protolists/servicehealth.list +++ b/external/googleapis/protolists/servicehealth.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/cloud/servicehealth/logging/v1:event_log.proto -@com_google_googleapis//google/cloud/servicehealth/v1:event_resources.proto -@com_google_googleapis//google/cloud/servicehealth/v1:event_service.proto +@googleapis//google/cloud/servicehealth/logging/v1:event_log.proto +@googleapis//google/cloud/servicehealth/v1:event_resources.proto +@googleapis//google/cloud/servicehealth/v1:event_service.proto diff --git a/external/googleapis/protolists/servicemanagement.list b/external/googleapis/protolists/servicemanagement.list index 70b3f804d1553..f75090e9809ba 100644 --- a/external/googleapis/protolists/servicemanagement.list +++ b/external/googleapis/protolists/servicemanagement.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/api/servicemanagement/v1:resources.proto -@com_google_googleapis//google/api/servicemanagement/v1:servicemanager.proto +@googleapis//google/api/servicemanagement/v1:resources.proto +@googleapis//google/api/servicemanagement/v1:servicemanager.proto diff --git a/external/googleapis/protolists/serviceusage.list b/external/googleapis/protolists/serviceusage.list index d565f298c4b8a..0e3d570162238 100644 --- a/external/googleapis/protolists/serviceusage.list +++ b/external/googleapis/protolists/serviceusage.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/api/serviceusage/v1:resources.proto -@com_google_googleapis//google/api/serviceusage/v1:serviceusage.proto +@googleapis//google/api/serviceusage/v1:resources.proto +@googleapis//google/api/serviceusage/v1:serviceusage.proto diff --git a/external/googleapis/protolists/shell.list b/external/googleapis/protolists/shell.list index faa9e1b53898e..b806640c6b53a 100644 --- a/external/googleapis/protolists/shell.list +++ b/external/googleapis/protolists/shell.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/shell/v1:cloudshell.proto +@googleapis//google/cloud/shell/v1:cloudshell.proto diff --git a/external/googleapis/protolists/spanner.list b/external/googleapis/protolists/spanner.list index 64d7b1ac0ea91..283fe697494fa 100644 --- a/external/googleapis/protolists/spanner.list +++ b/external/googleapis/protolists/spanner.list @@ -1,16 +1,16 @@ -@com_google_googleapis//google/spanner/admin/database/v1:backup.proto -@com_google_googleapis//google/spanner/admin/database/v1:backup_schedule.proto -@com_google_googleapis//google/spanner/admin/database/v1:common.proto -@com_google_googleapis//google/spanner/admin/database/v1:spanner_database_admin.proto -@com_google_googleapis//google/spanner/admin/instance/v1:common.proto -@com_google_googleapis//google/spanner/admin/instance/v1:spanner_instance_admin.proto -@com_google_googleapis//google/spanner/v1:change_stream.proto -@com_google_googleapis//google/spanner/v1:commit_response.proto -@com_google_googleapis//google/spanner/v1:keys.proto -@com_google_googleapis//google/spanner/v1:location.proto -@com_google_googleapis//google/spanner/v1:mutation.proto -@com_google_googleapis//google/spanner/v1:query_plan.proto -@com_google_googleapis//google/spanner/v1:result_set.proto -@com_google_googleapis//google/spanner/v1:spanner.proto -@com_google_googleapis//google/spanner/v1:transaction.proto -@com_google_googleapis//google/spanner/v1:type.proto +@googleapis//google/spanner/admin/database/v1:backup.proto +@googleapis//google/spanner/admin/database/v1:backup_schedule.proto +@googleapis//google/spanner/admin/database/v1:common.proto +@googleapis//google/spanner/admin/database/v1:spanner_database_admin.proto +@googleapis//google/spanner/admin/instance/v1:common.proto +@googleapis//google/spanner/admin/instance/v1:spanner_instance_admin.proto +@googleapis//google/spanner/v1:change_stream.proto +@googleapis//google/spanner/v1:commit_response.proto +@googleapis//google/spanner/v1:keys.proto +@googleapis//google/spanner/v1:location.proto +@googleapis//google/spanner/v1:mutation.proto +@googleapis//google/spanner/v1:query_plan.proto +@googleapis//google/spanner/v1:result_set.proto +@googleapis//google/spanner/v1:spanner.proto +@googleapis//google/spanner/v1:transaction.proto +@googleapis//google/spanner/v1:type.proto diff --git a/external/googleapis/protolists/speech.list b/external/googleapis/protolists/speech.list index 17363f4df7d53..99eca04ec9f45 100644 --- a/external/googleapis/protolists/speech.list +++ b/external/googleapis/protolists/speech.list @@ -1,5 +1,5 @@ -@com_google_googleapis//google/cloud/speech/v1:cloud_speech.proto -@com_google_googleapis//google/cloud/speech/v1:cloud_speech_adaptation.proto -@com_google_googleapis//google/cloud/speech/v1:resource.proto -@com_google_googleapis//google/cloud/speech/v2:cloud_speech.proto -@com_google_googleapis//google/cloud/speech/v2:locations_metadata.proto +@googleapis//google/cloud/speech/v1:cloud_speech.proto +@googleapis//google/cloud/speech/v1:cloud_speech_adaptation.proto +@googleapis//google/cloud/speech/v1:resource.proto +@googleapis//google/cloud/speech/v2:cloud_speech.proto +@googleapis//google/cloud/speech/v2:locations_metadata.proto diff --git a/external/googleapis/protolists/sql.list b/external/googleapis/protolists/sql.list index 2aaa8ebc0f801..194290b6e2de8 100644 --- a/external/googleapis/protolists/sql.list +++ b/external/googleapis/protolists/sql.list @@ -1,15 +1,15 @@ -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_available_database_versions.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_backup_runs.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_connect.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_databases.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_events.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_flags.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_iam_policies.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_instance_names.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_instances.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_operations.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_regions.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_resources.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_ssl_certs.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_tiers.proto -@com_google_googleapis//google/cloud/sql/v1:cloud_sql_users.proto +@googleapis//google/cloud/sql/v1:cloud_sql_available_database_versions.proto +@googleapis//google/cloud/sql/v1:cloud_sql_backup_runs.proto +@googleapis//google/cloud/sql/v1:cloud_sql_connect.proto +@googleapis//google/cloud/sql/v1:cloud_sql_databases.proto +@googleapis//google/cloud/sql/v1:cloud_sql_events.proto +@googleapis//google/cloud/sql/v1:cloud_sql_flags.proto +@googleapis//google/cloud/sql/v1:cloud_sql_iam_policies.proto +@googleapis//google/cloud/sql/v1:cloud_sql_instance_names.proto +@googleapis//google/cloud/sql/v1:cloud_sql_instances.proto +@googleapis//google/cloud/sql/v1:cloud_sql_operations.proto +@googleapis//google/cloud/sql/v1:cloud_sql_regions.proto +@googleapis//google/cloud/sql/v1:cloud_sql_resources.proto +@googleapis//google/cloud/sql/v1:cloud_sql_ssl_certs.proto +@googleapis//google/cloud/sql/v1:cloud_sql_tiers.proto +@googleapis//google/cloud/sql/v1:cloud_sql_users.proto diff --git a/external/googleapis/protolists/storage.list b/external/googleapis/protolists/storage.list index 69b9a97eff1c4..7874486032bb3 100644 --- a/external/googleapis/protolists/storage.list +++ b/external/googleapis/protolists/storage.list @@ -1 +1 @@ -@com_google_googleapis//google/storage/v2:storage.proto +@googleapis//google/storage/v2:storage.proto diff --git a/external/googleapis/protolists/storagebatchoperations.list b/external/googleapis/protolists/storagebatchoperations.list index 933ffabcfeaec..07b97aba1ee8b 100644 --- a/external/googleapis/protolists/storagebatchoperations.list +++ b/external/googleapis/protolists/storagebatchoperations.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/storagebatchoperations/v1:storage_batch_operations.proto -@com_google_googleapis//google/cloud/storagebatchoperations/v1:storage_batch_operations_types.proto +@googleapis//google/cloud/storagebatchoperations/v1:storage_batch_operations.proto +@googleapis//google/cloud/storagebatchoperations/v1:storage_batch_operations_types.proto diff --git a/external/googleapis/protolists/storagecontrol.list b/external/googleapis/protolists/storagecontrol.list index af50b603b5e44..facaa06bd4d82 100644 --- a/external/googleapis/protolists/storagecontrol.list +++ b/external/googleapis/protolists/storagecontrol.list @@ -1 +1 @@ -@com_google_googleapis//google/storage/control/v2:storage_control.proto +@googleapis//google/storage/control/v2:storage_control.proto diff --git a/external/googleapis/protolists/storageinsights.list b/external/googleapis/protolists/storageinsights.list index 3147e0bd0d9e9..de77e3541300c 100644 --- a/external/googleapis/protolists/storageinsights.list +++ b/external/googleapis/protolists/storageinsights.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/storageinsights/v1:storageinsights.proto +@googleapis//google/cloud/storageinsights/v1:storageinsights.proto diff --git a/external/googleapis/protolists/storagetransfer.list b/external/googleapis/protolists/storagetransfer.list index f3a7810e22021..2bf9743423e27 100644 --- a/external/googleapis/protolists/storagetransfer.list +++ b/external/googleapis/protolists/storagetransfer.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/storagetransfer/v1:transfer.proto -@com_google_googleapis//google/storagetransfer/v1:transfer_types.proto +@googleapis//google/storagetransfer/v1:transfer.proto +@googleapis//google/storagetransfer/v1:transfer_types.proto diff --git a/external/googleapis/protolists/support.list b/external/googleapis/protolists/support.list index 875f466b01c46..c93e53e76d5b5 100644 --- a/external/googleapis/protolists/support.list +++ b/external/googleapis/protolists/support.list @@ -1,8 +1,8 @@ -@com_google_googleapis//google/cloud/support/v2:actor.proto -@com_google_googleapis//google/cloud/support/v2:attachment.proto -@com_google_googleapis//google/cloud/support/v2:attachment_service.proto -@com_google_googleapis//google/cloud/support/v2:case.proto -@com_google_googleapis//google/cloud/support/v2:case_service.proto -@com_google_googleapis//google/cloud/support/v2:comment.proto -@com_google_googleapis//google/cloud/support/v2:comment_service.proto -@com_google_googleapis//google/cloud/support/v2:escalation.proto +@googleapis//google/cloud/support/v2:actor.proto +@googleapis//google/cloud/support/v2:attachment.proto +@googleapis//google/cloud/support/v2:attachment_service.proto +@googleapis//google/cloud/support/v2:case.proto +@googleapis//google/cloud/support/v2:case_service.proto +@googleapis//google/cloud/support/v2:comment.proto +@googleapis//google/cloud/support/v2:comment_service.proto +@googleapis//google/cloud/support/v2:escalation.proto diff --git a/external/googleapis/protolists/talent.list b/external/googleapis/protolists/talent.list index 9ed14f4ead85f..00e594f391196 100644 --- a/external/googleapis/protolists/talent.list +++ b/external/googleapis/protolists/talent.list @@ -1,12 +1,12 @@ -@com_google_googleapis//google/cloud/talent/v4:common.proto -@com_google_googleapis//google/cloud/talent/v4:company.proto -@com_google_googleapis//google/cloud/talent/v4:company_service.proto -@com_google_googleapis//google/cloud/talent/v4:completion_service.proto -@com_google_googleapis//google/cloud/talent/v4:event.proto -@com_google_googleapis//google/cloud/talent/v4:event_service.proto -@com_google_googleapis//google/cloud/talent/v4:filters.proto -@com_google_googleapis//google/cloud/talent/v4:histogram.proto -@com_google_googleapis//google/cloud/talent/v4:job.proto -@com_google_googleapis//google/cloud/talent/v4:job_service.proto -@com_google_googleapis//google/cloud/talent/v4:tenant.proto -@com_google_googleapis//google/cloud/talent/v4:tenant_service.proto +@googleapis//google/cloud/talent/v4:common.proto +@googleapis//google/cloud/talent/v4:company.proto +@googleapis//google/cloud/talent/v4:company_service.proto +@googleapis//google/cloud/talent/v4:completion_service.proto +@googleapis//google/cloud/talent/v4:event.proto +@googleapis//google/cloud/talent/v4:event_service.proto +@googleapis//google/cloud/talent/v4:filters.proto +@googleapis//google/cloud/talent/v4:histogram.proto +@googleapis//google/cloud/talent/v4:job.proto +@googleapis//google/cloud/talent/v4:job_service.proto +@googleapis//google/cloud/talent/v4:tenant.proto +@googleapis//google/cloud/talent/v4:tenant_service.proto diff --git a/external/googleapis/protolists/tasks.list b/external/googleapis/protolists/tasks.list index 052e131396663..6371fd6df42a5 100644 --- a/external/googleapis/protolists/tasks.list +++ b/external/googleapis/protolists/tasks.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/tasks/v2:cloudtasks.proto -@com_google_googleapis//google/cloud/tasks/v2:queue.proto -@com_google_googleapis//google/cloud/tasks/v2:target.proto -@com_google_googleapis//google/cloud/tasks/v2:task.proto +@googleapis//google/cloud/tasks/v2:cloudtasks.proto +@googleapis//google/cloud/tasks/v2:queue.proto +@googleapis//google/cloud/tasks/v2:target.proto +@googleapis//google/cloud/tasks/v2:task.proto diff --git a/external/googleapis/protolists/telcoautomation.list b/external/googleapis/protolists/telcoautomation.list index 6b81e7687af94..1c8a769149a36 100644 --- a/external/googleapis/protolists/telcoautomation.list +++ b/external/googleapis/protolists/telcoautomation.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/telcoautomation/v1:telcoautomation.proto +@googleapis//google/cloud/telcoautomation/v1:telcoautomation.proto diff --git a/external/googleapis/protolists/texttospeech.list b/external/googleapis/protolists/texttospeech.list index 0aae47d75b4f9..1622bfd784662 100644 --- a/external/googleapis/protolists/texttospeech.list +++ b/external/googleapis/protolists/texttospeech.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/texttospeech/v1:cloud_tts.proto -@com_google_googleapis//google/cloud/texttospeech/v1:cloud_tts_lrs.proto +@googleapis//google/cloud/texttospeech/v1:cloud_tts.proto +@googleapis//google/cloud/texttospeech/v1:cloud_tts_lrs.proto diff --git a/external/googleapis/protolists/timeseriesinsights.list b/external/googleapis/protolists/timeseriesinsights.list index f76afc3335aa4..143ef6b6a17c7 100644 --- a/external/googleapis/protolists/timeseriesinsights.list +++ b/external/googleapis/protolists/timeseriesinsights.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/timeseriesinsights/v1:timeseries_insights.proto +@googleapis//google/cloud/timeseriesinsights/v1:timeseries_insights.proto diff --git a/external/googleapis/protolists/tpu.list b/external/googleapis/protolists/tpu.list index 9ec3a2a29b809..31b72d3a2d18c 100644 --- a/external/googleapis/protolists/tpu.list +++ b/external/googleapis/protolists/tpu.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/tpu/v1:cloud_tpu.proto -@com_google_googleapis//google/cloud/tpu/v2:cloud_tpu.proto +@googleapis//google/cloud/tpu/v1:cloud_tpu.proto +@googleapis//google/cloud/tpu/v2:cloud_tpu.proto diff --git a/external/googleapis/protolists/trace.list b/external/googleapis/protolists/trace.list index bb199c12eecf3..d319a16df722a 100644 --- a/external/googleapis/protolists/trace.list +++ b/external/googleapis/protolists/trace.list @@ -1,3 +1,3 @@ -@com_google_googleapis//google/devtools/cloudtrace/v1:trace.proto -@com_google_googleapis//google/devtools/cloudtrace/v2:trace.proto -@com_google_googleapis//google/devtools/cloudtrace/v2:tracing.proto +@googleapis//google/devtools/cloudtrace/v1:trace.proto +@googleapis//google/devtools/cloudtrace/v2:trace.proto +@googleapis//google/devtools/cloudtrace/v2:tracing.proto diff --git a/external/googleapis/protolists/translate.list b/external/googleapis/protolists/translate.list index 6ce22d7561282..e18baadfb73d3 100644 --- a/external/googleapis/protolists/translate.list +++ b/external/googleapis/protolists/translate.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/translate/v3:adaptive_mt.proto -@com_google_googleapis//google/cloud/translate/v3:automl_translation.proto -@com_google_googleapis//google/cloud/translate/v3:common.proto -@com_google_googleapis//google/cloud/translate/v3:translation_service.proto +@googleapis//google/cloud/translate/v3:adaptive_mt.proto +@googleapis//google/cloud/translate/v3:automl_translation.proto +@googleapis//google/cloud/translate/v3:common.proto +@googleapis//google/cloud/translate/v3:translation_service.proto diff --git a/external/googleapis/protolists/video.list b/external/googleapis/protolists/video.list index 1781b13fd8bd9..19195191f72fe 100644 --- a/external/googleapis/protolists/video.list +++ b/external/googleapis/protolists/video.list @@ -1,16 +1,16 @@ -@com_google_googleapis//google/cloud/video/livestream/v1:outputs.proto -@com_google_googleapis//google/cloud/video/livestream/v1:resources.proto -@com_google_googleapis//google/cloud/video/livestream/v1:service.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:ad_tag_details.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:cdn_keys.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:companions.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:events.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:fetch_options.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:live_configs.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:sessions.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:slates.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:stitch_details.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:video_stitcher_service.proto -@com_google_googleapis//google/cloud/video/stitcher/v1:vod_configs.proto -@com_google_googleapis//google/cloud/video/transcoder/v1:resources.proto -@com_google_googleapis//google/cloud/video/transcoder/v1:services.proto +@googleapis//google/cloud/video/livestream/v1:outputs.proto +@googleapis//google/cloud/video/livestream/v1:resources.proto +@googleapis//google/cloud/video/livestream/v1:service.proto +@googleapis//google/cloud/video/stitcher/v1:ad_tag_details.proto +@googleapis//google/cloud/video/stitcher/v1:cdn_keys.proto +@googleapis//google/cloud/video/stitcher/v1:companions.proto +@googleapis//google/cloud/video/stitcher/v1:events.proto +@googleapis//google/cloud/video/stitcher/v1:fetch_options.proto +@googleapis//google/cloud/video/stitcher/v1:live_configs.proto +@googleapis//google/cloud/video/stitcher/v1:sessions.proto +@googleapis//google/cloud/video/stitcher/v1:slates.proto +@googleapis//google/cloud/video/stitcher/v1:stitch_details.proto +@googleapis//google/cloud/video/stitcher/v1:video_stitcher_service.proto +@googleapis//google/cloud/video/stitcher/v1:vod_configs.proto +@googleapis//google/cloud/video/transcoder/v1:resources.proto +@googleapis//google/cloud/video/transcoder/v1:services.proto diff --git a/external/googleapis/protolists/videointelligence.list b/external/googleapis/protolists/videointelligence.list index e1b8829615f88..7400115525ca9 100644 --- a/external/googleapis/protolists/videointelligence.list +++ b/external/googleapis/protolists/videointelligence.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/videointelligence/v1:video_intelligence.proto +@googleapis//google/cloud/videointelligence/v1:video_intelligence.proto diff --git a/external/googleapis/protolists/vision.list b/external/googleapis/protolists/vision.list index ec2be6c85430c..f7dfd554bb52e 100644 --- a/external/googleapis/protolists/vision.list +++ b/external/googleapis/protolists/vision.list @@ -1,6 +1,6 @@ -@com_google_googleapis//google/cloud/vision/v1:geometry.proto -@com_google_googleapis//google/cloud/vision/v1:image_annotator.proto -@com_google_googleapis//google/cloud/vision/v1:product_search.proto -@com_google_googleapis//google/cloud/vision/v1:product_search_service.proto -@com_google_googleapis//google/cloud/vision/v1:text_annotation.proto -@com_google_googleapis//google/cloud/vision/v1:web_detection.proto +@googleapis//google/cloud/vision/v1:geometry.proto +@googleapis//google/cloud/vision/v1:image_annotator.proto +@googleapis//google/cloud/vision/v1:product_search.proto +@googleapis//google/cloud/vision/v1:product_search_service.proto +@googleapis//google/cloud/vision/v1:text_annotation.proto +@googleapis//google/cloud/vision/v1:web_detection.proto diff --git a/external/googleapis/protolists/vmmigration.list b/external/googleapis/protolists/vmmigration.list index 1f35f0b6b0cde..5eae4fbf7f378 100644 --- a/external/googleapis/protolists/vmmigration.list +++ b/external/googleapis/protolists/vmmigration.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/vmmigration/v1:vmmigration.proto +@googleapis//google/cloud/vmmigration/v1:vmmigration.proto diff --git a/external/googleapis/protolists/vmwareengine.list b/external/googleapis/protolists/vmwareengine.list index 2d0f479d7a7d9..674ed166bcbfe 100644 --- a/external/googleapis/protolists/vmwareengine.list +++ b/external/googleapis/protolists/vmwareengine.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/vmwareengine/v1:vmwareengine.proto -@com_google_googleapis//google/cloud/vmwareengine/v1:vmwareengine_resources.proto +@googleapis//google/cloud/vmwareengine/v1:vmwareengine.proto +@googleapis//google/cloud/vmwareengine/v1:vmwareengine_resources.proto diff --git a/external/googleapis/protolists/vpcaccess.list b/external/googleapis/protolists/vpcaccess.list index 1480b40df7c4d..a87365fe77cd7 100644 --- a/external/googleapis/protolists/vpcaccess.list +++ b/external/googleapis/protolists/vpcaccess.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/vpcaccess/v1:vpc_access.proto +@googleapis//google/cloud/vpcaccess/v1:vpc_access.proto diff --git a/external/googleapis/protolists/webrisk.list b/external/googleapis/protolists/webrisk.list index b5d3deda4fcc7..fab89756a71cf 100644 --- a/external/googleapis/protolists/webrisk.list +++ b/external/googleapis/protolists/webrisk.list @@ -1 +1 @@ -@com_google_googleapis//google/cloud/webrisk/v1:webrisk.proto +@googleapis//google/cloud/webrisk/v1:webrisk.proto diff --git a/external/googleapis/protolists/websecurityscanner.list b/external/googleapis/protolists/websecurityscanner.list index 057a470df0fa9..79a5ace189be2 100644 --- a/external/googleapis/protolists/websecurityscanner.list +++ b/external/googleapis/protolists/websecurityscanner.list @@ -1,11 +1,11 @@ -@com_google_googleapis//google/cloud/websecurityscanner/v1:crawled_url.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:finding.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:finding_addon.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:finding_type_stats.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:scan_config.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:scan_config_error.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:scan_run.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:scan_run_error_trace.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:scan_run_log.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:scan_run_warning_trace.proto -@com_google_googleapis//google/cloud/websecurityscanner/v1:web_security_scanner.proto +@googleapis//google/cloud/websecurityscanner/v1:crawled_url.proto +@googleapis//google/cloud/websecurityscanner/v1:finding.proto +@googleapis//google/cloud/websecurityscanner/v1:finding_addon.proto +@googleapis//google/cloud/websecurityscanner/v1:finding_type_stats.proto +@googleapis//google/cloud/websecurityscanner/v1:scan_config.proto +@googleapis//google/cloud/websecurityscanner/v1:scan_config_error.proto +@googleapis//google/cloud/websecurityscanner/v1:scan_run.proto +@googleapis//google/cloud/websecurityscanner/v1:scan_run_error_trace.proto +@googleapis//google/cloud/websecurityscanner/v1:scan_run_log.proto +@googleapis//google/cloud/websecurityscanner/v1:scan_run_warning_trace.proto +@googleapis//google/cloud/websecurityscanner/v1:web_security_scanner.proto diff --git a/external/googleapis/protolists/workflows.list b/external/googleapis/protolists/workflows.list index ee98e517fc87b..bedfddc5834e5 100644 --- a/external/googleapis/protolists/workflows.list +++ b/external/googleapis/protolists/workflows.list @@ -1,4 +1,4 @@ -@com_google_googleapis//google/cloud/workflows/executions/v1:executions.proto -@com_google_googleapis//google/cloud/workflows/type:engine_call.proto -@com_google_googleapis//google/cloud/workflows/type:executions_system.proto -@com_google_googleapis//google/cloud/workflows/v1:workflows.proto +@googleapis//google/cloud/workflows/executions/v1:executions.proto +@googleapis//google/cloud/workflows/type:engine_call.proto +@googleapis//google/cloud/workflows/type:executions_system.proto +@googleapis//google/cloud/workflows/v1:workflows.proto diff --git a/external/googleapis/protolists/workstations.list b/external/googleapis/protolists/workstations.list index e85920cb02c3c..11431de4aad29 100644 --- a/external/googleapis/protolists/workstations.list +++ b/external/googleapis/protolists/workstations.list @@ -1,2 +1,2 @@ -@com_google_googleapis//google/cloud/workstations/logging/v1:platform_logs.proto -@com_google_googleapis//google/cloud/workstations/v1:workstations.proto +@googleapis//google/cloud/workstations/logging/v1:platform_logs.proto +@googleapis//google/cloud/workstations/v1:workstations.proto diff --git a/external/googleapis/update_libraries.sh b/external/googleapis/update_libraries.sh index 7efb27865b864..567fe5952f2b2 100755 --- a/external/googleapis/update_libraries.sh +++ b/external/googleapis/update_libraries.sh @@ -16,340 +16,340 @@ set -euo pipefail declare -A -r LIBRARIES=( - ["accessapproval"]="@com_google_googleapis//google/cloud/accessapproval/v1:accessapproval_cc_grpc" + ["accessapproval"]="@googleapis//google/cloud/accessapproval/v1:accessapproval_cc_grpc" ["accesscontextmanager"]="$( printf ",%s" \ - "@com_google_googleapis//google/identity/accesscontextmanager/type:type_cc_grpc" \ - "@com_google_googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_cc_grpc" + "@googleapis//google/identity/accesscontextmanager/type:type_cc_grpc" \ + "@googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_cc_grpc" )" - ["advisorynotifications"]="@com_google_googleapis//google/cloud/advisorynotifications/v1:advisorynotifications_cc_grpc" + ["advisorynotifications"]="@googleapis//google/cloud/advisorynotifications/v1:advisorynotifications_cc_grpc" ["aiplatform"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/aiplatform/logging:logging_cc_grpc" \ - "@com_google_googleapis//google/cloud/aiplatform/v1:aiplatform_cc_grpc" \ - "@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/instance:instance_cc_grpc" \ - "@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/params:params_cc_grpc" \ - "@com_google_googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:prediction_cc_grpc" \ - "@com_google_googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:definition_cc_grpc" - )" - ["alloydb"]="@com_google_googleapis//google/cloud/alloydb/v1:alloydb_cc_grpc" - ["apigateway"]="@com_google_googleapis//google/cloud/apigateway/v1:apigateway_cc_grpc" - ["apigeeconnect"]="@com_google_googleapis//google/cloud/apigeeconnect/v1:apigeeconnect_cc_grpc" - ["apikeys"]="@com_google_googleapis//google/api/apikeys/v2:apikeys_cc_grpc" + "@googleapis//google/cloud/aiplatform/logging:logging_cc_grpc" \ + "@googleapis//google/cloud/aiplatform/v1:aiplatform_cc_grpc" \ + "@googleapis//google/cloud/aiplatform/v1/schema/predict/instance:instance_cc_grpc" \ + "@googleapis//google/cloud/aiplatform/v1/schema/predict/params:params_cc_grpc" \ + "@googleapis//google/cloud/aiplatform/v1/schema/predict/prediction:prediction_cc_grpc" \ + "@googleapis//google/cloud/aiplatform/v1/schema/trainingjob/definition:definition_cc_grpc" + )" + ["alloydb"]="@googleapis//google/cloud/alloydb/v1:alloydb_cc_grpc" + ["apigateway"]="@googleapis//google/cloud/apigateway/v1:apigateway_cc_grpc" + ["apigeeconnect"]="@googleapis//google/cloud/apigeeconnect/v1:apigeeconnect_cc_grpc" + ["apikeys"]="@googleapis//google/api/apikeys/v2:apikeys_cc_grpc" ["appengine"]="$( printf ",%s" \ - "@com_google_googleapis//google/appengine/v1:appengine_cc_grpc" \ - "@com_google_googleapis//google/appengine/logging/v1:logging_cc_grpc" \ - "@com_google_googleapis//google/appengine/legacy:legacy_cc_grpc" + "@googleapis//google/appengine/v1:appengine_cc_grpc" \ + "@googleapis//google/appengine/logging/v1:logging_cc_grpc" \ + "@googleapis//google/appengine/legacy:legacy_cc_grpc" )" - ["apphub"]="@com_google_googleapis//google/cloud/apphub/v1:apphub_cc_grpc" - ["artifactregistry"]="@com_google_googleapis//google/devtools/artifactregistry/v1:artifactregistry_cc_grpc" - ["asset"]="@com_google_googleapis//google/cloud/asset/v1:asset_cc_grpc" - ["assuredworkloads"]="@com_google_googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc" - ["automl"]="@com_google_googleapis//google/cloud/automl/v1:automl_cc_grpc" + ["apphub"]="@googleapis//google/cloud/apphub/v1:apphub_cc_grpc" + ["artifactregistry"]="@googleapis//google/devtools/artifactregistry/v1:artifactregistry_cc_grpc" + ["asset"]="@googleapis//google/cloud/asset/v1:asset_cc_grpc" + ["assuredworkloads"]="@googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc" + ["automl"]="@googleapis//google/cloud/automl/v1:automl_cc_grpc" ["backupdr"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/backupdr/v1:backupdr_cc_grpc" \ - "@com_google_googleapis//google/cloud/backupdr/logging/v1:logging_cc_grpc" + "@googleapis//google/cloud/backupdr/v1:backupdr_cc_grpc" \ + "@googleapis//google/cloud/backupdr/logging/v1:logging_cc_grpc" )" - ["baremetalsolution"]="@com_google_googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc" - ["batch"]="@com_google_googleapis//google/cloud/batch/v1:batch_cc_grpc" + ["baremetalsolution"]="@googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc" + ["batch"]="@googleapis//google/cloud/batch/v1:batch_cc_grpc" ["beyondcorp"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/beyondcorp/appconnections/v1:appconnections_cc_grpc" \ - "@com_google_googleapis//google/cloud/beyondcorp/appconnectors/v1:appconnectors_cc_grpc" \ - "@com_google_googleapis//google/cloud/beyondcorp/appgateways/v1:appgateways_cc_grpc" + "@googleapis//google/cloud/beyondcorp/appconnections/v1:appconnections_cc_grpc" \ + "@googleapis//google/cloud/beyondcorp/appconnectors/v1:appconnectors_cc_grpc" \ + "@googleapis//google/cloud/beyondcorp/appgateways/v1:appgateways_cc_grpc" )" ["bigquery"]="$( # This is long enough that it needs to be kept in alphabetical order printf ",%s" \ - "@com_google_googleapis//google/cloud/bigquery/analyticshub/v1:analyticshub_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/biglake/v1:biglake_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/connection/v1:connection_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/datapolicies/v1:datapolicies_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/datapolicies/v2:datapolicies_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/datatransfer/v1:datatransfer_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/logging/v1:logging_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/migration/v2:migration_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/reservation/v1:reservation_cc_grpc" \ - "@com_google_googleapis//google/cloud/bigquery/storage/v1:storage_cc_grpc" - )" - ["bigquerycontrol"]="@com_google_googleapis//google/cloud/bigquery/v2:bigquery_cc_proto" + "@googleapis//google/cloud/bigquery/analyticshub/v1:analyticshub_cc_grpc" \ + "@googleapis//google/cloud/bigquery/biglake/v1:biglake_cc_grpc" \ + "@googleapis//google/cloud/bigquery/connection/v1:connection_cc_grpc" \ + "@googleapis//google/cloud/bigquery/datapolicies/v1:datapolicies_cc_grpc" \ + "@googleapis//google/cloud/bigquery/datapolicies/v2:datapolicies_cc_grpc" \ + "@googleapis//google/cloud/bigquery/datatransfer/v1:datatransfer_cc_grpc" \ + "@googleapis//google/cloud/bigquery/logging/v1:logging_cc_grpc" \ + "@googleapis//google/cloud/bigquery/migration/v2:migration_cc_grpc" \ + "@googleapis//google/cloud/bigquery/reservation/v1:reservation_cc_grpc" \ + "@googleapis//google/cloud/bigquery/storage/v1:storage_cc_grpc" + )" + ["bigquerycontrol"]="@googleapis//google/cloud/bigquery/v2:bigquery_cc_proto" ["bigtable"]="$( printf ",%s" \ - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc" \ - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc" + "@googleapis//google/bigtable/v2:bigtable_cc_grpc" \ + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc" )" ["billing"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/billing/v1:billing_cc_grpc" \ - "@com_google_googleapis//google/cloud/billing/budgets/v1:budgets_cc_grpc" + "@googleapis//google/cloud/billing/v1:billing_cc_grpc" \ + "@googleapis//google/cloud/billing/budgets/v1:budgets_cc_grpc" )" - ["binaryauthorization"]="@com_google_googleapis//google/cloud/binaryauthorization/v1:binaryauthorization_cc_grpc" + ["binaryauthorization"]="@googleapis//google/cloud/binaryauthorization/v1:binaryauthorization_cc_grpc" ["certificatemanager"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/certificatemanager/logging/v1:logging_cc_grpc" \ - "@com_google_googleapis//google/cloud/certificatemanager/v1:certificatemanager_cc_grpc" + "@googleapis//google/cloud/certificatemanager/logging/v1:logging_cc_grpc" \ + "@googleapis//google/cloud/certificatemanager/v1:certificatemanager_cc_grpc" )" - ["channel"]="@com_google_googleapis//google/cloud/channel/v1:channel_cc_grpc" - ["chronicle"]="@com_google_googleapis//google/cloud/chronicle/v1:chronicle_cc_grpc" + ["channel"]="@googleapis//google/cloud/channel/v1:channel_cc_grpc" + ["chronicle"]="@googleapis//google/cloud/chronicle/v1:chronicle_cc_grpc" ["cloudbuild"]="$( printf ",%s" \ - "@com_google_googleapis//google/devtools/cloudbuild/v1:cloudbuild_cc_grpc" \ - "@com_google_googleapis//google/devtools/cloudbuild/v2:cloudbuild_cc_grpc" - )" - ["cloudcontrolspartner"]="@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:cloudcontrolspartner_cc_grpc" - ["cloudquotas"]="@com_google_googleapis//google/api/cloudquotas/v1:cloudquotas_cc_grpc" - ["cloudsecuritycompliance"]="@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:cloudsecuritycompliance_cc_grpc" - ["commerce"]="@com_google_googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_cc_grpc" - ["common"]="@com_google_googleapis//google/cloud/common:common_cc_grpc" - ["composer"]="@com_google_googleapis//google/cloud/orchestration/airflow/service/v1:service_cc_grpc" - ["confidentialcomputing"]="@com_google_googleapis//google/cloud/confidentialcomputing/v1:confidentialcomputing_cc_grpc" - ["config"]="@com_google_googleapis//google/cloud/config/v1:config_cc_grpc" - ["configdelivery"]="@com_google_googleapis//google/cloud/configdelivery/v1:configdelivery_cc_grpc" - ["connectors"]="@com_google_googleapis//google/cloud/connectors/v1:connectors_cc_grpc" - ["contactcenterinsights"]="@com_google_googleapis//google/cloud/contactcenterinsights/v1:contactcenterinsights_cc_grpc" - ["container"]="@com_google_googleapis//google/container/v1:container_cc_grpc" - ["containeranalysis"]="@com_google_googleapis//google/devtools/containeranalysis/v1:containeranalysis_cc_grpc" - ["contentwarehouse"]="@com_google_googleapis//google/cloud/contentwarehouse/v1:contentwarehouse_cc_grpc" + "@googleapis//google/devtools/cloudbuild/v1:cloudbuild_cc_grpc" \ + "@googleapis//google/devtools/cloudbuild/v2:cloudbuild_cc_grpc" + )" + ["cloudcontrolspartner"]="@googleapis//google/cloud/cloudcontrolspartner/v1:cloudcontrolspartner_cc_grpc" + ["cloudquotas"]="@googleapis//google/api/cloudquotas/v1:cloudquotas_cc_grpc" + ["cloudsecuritycompliance"]="@googleapis//google/cloud/cloudsecuritycompliance/v1:cloudsecuritycompliance_cc_grpc" + ["commerce"]="@googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_cc_grpc" + ["common"]="@googleapis//google/cloud/common:common_cc_grpc" + ["composer"]="@googleapis//google/cloud/orchestration/airflow/service/v1:service_cc_grpc" + ["confidentialcomputing"]="@googleapis//google/cloud/confidentialcomputing/v1:confidentialcomputing_cc_grpc" + ["config"]="@googleapis//google/cloud/config/v1:config_cc_grpc" + ["configdelivery"]="@googleapis//google/cloud/configdelivery/v1:configdelivery_cc_grpc" + ["connectors"]="@googleapis//google/cloud/connectors/v1:connectors_cc_grpc" + ["contactcenterinsights"]="@googleapis//google/cloud/contactcenterinsights/v1:contactcenterinsights_cc_grpc" + ["container"]="@googleapis//google/container/v1:container_cc_grpc" + ["containeranalysis"]="@googleapis//google/devtools/containeranalysis/v1:containeranalysis_cc_grpc" + ["contentwarehouse"]="@googleapis//google/cloud/contentwarehouse/v1:contentwarehouse_cc_grpc" ["datacatalog"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/datacatalog/v1:datacatalog_cc_grpc" \ - "@com_google_googleapis//google/cloud/datacatalog/lineage/v1:lineage_cc_grpc" + "@googleapis//google/cloud/datacatalog/v1:datacatalog_cc_grpc" \ + "@googleapis//google/cloud/datacatalog/lineage/v1:lineage_cc_grpc" )" ["dataform"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/dataform/v1:dataform_cc_grpc" \ - "@com_google_googleapis//google/cloud/dataform/logging/v1:logging_cc_grpc" + "@googleapis//google/cloud/dataform/v1:dataform_cc_grpc" \ + "@googleapis//google/cloud/dataform/logging/v1:logging_cc_grpc" )" - ["datafusion"]="@com_google_googleapis//google/cloud/datafusion/v1:datafusion_cc_grpc" + ["datafusion"]="@googleapis//google/cloud/datafusion/v1:datafusion_cc_grpc" ["datamigration"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/clouddms/v1:clouddms_cc_grpc" \ - "@com_google_googleapis//google/cloud/clouddms/logging/v1:logging_cc_grpc" + "@googleapis//google/cloud/clouddms/v1:clouddms_cc_grpc" \ + "@googleapis//google/cloud/clouddms/logging/v1:logging_cc_grpc" )" - ["dataplex"]="@com_google_googleapis//google/cloud/dataplex/v1:dataplex_cc_grpc" - ["dataproc"]="@com_google_googleapis//google/cloud/dataproc/v1:dataproc_cc_grpc" + ["dataplex"]="@googleapis//google/cloud/dataplex/v1:dataplex_cc_grpc" + ["dataproc"]="@googleapis//google/cloud/dataproc/v1:dataproc_cc_grpc" ["datastore"]="$( printf ",%s" \ - "@com_google_googleapis//google/datastore/admin/v1:admin_cc_grpc" \ - "@com_google_googleapis//google/datastore/v1:datastore_cc_grpc" - )" - ["datastream"]="@com_google_googleapis//google/cloud/datastream/v1:datastream_cc_grpc" - ["deploy"]="@com_google_googleapis//google/cloud/deploy/v1:deploy_cc_grpc" - ["developerconnect"]="@com_google_googleapis//google/cloud/developerconnect/v1:developerconnect_cc_grpc" - ["devicestreaming"]="@com_google_googleapis//google/cloud/devicestreaming/v1:devicestreaming_cc_grpc" - ["dialogflow_es"]="@com_google_googleapis//google/cloud/dialogflow/v2:dialogflow_cc_grpc" - ["dialogflow_cx"]="@com_google_googleapis//google/cloud/dialogflow/cx/v3:cx_cc_grpc" - ["discoveryengine"]="@com_google_googleapis//google/cloud/discoveryengine/v1:discoveryengine_cc_grpc" - ["dlp"]="@com_google_googleapis//google/privacy/dlp/v2:dlp_cc_grpc" - ["documentai"]="@com_google_googleapis//google/cloud/documentai/v1:documentai_cc_grpc" - ["domains"]="@com_google_googleapis//google/cloud/domains/v1:domains_cc_grpc" - ["edgecontainer"]="@com_google_googleapis//google/cloud/edgecontainer/v1:edgecontainer_cc_grpc" - ["edgenetwork"]="@com_google_googleapis//google/cloud/edgenetwork/v1:edgenetwork_cc_grpc" - ["essentialcontacts"]="@com_google_googleapis//google/cloud/essentialcontacts/v1:essentialcontacts_cc_grpc" + "@googleapis//google/datastore/admin/v1:admin_cc_grpc" \ + "@googleapis//google/datastore/v1:datastore_cc_grpc" + )" + ["datastream"]="@googleapis//google/cloud/datastream/v1:datastream_cc_grpc" + ["deploy"]="@googleapis//google/cloud/deploy/v1:deploy_cc_grpc" + ["developerconnect"]="@googleapis//google/cloud/developerconnect/v1:developerconnect_cc_grpc" + ["devicestreaming"]="@googleapis//google/cloud/devicestreaming/v1:devicestreaming_cc_grpc" + ["dialogflow_es"]="@googleapis//google/cloud/dialogflow/v2:dialogflow_cc_grpc" + ["dialogflow_cx"]="@googleapis//google/cloud/dialogflow/cx/v3:cx_cc_grpc" + ["discoveryengine"]="@googleapis//google/cloud/discoveryengine/v1:discoveryengine_cc_grpc" + ["dlp"]="@googleapis//google/privacy/dlp/v2:dlp_cc_grpc" + ["documentai"]="@googleapis//google/cloud/documentai/v1:documentai_cc_grpc" + ["domains"]="@googleapis//google/cloud/domains/v1:domains_cc_grpc" + ["edgecontainer"]="@googleapis//google/cloud/edgecontainer/v1:edgecontainer_cc_grpc" + ["edgenetwork"]="@googleapis//google/cloud/edgenetwork/v1:edgenetwork_cc_grpc" + ["essentialcontacts"]="@googleapis//google/cloud/essentialcontacts/v1:essentialcontacts_cc_grpc" ["eventarc"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/eventarc/v1:eventarc_cc_grpc" \ - "@com_google_googleapis//google/cloud/eventarc/publishing/v1:publishing_cc_grpc" + "@googleapis//google/cloud/eventarc/v1:eventarc_cc_grpc" \ + "@googleapis//google/cloud/eventarc/publishing/v1:publishing_cc_grpc" )" - ["filestore"]="@com_google_googleapis//google/cloud/filestore/v1:filestore_cc_grpc" - ["financialservices"]="@com_google_googleapis//google/cloud/financialservices/v1:financialservices_cc_grpc" + ["filestore"]="@googleapis//google/cloud/filestore/v1:filestore_cc_grpc" + ["financialservices"]="@googleapis//google/cloud/financialservices/v1:financialservices_cc_grpc" ["functions"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/functions/v1:functions_cc_grpc" \ - "@com_google_googleapis//google/cloud/functions/v2:functions_cc_grpc" + "@googleapis//google/cloud/functions/v1:functions_cc_grpc" \ + "@googleapis//google/cloud/functions/v2:functions_cc_grpc" )" ["gkebackup"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/gkebackup/logging/v1:logging_cc_grpc" \ - "@com_google_googleapis//google/cloud/gkebackup/v1:gkebackup_cc_grpc" + "@googleapis//google/cloud/gkebackup/logging/v1:logging_cc_grpc" \ + "@googleapis//google/cloud/gkebackup/v1:gkebackup_cc_grpc" )" - ["gkeconnect"]="@com_google_googleapis//google/cloud/gkeconnect/gateway/v1:gateway_cc_grpc" + ["gkeconnect"]="@googleapis//google/cloud/gkeconnect/gateway/v1:gateway_cc_grpc" ["gkehub"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/gkehub/v1:gkehub_cc_grpc" \ - "@com_google_googleapis//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress_cc_grpc" \ - "@com_google_googleapis//google/cloud/gkehub/v1/configmanagement:configmanagement_cc_grpc" - )" - ["gkemulticloud"]="@com_google_googleapis//google/cloud/gkemulticloud/v1:gkemulticloud_cc_grpc" - ["grafeas"]="@com_google_googleapis//grafeas/v1:grafeas_cc_grpc" - ["iam"]="@com_google_googleapis//google/iam/admin/v1:admin_cc_grpc" - ["iam_v2"]="@com_google_googleapis//google/iam/v2:iam_cc_grpc" - ["iam_v3"]="@com_google_googleapis//google/iam/v3:iam_cc_grpc" - ["iap"]="@com_google_googleapis//google/cloud/iap/v1:iap_cc_grpc" - ["ids"]="@com_google_googleapis//google/cloud/ids/v1:ids_cc_grpc" + "@googleapis//google/cloud/gkehub/v1:gkehub_cc_grpc" \ + "@googleapis//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress_cc_grpc" \ + "@googleapis//google/cloud/gkehub/v1/configmanagement:configmanagement_cc_grpc" + )" + ["gkemulticloud"]="@googleapis//google/cloud/gkemulticloud/v1:gkemulticloud_cc_grpc" + ["grafeas"]="@googleapis//grafeas/v1:grafeas_cc_grpc" + ["iam"]="@googleapis//google/iam/admin/v1:admin_cc_grpc" + ["iam_v2"]="@googleapis//google/iam/v2:iam_cc_grpc" + ["iam_v3"]="@googleapis//google/iam/v3:iam_cc_grpc" + ["iap"]="@googleapis//google/cloud/iap/v1:iap_cc_grpc" + ["ids"]="@googleapis//google/cloud/ids/v1:ids_cc_grpc" ["kms"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/kms/v1:kms_cc_grpc" \ - "@com_google_googleapis//google/cloud/kms/inventory/v1:inventory_cc_grpc" + "@googleapis//google/cloud/kms/v1:kms_cc_grpc" \ + "@googleapis//google/cloud/kms/inventory/v1:inventory_cc_grpc" )" ["language"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/language/v1:language_cc_grpc" \ - "@com_google_googleapis//google/cloud/language/v2:language_cc_grpc" + "@googleapis//google/cloud/language/v1:language_cc_grpc" \ + "@googleapis//google/cloud/language/v2:language_cc_grpc" )" - ["licensemanager"]="@com_google_googleapis//google/cloud/licensemanager/v1:licensemanager_cc_grpc" - ["logging_type"]="@com_google_googleapis//google/logging/type:type_cc_grpc" - ["logging"]="@com_google_googleapis//google/logging/v2:logging_cc_grpc" - ["lustre"]="@com_google_googleapis//google/cloud/lustre/v1:lustre_cc_grpc" - ["maintenance"]="@com_google_googleapis//google/cloud/maintenance/api/v1:api_cc_grpc" - ["managedidentities"]="@com_google_googleapis//google/cloud/managedidentities/v1:managedidentities_cc_grpc" + ["licensemanager"]="@googleapis//google/cloud/licensemanager/v1:licensemanager_cc_grpc" + ["logging_type"]="@googleapis//google/logging/type:type_cc_grpc" + ["logging"]="@googleapis//google/logging/v2:logging_cc_grpc" + ["lustre"]="@googleapis//google/cloud/lustre/v1:lustre_cc_grpc" + ["maintenance"]="@googleapis//google/cloud/maintenance/api/v1:api_cc_grpc" + ["managedidentities"]="@googleapis//google/cloud/managedidentities/v1:managedidentities_cc_grpc" ["managedkafka"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/managedkafka/schemaregistry/v1:schemaregistry_cc_grpc" \ - "@com_google_googleapis//google/cloud/managedkafka/v1:managedkafka_cc_grpc" + "@googleapis//google/cloud/managedkafka/schemaregistry/v1:schemaregistry_cc_grpc" \ + "@googleapis//google/cloud/managedkafka/v1:managedkafka_cc_grpc" )" - ["memcache"]="@com_google_googleapis//google/cloud/memcache/v1:memcache_cc_grpc" - ["memorystore"]="@com_google_googleapis//google/cloud/memorystore/v1:memorystore_cc_grpc" + ["memcache"]="@googleapis//google/cloud/memcache/v1:memcache_cc_grpc" + ["memorystore"]="@googleapis//google/cloud/memorystore/v1:memorystore_cc_grpc" ["metastore"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/metastore/logging/v1:logging_cc_grpc" \ - "@com_google_googleapis//google/cloud/metastore/v1:metastore_cc_grpc" + "@googleapis//google/cloud/metastore/logging/v1:logging_cc_grpc" \ + "@googleapis//google/cloud/metastore/v1:metastore_cc_grpc" )" - ["migrationcenter"]="@com_google_googleapis//google/cloud/migrationcenter/v1:migrationcenter_cc_grpc" + ["migrationcenter"]="@googleapis//google/cloud/migrationcenter/v1:migrationcenter_cc_grpc" ["monitoring"]="$( printf ",%s" \ - "@com_google_googleapis//google/monitoring/v3:monitoring_cc_grpc" \ - "@com_google_googleapis//google/monitoring/dashboard/v1:dashboard_cc_grpc" \ - "@com_google_googleapis//google/monitoring/metricsscope/v1:metricsscope_cc_grpc" + "@googleapis//google/monitoring/v3:monitoring_cc_grpc" \ + "@googleapis//google/monitoring/dashboard/v1:dashboard_cc_grpc" \ + "@googleapis//google/monitoring/metricsscope/v1:metricsscope_cc_grpc" )" - ["netapp"]="@com_google_googleapis//google/cloud/netapp/v1:netapp_cc_grpc" - ["networkconnectivity"]="@com_google_googleapis//google/cloud/networkconnectivity/v1:networkconnectivity_cc_grpc" - ["networkmanagement"]="@com_google_googleapis//google/cloud/networkmanagement/v1:networkmanagement_cc_grpc" - ["networksecurity"]="@com_google_googleapis//google/cloud/networksecurity/v1:networksecurity_cc_grpc" - ["networkservices"]="@com_google_googleapis//google/cloud/networkservices/v1:networkservices_cc_grpc" + ["netapp"]="@googleapis//google/cloud/netapp/v1:netapp_cc_grpc" + ["networkconnectivity"]="@googleapis//google/cloud/networkconnectivity/v1:networkconnectivity_cc_grpc" + ["networkmanagement"]="@googleapis//google/cloud/networkmanagement/v1:networkmanagement_cc_grpc" + ["networksecurity"]="@googleapis//google/cloud/networksecurity/v1:networksecurity_cc_grpc" + ["networkservices"]="@googleapis//google/cloud/networkservices/v1:networkservices_cc_grpc" ["notebooks"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/notebooks/v1:notebooks_cc_grpc" \ - "@com_google_googleapis//google/cloud/notebooks/v2:notebooks_cc_grpc" + "@googleapis//google/cloud/notebooks/v1:notebooks_cc_grpc" \ + "@googleapis//google/cloud/notebooks/v2:notebooks_cc_grpc" )" - ["optimization"]="@com_google_googleapis//google/cloud/optimization/v1:optimization_cc_grpc" - ["oracledatabase"]="@com_google_googleapis//google/cloud/oracledatabase/v1:oracledatabase_cc_grpc" - ["orgpolicy"]="@com_google_googleapis//google/cloud/orgpolicy/v2:orgpolicy_cc_grpc" + ["optimization"]="@googleapis//google/cloud/optimization/v1:optimization_cc_grpc" + ["oracledatabase"]="@googleapis//google/cloud/oracledatabase/v1:oracledatabase_cc_grpc" + ["orgpolicy"]="@googleapis//google/cloud/orgpolicy/v2:orgpolicy_cc_grpc" ["osconfig"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:agentendpoint_cc_grpc" \ - "@com_google_googleapis//google/cloud/osconfig/v1:osconfig_cc_grpc" + "@googleapis//google/cloud/osconfig/agentendpoint/v1:agentendpoint_cc_grpc" \ + "@googleapis//google/cloud/osconfig/v1:osconfig_cc_grpc" )" ["oslogin"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/oslogin/v1:oslogin_cc_grpc" \ - "@com_google_googleapis//google/cloud/oslogin/common:common_cc_grpc" + "@googleapis//google/cloud/oslogin/v1:oslogin_cc_grpc" \ + "@googleapis//google/cloud/oslogin/common:common_cc_grpc" )" - ["parametermanager"]="@com_google_googleapis//google/cloud/parametermanager/v1:parametermanager_cc_grpc" - ["parallelstore"]="@com_google_googleapis//google/cloud/parallelstore/v1:parallelstore_cc_grpc" - ["policysimulator"]="@com_google_googleapis//google/cloud/policysimulator/v1:policysimulator_cc_grpc" + ["parametermanager"]="@googleapis//google/cloud/parametermanager/v1:parametermanager_cc_grpc" + ["parallelstore"]="@googleapis//google/cloud/parallelstore/v1:parallelstore_cc_grpc" + ["policysimulator"]="@googleapis//google/cloud/policysimulator/v1:policysimulator_cc_grpc" ["policytroubleshooter"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/policytroubleshooter/v1:policytroubleshooter_cc_grpc" \ - "@com_google_googleapis//google/cloud/policytroubleshooter/iam/v3:iam_cc_grpc" - )" - ["privateca"]="@com_google_googleapis//google/cloud/security/privateca/v1:privateca_cc_grpc" - ["privilegedaccessmanager"]="@com_google_googleapis//google/cloud/privilegedaccessmanager/v1:privilegedaccessmanager_cc_grpc" - ["profiler"]="@com_google_googleapis//google/devtools/cloudprofiler/v2:cloudprofiler_cc_grpc" - ["publicca"]="@com_google_googleapis//google/cloud/security/publicca/v1:publicca_cc_grpc" - ["pubsub"]="@com_google_googleapis//google/pubsub/v1:pubsub_cc_grpc" - ["pubsublite"]="@com_google_googleapis//google/cloud/pubsublite/v1:pubsublite_cc_grpc" - ["rapidmigrationassessment"]="@com_google_googleapis//google/cloud/rapidmigrationassessment/v1:rapidmigrationassessment_cc_grpc" - ["recaptchaenterprise"]="@com_google_googleapis//google/cloud/recaptchaenterprise/v1:recaptchaenterprise_cc_grpc" + "@googleapis//google/cloud/policytroubleshooter/v1:policytroubleshooter_cc_grpc" \ + "@googleapis//google/cloud/policytroubleshooter/iam/v3:iam_cc_grpc" + )" + ["privateca"]="@googleapis//google/cloud/security/privateca/v1:privateca_cc_grpc" + ["privilegedaccessmanager"]="@googleapis//google/cloud/privilegedaccessmanager/v1:privilegedaccessmanager_cc_grpc" + ["profiler"]="@googleapis//google/devtools/cloudprofiler/v2:cloudprofiler_cc_grpc" + ["publicca"]="@googleapis//google/cloud/security/publicca/v1:publicca_cc_grpc" + ["pubsub"]="@googleapis//google/pubsub/v1:pubsub_cc_grpc" + ["pubsublite"]="@googleapis//google/cloud/pubsublite/v1:pubsublite_cc_grpc" + ["rapidmigrationassessment"]="@googleapis//google/cloud/rapidmigrationassessment/v1:rapidmigrationassessment_cc_grpc" + ["recaptchaenterprise"]="@googleapis//google/cloud/recaptchaenterprise/v1:recaptchaenterprise_cc_grpc" ["recommender"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/recommender/v1:recommender_cc_grpc" \ - "@com_google_googleapis//google/cloud/recommender/logging/v1:logging_cc_grpc" + "@googleapis//google/cloud/recommender/v1:recommender_cc_grpc" \ + "@googleapis//google/cloud/recommender/logging/v1:logging_cc_grpc" )" ["redis"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/redis/cluster/v1:cluster_cc_grpc" \ - "@com_google_googleapis//google/cloud/redis/v1:redis_cc_grpc" + "@googleapis//google/cloud/redis/cluster/v1:cluster_cc_grpc" \ + "@googleapis//google/cloud/redis/v1:redis_cc_grpc" )" - ["resourcemanager"]="@com_google_googleapis//google/cloud/resourcemanager/v3:resourcemanager_cc_grpc" - ["retail"]="@com_google_googleapis//google/cloud/retail/v2:retail_cc_grpc" - ["run"]="@com_google_googleapis//google/cloud/run/v2:run_cc_grpc" - ["scheduler"]="@com_google_googleapis//google/cloud/scheduler/v1:scheduler_cc_grpc" + ["resourcemanager"]="@googleapis//google/cloud/resourcemanager/v3:resourcemanager_cc_grpc" + ["retail"]="@googleapis//google/cloud/retail/v2:retail_cc_grpc" + ["run"]="@googleapis//google/cloud/run/v2:run_cc_grpc" + ["scheduler"]="@googleapis//google/cloud/scheduler/v1:scheduler_cc_grpc" ["secretmanager"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/secretmanager/v1:secretmanager_cc_grpc" \ - "@com_google_googleapis//google/cloud/secretmanager/logging/v1:logging_cc_grpc" + "@googleapis//google/cloud/secretmanager/v1:secretmanager_cc_grpc" \ + "@googleapis//google/cloud/secretmanager/logging/v1:logging_cc_grpc" )" - ["securesourcemanager"]="@com_google_googleapis//google/cloud/securesourcemanager/v1:securesourcemanager_cc_grpc" + ["securesourcemanager"]="@googleapis//google/cloud/securesourcemanager/v1:securesourcemanager_cc_grpc" ["securitycenter"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/securitycenter/v1:securitycenter_cc_grpc" \ - "@com_google_googleapis//google/cloud/securitycenter/v2:securitycenter_cc_grpc" + "@googleapis//google/cloud/securitycenter/v1:securitycenter_cc_grpc" \ + "@googleapis//google/cloud/securitycenter/v2:securitycenter_cc_grpc" )" - ["securitycentermanagement"]="@com_google_googleapis//google/cloud/securitycentermanagement/v1:securitycentermanagement_cc_grpc" + ["securitycentermanagement"]="@googleapis//google/cloud/securitycentermanagement/v1:securitycentermanagement_cc_grpc" ["servicecontrol"]="$( printf ",%s" \ - "@com_google_googleapis//google/api/servicecontrol/v1:servicecontrol_cc_grpc" \ - "@com_google_googleapis//google/api/servicecontrol/v2:servicecontrol_cc_grpc" + "@googleapis//google/api/servicecontrol/v1:servicecontrol_cc_grpc" \ + "@googleapis//google/api/servicecontrol/v2:servicecontrol_cc_grpc" )" - ["servicedirectory"]="@com_google_googleapis//google/cloud/servicedirectory/v1:servicedirectory_cc_grpc" + ["servicedirectory"]="@googleapis//google/cloud/servicedirectory/v1:servicedirectory_cc_grpc" ["servicehealth"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/servicehealth/v1:servicehealth_cc_grpc" \ - "@com_google_googleapis//google/cloud/servicehealth/logging/v1:logging_cc_grpc" + "@googleapis//google/cloud/servicehealth/v1:servicehealth_cc_grpc" \ + "@googleapis//google/cloud/servicehealth/logging/v1:logging_cc_grpc" )" - ["servicemanagement"]="@com_google_googleapis//google/api/servicemanagement/v1:servicemanagement_cc_grpc" - ["serviceusage"]="@com_google_googleapis//google/api/serviceusage/v1:serviceusage_cc_grpc" - ["shell"]="@com_google_googleapis//google/cloud/shell/v1:shell_cc_grpc" + ["servicemanagement"]="@googleapis//google/api/servicemanagement/v1:servicemanagement_cc_grpc" + ["serviceusage"]="@googleapis//google/api/serviceusage/v1:serviceusage_cc_grpc" + ["shell"]="@googleapis//google/cloud/shell/v1:shell_cc_grpc" ["spanner"]="$( printf ",%s" \ - "@com_google_googleapis//google/spanner/v1:spanner_cc_grpc" \ - "@com_google_googleapis//google/spanner/admin/instance/v1:instance_cc_grpc" \ - "@com_google_googleapis//google/spanner/admin/database/v1:database_cc_grpc" + "@googleapis//google/spanner/v1:spanner_cc_grpc" \ + "@googleapis//google/spanner/admin/instance/v1:instance_cc_grpc" \ + "@googleapis//google/spanner/admin/database/v1:database_cc_grpc" )" ["speech"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/speech/v1:speech_cc_grpc" \ - "@com_google_googleapis//google/cloud/speech/v2:speech_cc_grpc" - )" - ["sql"]="@com_google_googleapis//google/cloud/sql/v1:sql_cc_proto" - ["storage"]="@com_google_googleapis//google/storage/v2:storage_cc_grpc" - ["storagebatchoperations"]="@com_google_googleapis//google/cloud/storagebatchoperations/v1:storagebatchoperations_cc_grpc" - ["storagecontrol"]="@com_google_googleapis//google/storage/control/v2:control_cc_grpc" - ["storageinsights"]="@com_google_googleapis//google/cloud/storageinsights/v1:storageinsights_cc_grpc" - ["storagetransfer"]="@com_google_googleapis//google/storagetransfer/v1:storagetransfer_cc_grpc" - ["support"]="@com_google_googleapis//google/cloud/support/v2:support_cc_grpc" - ["talent"]="@com_google_googleapis//google/cloud/talent/v4:talent_cc_grpc" - ["tasks"]="@com_google_googleapis//google/cloud/tasks/v2:tasks_cc_grpc" - ["telcoautomation"]="@com_google_googleapis//google/cloud/telcoautomation/v1:telcoautomation_cc_grpc" - ["texttospeech"]="@com_google_googleapis//google/cloud/texttospeech/v1:texttospeech_cc_grpc" - ["timeseriesinsights"]="@com_google_googleapis//google/cloud/timeseriesinsights/v1:timeseriesinsights_cc_grpc" + "@googleapis//google/cloud/speech/v1:speech_cc_grpc" \ + "@googleapis//google/cloud/speech/v2:speech_cc_grpc" + )" + ["sql"]="@googleapis//google/cloud/sql/v1:sql_cc_proto" + ["storage"]="@googleapis//google/storage/v2:storage_cc_grpc" + ["storagebatchoperations"]="@googleapis//google/cloud/storagebatchoperations/v1:storagebatchoperations_cc_grpc" + ["storagecontrol"]="@googleapis//google/storage/control/v2:control_cc_grpc" + ["storageinsights"]="@googleapis//google/cloud/storageinsights/v1:storageinsights_cc_grpc" + ["storagetransfer"]="@googleapis//google/storagetransfer/v1:storagetransfer_cc_grpc" + ["support"]="@googleapis//google/cloud/support/v2:support_cc_grpc" + ["talent"]="@googleapis//google/cloud/talent/v4:talent_cc_grpc" + ["tasks"]="@googleapis//google/cloud/tasks/v2:tasks_cc_grpc" + ["telcoautomation"]="@googleapis//google/cloud/telcoautomation/v1:telcoautomation_cc_grpc" + ["texttospeech"]="@googleapis//google/cloud/texttospeech/v1:texttospeech_cc_grpc" + ["timeseriesinsights"]="@googleapis//google/cloud/timeseriesinsights/v1:timeseriesinsights_cc_grpc" ["tpu"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/tpu/v1:tpu_cc_grpc" \ - "@com_google_googleapis//google/cloud/tpu/v2:tpu_cc_grpc" + "@googleapis//google/cloud/tpu/v1:tpu_cc_grpc" \ + "@googleapis//google/cloud/tpu/v2:tpu_cc_grpc" )" ["trace"]="$( printf ",%s" \ - "@com_google_googleapis//google/devtools/cloudtrace/v1:cloudtrace_cc_grpc" \ - "@com_google_googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc" + "@googleapis//google/devtools/cloudtrace/v1:cloudtrace_cc_grpc" \ + "@googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc" )" - ["translate"]="@com_google_googleapis//google/cloud/translate/v3:translation_cc_grpc" + ["translate"]="@googleapis//google/cloud/translate/v3:translation_cc_grpc" ["video"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/video/livestream/v1:livestream_cc_grpc" \ - "@com_google_googleapis//google/cloud/video/stitcher/v1:stitcher_cc_grpc" \ - "@com_google_googleapis//google/cloud/video/transcoder/v1:transcoder_cc_grpc" - )" - ["videointelligence"]="@com_google_googleapis//google/cloud/videointelligence/v1:videointelligence_cc_grpc" - ["vision"]="@com_google_googleapis//google/cloud/vision/v1:vision_cc_grpc" - ["vmmigration"]="@com_google_googleapis//google/cloud/vmmigration/v1:vmmigration_cc_grpc" - ["vmwareengine"]="@com_google_googleapis//google/cloud/vmwareengine/v1:vmwareengine_cc_grpc" - ["vpcaccess"]="@com_google_googleapis//google/cloud/vpcaccess/v1:vpcaccess_cc_grpc" - ["webrisk"]="@com_google_googleapis//google/cloud/webrisk/v1:webrisk_cc_grpc" - ["websecurityscanner"]="@com_google_googleapis//google/cloud/websecurityscanner/v1:websecurityscanner_cc_grpc" + "@googleapis//google/cloud/video/livestream/v1:livestream_cc_grpc" \ + "@googleapis//google/cloud/video/stitcher/v1:stitcher_cc_grpc" \ + "@googleapis//google/cloud/video/transcoder/v1:transcoder_cc_grpc" + )" + ["videointelligence"]="@googleapis//google/cloud/videointelligence/v1:videointelligence_cc_grpc" + ["vision"]="@googleapis//google/cloud/vision/v1:vision_cc_grpc" + ["vmmigration"]="@googleapis//google/cloud/vmmigration/v1:vmmigration_cc_grpc" + ["vmwareengine"]="@googleapis//google/cloud/vmwareengine/v1:vmwareengine_cc_grpc" + ["vpcaccess"]="@googleapis//google/cloud/vpcaccess/v1:vpcaccess_cc_grpc" + ["webrisk"]="@googleapis//google/cloud/webrisk/v1:webrisk_cc_grpc" + ["websecurityscanner"]="@googleapis//google/cloud/websecurityscanner/v1:websecurityscanner_cc_grpc" ["workflows"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/workflows/v1:workflows_cc_grpc" \ - "@com_google_googleapis//google/cloud/workflows/type:type_cc_grpc" \ - "@com_google_googleapis//google/cloud/workflows/executions/v1:executions_cc_grpc" + "@googleapis//google/cloud/workflows/v1:workflows_cc_grpc" \ + "@googleapis//google/cloud/workflows/type:type_cc_grpc" \ + "@googleapis//google/cloud/workflows/executions/v1:executions_cc_grpc" )" ["workstations"]="$( printf ",%s" \ - "@com_google_googleapis//google/cloud/workstations/logging/v1:logging_cc_grpc" \ - "@com_google_googleapis//google/cloud/workstations/v1:workstations_cc_grpc" + "@googleapis//google/cloud/workstations/logging/v1:logging_cc_grpc" \ + "@googleapis//google/cloud/workstations/v1:workstations_cc_grpc" )" ) @@ -379,7 +379,7 @@ for library in "${keys[@]}"; do >>"external/googleapis/protolists/${library}.list" || true bazelisk query --noshow_progress --noshow_loading_progress \ "deps(${rule})" | - grep "@com_google_googleapis//" | grep _proto | + grep "@googleapis//" | grep _proto | grep -v "${path}" \ >>"external/googleapis/protodeps/${library}.deps" || true done @@ -392,5 +392,5 @@ done # TODO(#11694) - the Bazel file introduces a dependency that we do not build. # Fortunately (maybe?) we do not use or need the dep until the issue is # resolved. -sed -i '/@com_google_googleapis\/\/google\/cloud\/location:location_proto/d' \ +sed -i '/@googleapis\/\/google\/cloud\/location:location_proto/d' \ "external/googleapis/protodeps/datamigration.deps" diff --git a/generator/BUILD.bazel b/generator/BUILD.bazel index 50509b159bcb9..13f4a6b5b4e20 100644 --- a/generator/BUILD.bazel +++ b/generator/BUILD.bazel @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") load(":google_cloud_cpp_generator.bzl", "google_cloud_cpp_generator_hdrs", "google_cloud_cpp_generator_srcs") load(":google_cloud_cpp_generator_testing.bzl", "google_cloud_cpp_generator_testing_hdrs", "google_cloud_cpp_generator_testing_srcs") load(":google_cloud_cpp_generator_unit_tests.bzl", "google_cloud_cpp_generator_unit_tests") @@ -33,17 +35,16 @@ cc_library( ":generator_config_cc_proto", "//:common", "//google/cloud:google_cloud_cpp_rest_internal", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:json", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_googleapis//:googleapis_system_includes", - "@com_google_googleapis//google/api:client_cc_proto", - "@com_google_googleapis//google/api:field_info_cc_proto", - "@com_google_googleapis//google/api:routing_cc_proto", - "@com_google_googleapis//google/cloud:extended_operations_cc_proto", - "@com_google_googleapis//google/longrunning:longrunning_cc_proto", "@com_google_protobuf//:protoc_lib", + "@googleapis//google/api:client_cc_proto", + "@googleapis//google/api:field_info_cc_proto", + "@googleapis//google/api:routing_cc_proto", + "@googleapis//google/cloud:extended_operations_cc_proto", + "@googleapis//google/longrunning:longrunning_cc_proto", + "@nlohmann_json//:json", ], ) @@ -61,8 +62,8 @@ cc_library( ":google_cloud_cpp_generator", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/longrunning:longrunning_cc_proto", - "@com_google_googletest//:gtest", + "@googleapis//google/longrunning:longrunning_cc_proto", + "@googletest//:gtest", ], ) @@ -78,7 +79,7 @@ cc_library( ":google_cloud_cpp_generator", ":google_cloud_cpp_generator_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) for test in google_cloud_cpp_generator_unit_tests] @@ -116,8 +117,8 @@ cc_binary( deps = [ ":generator_config_cc_proto", ":google_cloud_cpp_generator", - "@com_google_absl//absl/flags:commandlineflag", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/flags:parse", + "@abseil-cpp//absl/flags:commandlineflag", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/flags:parse", ], ) diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 8503589dcb862..c73b32393e338 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -27,7 +27,7 @@ find_package(Protobuf CONFIG QUIET) if (NOT Protobuf_FOUND) find_package(Protobuf REQUIRED) endif () -include(IncludeNlohmannJson) +find_package(nlohmann_json CONFIG REQUIRED) find_package(yaml-cpp CONFIG REQUIRED) add_library( diff --git a/generator/generator.cc b/generator/generator.cc index 50d18f34f9349..efb19a20568ec 100644 --- a/generator/generator.cc +++ b/generator/generator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/filesystem.h" #include "google/cloud/status_or.h" #include "absl/strings/str_split.h" -#include +#include "google/api/client.pb.h" #include #include #include @@ -72,7 +72,8 @@ bool Generator::Generate(google::protobuf::FileDescriptor const* file, services.reserve(file->service_count()); for (int i = 0; i < file->service_count(); ++i) { auto const* service = file->service(i); - if (!internal::Contains(omitted_services, service->name())) { + if (!internal::Contains(omitted_services, service->name()) && + !internal::Contains(omitted_services, service->full_name())) { services.push_back(generator_internal::MakeGenerators( service, context, service_config, *command_line_args)); } diff --git a/generator/generator_test.cc b/generator/generator_test.cc index d0400c9d29860..118b3e4f88ab1 100644 --- a/generator/generator_test.cc +++ b/generator/generator_test.cc @@ -17,9 +17,9 @@ #include "generator/testing/error_collectors.h" #include "generator/testing/fake_source_tree.h" #include "generator/testing/printer_mocks.h" +#include "google/protobuf/descriptor.pb.h" #include #include -#include #include #include diff --git a/generator/integration_tests/BUILD.bazel b/generator/integration_tests/BUILD.bazel index 597fae36f8cf0..813e330609502 100644 --- a/generator/integration_tests/BUILD.bazel +++ b/generator/integration_tests/BUILD.bazel @@ -12,12 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load( - "@com_google_googleapis_imports//:imports.bzl", - "cc_grpc_library", - "cc_proto_library", -) -load("@rules_proto//proto:defs.bzl", "proto_library") +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") package(default_visibility = ["//visibility:private"]) @@ -34,22 +31,22 @@ proto_library( "test_request_id.proto", ], deps = [ - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/api:client_proto", - "@com_google_googleapis//google/api:field_behavior_proto", - "@com_google_googleapis//google/api:field_info_proto", - "@com_google_googleapis//google/api:resource_proto", - "@com_google_googleapis//google/api:routing_proto", - "@com_google_googleapis//google/iam/v1:iam_policy_proto", - "@com_google_googleapis//google/iam/v1:policy_proto", - "@com_google_googleapis//google/longrunning:operations_proto", - "@com_google_googleapis//google/rpc:status_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:empty_proto", "@com_google_protobuf//:field_mask_proto", "@com_google_protobuf//:struct_proto", "@com_google_protobuf//:timestamp_proto", + "@googleapis//google/api:annotations_proto", + "@googleapis//google/api:client_proto", + "@googleapis//google/api:field_behavior_proto", + "@googleapis//google/api:field_info_proto", + "@googleapis//google/api:resource_proto", + "@googleapis//google/api:routing_proto", + "@googleapis//google/iam/v1:iam_policy_proto", + "@googleapis//google/iam/v1:policy_proto", + "@googleapis//google/longrunning:operations_proto", + "@googleapis//google/rpc:status_proto", ], ) @@ -67,10 +64,13 @@ cc_grpc_library( filegroup( name = "golden_srcs", - srcs = glob([ - "golden/v1/internal/*_sources.cc", - "golden/v1/internal/streaming.cc", - ]), + srcs = glob( + [ + "golden/v1/internal/*_sources.cc", + "golden/v1/internal/streaming.cc", + ], + allow_empty = True, + ), ) filegroup( @@ -106,8 +106,8 @@ cc_library( "//:grpc_utils", "//google/cloud:google_cloud_cpp_rest_internal", "//google/cloud:google_cloud_cpp_rest_protobuf_internal", - "@com_google_absl//absl/strings", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", + "@abseil-cpp//absl/strings", + "@googleapis//google/longrunning:longrunning_cc_grpc", ], ) @@ -132,7 +132,7 @@ filegroup( "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in glob(["tests/*.cc"])] diff --git a/generator/integration_tests/benchmarks/client_benchmark.cc b/generator/integration_tests/benchmarks/client_benchmark.cc index 44ae46eba7e57..d73959e361212 100644 --- a/generator/integration_tests/benchmarks/client_benchmark.cc +++ b/generator/integration_tests/benchmarks/client_benchmark.cc @@ -19,14 +19,14 @@ #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h" #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h" #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/log.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/deprecated_connection.h b/generator/integration_tests/golden/v1/deprecated_connection.h index f4727a71ea2d9..2e25bcaa34df5 100644 --- a/generator/integration_tests/golden/v1/deprecated_connection.h +++ b/generator/integration_tests/golden/v1/deprecated_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_deprecated.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h index 1c4e23e7e3a60..c29fb07e877c4 100644 --- a/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h index a62131b8c8d5f..dea985bb4ff51 100644 --- a/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h @@ -25,7 +25,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/protobuf/duration.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h index 6c7ac2a9bd245..9d130a614e51b 100644 --- a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h @@ -29,8 +29,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "generator/integration_tests/backup.pb.h" +#include "generator/integration_tests/test.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h index cfb7da3604b1f..50018df400595 100644 --- a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h @@ -21,10 +21,10 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "generator/integration_tests/test.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/golden_rest_only_connection.h b/generator/integration_tests/golden/v1/golden_rest_only_connection.h index 49b0a925e4378..283afea78c8d1 100644 --- a/generator/integration_tests/golden/v1/golden_rest_only_connection.h +++ b/generator/integration_tests/golden/v1/golden_rest_only_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test2.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/golden_rest_only_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/golden_rest_only_connection_idempotency_policy.h index 50bb4d53d89a4..85bca182f6dca 100644 --- a/generator/integration_tests/golden/v1/golden_rest_only_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/golden_rest_only_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test2.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/golden_thing_admin_client.h b/generator/integration_tests/golden/v1/golden_thing_admin_client.h index e86ade00888e6..01dd5d8a41830 100644 --- a/generator/integration_tests/golden/v1/golden_thing_admin_client.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_client.h @@ -28,7 +28,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "google/cloud/iam_updater.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/golden_thing_admin_connection.h b/generator/integration_tests/golden/v1/golden_thing_admin_connection.h index d30c8e892f3db..83f4108f646e8 100644 --- a/generator/integration_tests/golden/v1/golden_thing_admin_connection.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_connection.h @@ -30,9 +30,9 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "generator/integration_tests/backup.pb.h" +#include "generator/integration_tests/test.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h index 660653e2db819..7ae7345fd84ab 100644 --- a/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h @@ -21,9 +21,9 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "generator/integration_tests/test.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc index 1fc8379cae6a3..4b5cdf1a45e03 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc @@ -17,7 +17,7 @@ // source: generator/integration_tests/test_deprecated.proto #include "generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc index 16172166b5c33..03fbb27d3a763 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc @@ -19,7 +19,7 @@ #include "generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc index 3e639da2f2e49..0a199d9229112 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h index 7b682de3e278f..9f9bf38be0e29 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h @@ -24,7 +24,7 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_deprecated.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h index 3de817571145e..f4754e705e3e5 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_deprecated.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc index e93d035098e3d..8710bc4c04e40 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc +++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test_deprecated.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h index dbf2efee3ac36..c5ce59c4efc35 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h +++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h @@ -24,7 +24,7 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_deprecated.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub.cc b/generator/integration_tests/golden/v1/internal/deprecated_stub.cc index cbad6955ba0a6..0625268f20bf2 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_stub.cc +++ b/generator/integration_tests/golden/v1/internal/deprecated_stub.cc @@ -19,7 +19,7 @@ #include "generator/integration_tests/golden/v1/internal/deprecated_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub.h b/generator/integration_tests/golden/v1/internal/deprecated_stub.h index 36a20e1f1a5da..2b98ae17ad3ec 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_stub.h +++ b/generator/integration_tests/golden/v1/internal/deprecated_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc b/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc index a9b7623d84f4b..f097a52df8b25 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "generator/integration_tests/test_deprecated.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc index d13c81924d3e5..6b12cb658120c 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc +++ b/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 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 MakeDeprecatedServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h b/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h index eefcbb36a1f18..541576c6d8c55 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h +++ b/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 child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc index a56fb521c6ba5..6165249246488 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc +++ b/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 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 MakeDeprecatedServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h b/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h index 9e2297a69573a..a9f2187d5181e 100644 --- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h +++ b/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 propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc index 9ba86c1582d76..97975637829e5 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/async_streaming_read_rpc_auth.h" #include "google/cloud/internal/async_streaming_write_rpc_auth.h" #include "google/cloud/internal/streaming_write_rpc_impl.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc index ddbd94428d4f6..7732e30c5f7e7 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/internal/streaming_write_rpc_logging.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc index 42de8cb22315a..8789ba59f5ba4 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h index df10cae810a7f..1685990b2dc14 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h @@ -24,7 +24,7 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h index be9f9bc99b00f..76cbdfe28c54b 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc index c99d9c8015f51..d5441b5ae0fff 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h index 5967727ed7a73..682ed67a59950 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h @@ -24,11 +24,11 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "generator/integration_tests/backup.pb.h" +#include "google/cloud/location/locations.pb.h" +#include "google/iam/v1/iam_policy.pb.h" +#include "google/longrunning/operations.pb.h" +#include "generator/integration_tests/test.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc index 116f81d935b47..dda2c3b626219 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc @@ -23,7 +23,7 @@ #include "google/cloud/internal/async_streaming_write_rpc_impl.h" #include "google/cloud/internal/streaming_write_rpc_impl.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h index 9051aadd25728..c8bd99e3e6651 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h @@ -29,11 +29,11 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "generator/integration_tests/backup.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" +#include "generator/integration_tests/test.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc index b3b0beca42d6d..875a4df8ce3a3 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc @@ -28,10 +28,10 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "generator/integration_tests/test.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc index c1cd546b9b301..ce259785752b9 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc +++ b/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 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 MakeGoldenKitchenSinkTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h index ab3c947fc10fa..62f8387932398 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h +++ b/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 child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc index 32f1dcee73593..82d46ba4c875c 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc +++ b/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 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 MakeGoldenKitchenSinkTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h index 5713f2b4a7fac..a7e1bc20a3fa4 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h +++ b/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 propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_logging_decorator.h index 619143e1aebeb..f5964745c3f52 100644 --- a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_logging_decorator.h @@ -24,7 +24,7 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test2.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.h index 3235417000a87..e774ad23b639f 100644 --- a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test2.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.cc index 1c4d0945bc7ab..eec6a0109306e 100644 --- a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test2.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.h b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.h index 7277a95c1ca9a..0fe224a7b8de3 100644 --- a/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_rest_only_rest_stub.h @@ -24,7 +24,7 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test2.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.cc index f55f4fb1c958f..0cba6dedbdf53 100644 --- a/generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.cc +++ b/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 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 MakeGoldenRestOnlyTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.h b/generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.h index 4938ea49facbc..d8570f8c7564c 100644 --- a/generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.h +++ b/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 child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc index 0bd19f49b07e3..affc8755deb93 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: generator/integration_tests/test.proto #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h index ba01c26554ab8..33c54dcb86f0f 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h index 54f892d78bdb5..c4290e915f619 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc index 0b7b3163e3803..3d8683829ae1d 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h index 07519724e30e0..fab154490b31f 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc index 5e2e6b5dcd5f8..516eb9f2dc8c1 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h index ae81704e87b18..a6086adec04e6 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_connection_impl.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_connection_impl.h index cf40b64cf244f..5724dd54f0276 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_connection_impl.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_connection_impl.h @@ -30,7 +30,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h index 8564cbbc67794..daa327d9cd76b 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h @@ -24,8 +24,8 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include +#include "generator/integration_tests/test.pb.h" +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h index 7345b0754e766..fd3794aea77d4 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h @@ -23,8 +23,8 @@ #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include +#include "generator/integration_tests/test.pb.h" +#include "google/longrunning/operations.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc index fba4abc3082e8..78c4620573bc1 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc @@ -21,8 +21,8 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include +#include "generator/integration_tests/test.pb.h" +#include "google/longrunning/operations.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h index a8da517cd5c60..342a94718c7fb 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h @@ -24,10 +24,10 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "generator/integration_tests/backup.pb.h" +#include "google/cloud/location/locations.pb.h" +#include "google/longrunning/operations.pb.h" +#include "generator/integration_tests/test.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc index d55035d5fe0ad..7ef05739d2fc9 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc @@ -19,8 +19,8 @@ #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "generator/integration_tests/test.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h index 3591f12bc6e0b..51fe44dc679ac 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h @@ -24,10 +24,10 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "generator/integration_tests/backup.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" +#include "generator/integration_tests/test.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc index 00515d63f390e..f954210331aaf 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc @@ -28,9 +28,9 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "generator/integration_tests/test.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc index dd53241b4bc6b..de42374fbfa9c 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_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 - GoldenThingAdminTracingConnection::GoldenThingAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -304,16 +302,12 @@ GoldenThingAdminTracingConnection::AsyncDropDatabase(google::test::admin::databa return internal::EndSpan(std::move(span), child_->AsyncDropDatabase(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGoldenThingAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.h index 5d14f538b444b..6d446df563c95 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_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 GoldenThingAdminTracingConnection : public golden_v1::GoldenThingAdminConnection { public: @@ -150,8 +148,6 @@ class GoldenThingAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc index 47aa68eba184f..3af68b1fbee6d 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_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 - GoldenThingAdminTracingStub::GoldenThingAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -377,15 +375,9 @@ future GoldenThingAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGoldenThingAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.h index 83ed2aeff5258..2955a2f9ba764 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_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 GoldenThingAdminTracingStub : public GoldenThingAdminStub { public: ~GoldenThingAdminTracingStub() override = default; @@ -197,8 +195,6 @@ class GoldenThingAdminTracingStub : public GoldenThingAdminStub { std::shared_ptr propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.cc index 872f68ee68c4c..4d7b66f1fd57a 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.cc @@ -17,7 +17,7 @@ // source: generator/integration_tests/test_request_id.proto #include "generator/integration_tests/golden/v1/internal/request_id_auth_decorator.h" -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.h b/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.h index 8d87238884abc..1292223c9da21 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.h +++ b/generator/integration_tests/golden/v1/internal/request_id_auth_decorator.h @@ -22,7 +22,7 @@ #include "generator/integration_tests/golden/v1/internal/request_id_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_connection_impl.h b/generator/integration_tests/golden/v1/internal/request_id_connection_impl.h index 9579a41f81b99..f449357766f47 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_connection_impl.h +++ b/generator/integration_tests/golden/v1/internal/request_id_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.cc index 61725291df815..ca38d77918494 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.cc @@ -19,7 +19,7 @@ #include "generator/integration_tests/golden/v1/internal/request_id_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.h b/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.h index 8e60a32dfc8ca..dc149e80784f9 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/request_id_logging_decorator.h @@ -22,7 +22,7 @@ #include "generator/integration_tests/golden/v1/internal/request_id_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.cc index f57605e72e98d..933add31b7ff2 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.h index 5668cfd9d7b06..cfda0e7598053 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.h @@ -22,7 +22,7 @@ #include "generator/integration_tests/golden/v1/internal/request_id_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_stub.cc b/generator/integration_tests/golden/v1/internal/request_id_stub.cc index cd8b7b8346c43..162a423de21ef 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_stub.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_stub.cc @@ -19,8 +19,8 @@ #include "generator/integration_tests/golden/v1/internal/request_id_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_stub.h b/generator/integration_tests/golden/v1/internal/request_id_stub.h index 71abeb30b5374..724ec19083a17 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_stub.h +++ b/generator/integration_tests/golden/v1/internal/request_id_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_stub_factory.cc b/generator/integration_tests/golden/v1/internal/request_id_stub_factory.cc index dc7c18524340a..519741b93bd8d 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/internal/request_id_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/request_id_tracing_connection.cc index 4f6c6233ef909..6877827edd0e8 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_tracing_connection.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_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 - RequestIdServiceTracingConnection::RequestIdServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -85,16 +83,12 @@ RequestIdServiceTracingConnection::AsyncCreateFoo(google::test::requestid::v1::C return internal::EndSpan(std::move(span), child_->AsyncCreateFoo(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRequestIdServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/generator/integration_tests/golden/v1/internal/request_id_tracing_connection.h b/generator/integration_tests/golden/v1/internal/request_id_tracing_connection.h index 9403699b7aa73..237448814d618 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_tracing_connection.h +++ b/generator/integration_tests/golden/v1/internal/request_id_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 RequestIdServiceTracingConnection : public golden_v1::RequestIdServiceConnection { public: @@ -64,8 +62,6 @@ class RequestIdServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/generator/integration_tests/golden/v1/internal/request_id_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/request_id_tracing_stub.cc index 5a0f6843f7994..def5dd1acc717 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_tracing_stub.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_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 - RequestIdServiceTracingStub::RequestIdServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -125,15 +123,9 @@ future RequestIdServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRequestIdServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/generator/integration_tests/golden/v1/internal/request_id_tracing_stub.h b/generator/integration_tests/golden/v1/internal/request_id_tracing_stub.h index 49fae34d273a2..121c35df67886 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_tracing_stub.h +++ b/generator/integration_tests/golden/v1/internal/request_id_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 RequestIdServiceTracingStub : public RequestIdServiceStub { public: ~RequestIdServiceTracingStub() override = default; @@ -82,8 +80,6 @@ class RequestIdServiceTracingStub : public RequestIdServiceStub { std::shared_ptr propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/generator/integration_tests/golden/v1/request_id_client.h b/generator/integration_tests/golden/v1/request_id_client.h index 3176a8cb94c93..5ee58ed51ead4 100644 --- a/generator/integration_tests/golden/v1/request_id_client.h +++ b/generator/integration_tests/golden/v1/request_id_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/generator/integration_tests/golden/v1/request_id_connection.h b/generator/integration_tests/golden/v1/request_id_connection.h index 2ae948ebdc811..0370a57a271f3 100644 --- a/generator/integration_tests/golden/v1/request_id_connection.h +++ b/generator/integration_tests/golden/v1/request_id_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "generator/integration_tests/test_request_id.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/golden/v1/request_id_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/request_id_connection_idempotency_policy.h index 1d5e01994a644..c5b3eb6e173f3 100644 --- a/generator/integration_tests/golden/v1/request_id_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/request_id_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "generator/integration_tests/test_request_id.grpc.pb.h" #include namespace google { diff --git a/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc index 3e7ea494cb8a4..8ccd182c1acbf 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/time_utils.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/iam/v1/policy.pb.h" #include #include #include diff --git a/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc index 5163dd758f5f9..1458a64863107 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc +++ b/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 diff --git a/generator/integration_tests/tests/golden_kitchen_sink_rest_connection_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_rest_connection_test.cc index ca394218f997b..572927a0119ab 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_rest_connection_test.cc +++ b/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 diff --git a/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc index 3e32e57e54d66..596d26013872c 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc @@ -13,10 +13,10 @@ // limitations under the License. #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h" +#include "generator/integration_tests/test.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" -#include #include #include diff --git a/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc index 7d533ec279f03..cedcd641ae342 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc +++ b/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 diff --git a/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc index dee9cb2a324a3..72646886eee35 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc @@ -32,7 +32,6 @@ using ::google::cloud::golden_v1_mocks::MockGoldenKitchenSinkConnection; using ::google::cloud::testing_util::StatusIs; using ::testing::Return; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; @@ -376,20 +375,6 @@ TEST(MakeGoldenKitchenSinkTracingConnection, TracingDisabled) { EXPECT_THAT(spans, IsEmpty()); } -#else - -TEST(MakeGoldenKitchenSinkTracingConnection, NoOpenTelemetry) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DoNothing) - .WillOnce(Return(internal::AbortedError("fail"))); - - auto under_test = MakeGoldenKitchenSinkTracingConnection(mock); - auto result = under_test->DoNothing({}); - EXPECT_THAT(result, StatusIs(StatusCode::kAborted)); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace golden_v1_internal diff --git a/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc index 306754d8db0f4..69e6bf36d0630 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc @@ -33,8 +33,6 @@ namespace { using ::google::cloud::testing_util::StatusIs; using ::testing::Return; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; using ::google::cloud::testing_util::OTelContextCaptured; @@ -489,21 +487,6 @@ TEST(MakeGoldenKitchenSinkTracingStub, OpenTelemetry) { EXPECT_THAT(spans, Not(IsEmpty())); } -#else - -TEST(MakeGoldenKitchenSinkTracingStub, NoOpenTelemetry) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DoNothing) - .WillOnce(Return(internal::AbortedError("fail"))); - - auto under_test = MakeGoldenKitchenSinkTracingStub(mock); - grpc::ClientContext context; - auto result = under_test->DoNothing(context, Options{}, {}); - EXPECT_THAT(result, StatusIs(StatusCode::kAborted)); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace golden_v1_internal diff --git a/generator/integration_tests/tests/golden_thing_admin_client_test.cc b/generator/integration_tests/tests/golden_thing_admin_client_test.cc index 5eecfeeaa077b..9e1b871df89a3 100644 --- a/generator/integration_tests/tests/golden_thing_admin_client_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_client_test.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/time_utils.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/iam/v1/policy.pb.h" #include #include #include diff --git a/generator/integration_tests/tests/golden_thing_admin_connection_test.cc b/generator/integration_tests/tests/golden_thing_admin_connection_test.cc index f4fd6b1c543cf..ef2d6171bd9a3 100644 --- a/generator/integration_tests/tests/golden_thing_admin_connection_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_connection_test.cc @@ -1617,7 +1617,6 @@ TEST(GoldenThingAdminConnectionTest, 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; @@ -1662,9 +1661,6 @@ TEST(GoldenThingAdminConnectionTest, TracingDisabled) { Not(Contains(SpanNamed( "golden_v1::GoldenThingAdminConnection::DeleteBackup")))); } - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace golden_v1 diff --git a/generator/integration_tests/tests/golden_thing_admin_rest_connection_test.cc b/generator/integration_tests/tests/golden_thing_admin_rest_connection_test.cc index 3e148cc032271..721ff35c2e208 100644 --- a/generator/integration_tests/tests/golden_thing_admin_rest_connection_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_rest_connection_test.cc @@ -1678,7 +1678,6 @@ TEST(GoldenThingAdminConnectionTest, ConnectionCreatedWithOption) { EXPECT_THAT(conn->options().get(), Eq("foo")); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -1723,8 +1722,6 @@ TEST(GoldenThingAdminConnectionTest, TracingDisabled) { Not(Contains(SpanNamed( "golden_v1::GoldenThingAdminConnection::DeleteBackup")))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace golden_v1 diff --git a/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc b/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc index 891b661895da2..07f5153e836a1 100644 --- a/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc +++ b/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 diff --git a/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc b/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc index 7e994c2abef99..348d7016d2761 100644 --- a/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc @@ -32,7 +32,6 @@ using ::google::cloud::golden_v1_mocks::MockGoldenThingAdminConnection; using ::google::cloud::testing_util::StatusIs; using ::testing::Return; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; @@ -702,20 +701,6 @@ TEST(MakeGoldenThingAdminTracingConnection, TracingDisabled) { EXPECT_THAT(spans, IsEmpty()); } -#else - -TEST(MakeGoldenThingAdminTracingConnection, NoOpenTelemetry) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DropDatabase) - .WillOnce(Return(internal::AbortedError("fail"))); - - auto under_test = MakeGoldenThingAdminTracingConnection(mock); - auto result = under_test->DropDatabase({}); - EXPECT_THAT(result, StatusIs(StatusCode::kAborted)); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace golden_v1_internal diff --git a/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc b/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc index 8ca098fdea0a8..4c01aa06805c3 100644 --- a/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc @@ -26,8 +26,6 @@ namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; using ::google::cloud::testing_util::OTelContextCaptured; @@ -698,24 +696,6 @@ TEST(MakeGoldenThingAdminTracingStub, OpenTelemetry) { EXPECT_THAT(spans, Not(IsEmpty())); } -#else - -using ::google::cloud::testing_util::StatusIs; -using ::testing::Return; - -TEST(MakeGoldenThingAdminTracingStub, NoOpenTelemetry) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DropDatabase) - .WillOnce(Return(internal::AbortedError("fail"))); - - auto under_test = MakeGoldenThingAdminTracingStub(mock); - grpc::ClientContext context; - auto result = under_test->DropDatabase(context, Options{}, {}); - EXPECT_THAT(result, StatusIs(StatusCode::kAborted)); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace golden_v1_internal diff --git a/generator/integration_tests/tests/request_id_tracing_stub_test.cc b/generator/integration_tests/tests/request_id_tracing_stub_test.cc index a92d4f28f81ee..fb4f9fbaa1562 100644 --- a/generator/integration_tests/tests/request_id_tracing_stub_test.cc +++ b/generator/integration_tests/tests/request_id_tracing_stub_test.cc @@ -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 diff --git a/generator/internal/client_generator.cc b/generator/internal/client_generator.cc index baa28c4995f2c..8fd5b2d990bdd 100644 --- a/generator/internal/client_generator.cc +++ b/generator/internal/client_generator.cc @@ -21,7 +21,7 @@ #include "generator/internal/predicate_utils.h" #include "generator/internal/printer.h" #include "google/cloud/internal/absl_str_cat_quiet.h" -#include +#include "google/api/client.pb.h" #include namespace google { diff --git a/generator/internal/descriptor_utils.cc b/generator/internal/descriptor_utils.cc index 342a1d7dd9cba..f4777228af8c6 100644 --- a/generator/internal/descriptor_utils.cc +++ b/generator/internal/descriptor_utils.cc @@ -35,10 +35,10 @@ #include "absl/strings/str_split.h" #include "absl/strings/strip.h" #include "absl/types/variant.h" -#include -#include -#include -#include +#include "google/api/annotations.pb.h" +#include "google/api/http.pb.h" +#include "google/api/routing.pb.h" +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/generator/internal/descriptor_utils_test.cc b/generator/internal/descriptor_utils_test.cc index 467251f6d2a0d..91ee5d02b03e5 100644 --- a/generator/internal/descriptor_utils_test.cc +++ b/generator/internal/descriptor_utils_test.cc @@ -20,8 +20,8 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/testing_util/status_matchers.h" #include "absl/strings/str_split.h" +#include "google/protobuf/descriptor.pb.h" #include -#include #include #include #include diff --git a/generator/internal/discovery_file.cc b/generator/internal/discovery_file.cc index e76ca853afec0..88590c71fd482 100644 --- a/generator/internal/discovery_file.cc +++ b/generator/internal/discovery_file.cc @@ -62,8 +62,8 @@ Status DiscoveryFile::FormatFile( {"version", document_properties.version}}; google::protobuf::io::OstreamOutputStream output(&output_stream); google::protobuf::io::Printer printer(&output, '$'); - printer.Print(vars, CopyrightLicenseFileHeader().c_str()); - printer.Print(vars, GeneratedProtoPreamble().c_str()); + printer.Print(vars, CopyrightLicenseFileHeader()); + printer.Print(vars, GeneratedProtoPreamble()); printer.Print(vars, R"""( syntax = "proto3"; @@ -73,7 +73,7 @@ package $package_name$; if (!import_paths_.empty()) { printer.Print("\n"); for (auto const& path : import_paths_) { - printer.Print(vars, absl::StrFormat("import \"%s\";\n", path).c_str()); + printer.Print(vars, absl::StrFormat("import \"%s\";\n", path)); } } @@ -84,14 +84,14 @@ package $package_name$; if (!service_definition) { return std::move(service_definition).status(); } - printer.Print(vars, std::move(service_definition)->c_str()); + printer.Print(vars, *service_definition); } for (auto const& t : types_) { auto message = t->JsonToProtobufMessage(types, package_name_); if (!message) return std::move(message).status(); printer.Print("\n"); - printer.Print(vars, std::move(message)->c_str()); + printer.Print(vars, *message); } return {}; diff --git a/generator/internal/discovery_proto_export_file.cc b/generator/internal/discovery_proto_export_file.cc index cecd30328e852..146ffe8f3835f 100644 --- a/generator/internal/discovery_proto_export_file.cc +++ b/generator/internal/discovery_proto_export_file.cc @@ -55,9 +55,9 @@ Status DiscoveryProtoExportFile::FormatFile(std::ostream& output_stream) const { )"""); printer.Print("// IWYU pragma: begin_exports\n"); for (auto const& p : proto_includes_) { - printer.Print("#include <"); + printer.Print("#include \""); printer.Print(absl::StrReplaceAll(p, {{".proto", ".pb.h"}})); - printer.Print(">\n"); + printer.Print("\"\n"); } printer.Print("// IWYU pragma: end_exports\n"); printer.Print(vars, R"""( diff --git a/generator/internal/discovery_proto_export_file_test.cc b/generator/internal/discovery_proto_export_file_test.cc index 13f079b131d9d..b3bfe3cbc2ed1 100644 --- a/generator/internal/discovery_proto_export_file_test.cc +++ b/generator/internal/discovery_proto_export_file_test.cc @@ -55,8 +55,8 @@ TEST(DiscoveryProtoExportFileTest, FormatFile) { #define GOOGLE_CLOUD_CPP_RELATIVE_FILE_PATH_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_002.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_RELATIVE_FILE_PATH_H diff --git a/generator/internal/discovery_type_vertex.cc b/generator/internal/discovery_type_vertex.cc index c29683c7cc2a4..ee0768851aa94 100644 --- a/generator/internal/discovery_type_vertex.cc +++ b/generator/internal/discovery_type_vertex.cc @@ -22,7 +22,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" #include "absl/types/optional.h" -#include +#include "google/protobuf/descriptor.pb.h" #include #include diff --git a/generator/internal/format_method_comments.cc b/generator/internal/format_method_comments.cc index 3e3be6647b204..8695a8fd0ac78 100644 --- a/generator/internal/format_method_comments.cc +++ b/generator/internal/format_method_comments.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/absl_str_replace_quiet.h" #include "google/cloud/log.h" #include "absl/strings/string_view.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/generator/internal/http_option_utils.cc b/generator/internal/http_option_utils.cc index 6d085c145a9b2..c3465770e4353 100644 --- a/generator/internal/http_option_utils.cc +++ b/generator/internal/http_option_utils.cc @@ -26,7 +26,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" #include "absl/types/optional.h" -#include +#include "google/api/annotations.pb.h" #include #include #include diff --git a/generator/internal/http_option_utils.h b/generator/internal/http_option_utils.h index 67c94bceee67b..d337c53079b8c 100644 --- a/generator/internal/http_option_utils.h +++ b/generator/internal/http_option_utils.h @@ -19,7 +19,7 @@ #include "generator/internal/mixin_utils.h" #include "generator/internal/printer.h" #include "absl/types/optional.h" -#include +#include "google/api/http.pb.h" #include #include diff --git a/generator/internal/http_option_utils_test.cc b/generator/internal/http_option_utils_test.cc index 5769678f72c53..7a830e060dd9d 100644 --- a/generator/internal/http_option_utils_test.cc +++ b/generator/internal/http_option_utils_test.cc @@ -15,8 +15,8 @@ #include "generator/internal/http_option_utils.h" #include "generator/testing/error_collectors.h" #include "generator/testing/fake_source_tree.h" -#include -#include +#include "google/api/annotations.pb.h" +#include "google/protobuf/descriptor.pb.h" #include #include #include diff --git a/generator/internal/longrunning.cc b/generator/internal/longrunning.cc index 60fc92129d267..bb765079afc9a 100644 --- a/generator/internal/longrunning.cc +++ b/generator/internal/longrunning.cc @@ -16,11 +16,11 @@ #include "generator/internal/codegen_utils.h" #include "generator/internal/doxygen.h" #include "generator/internal/http_option_utils.h" +#include "google/cloud/extended_operations.pb.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/log.h" #include "absl/types/variant.h" -#include -#include +#include "google/longrunning/operations.pb.h" #include using ::google::protobuf::Descriptor; diff --git a/generator/internal/longrunning_test.cc b/generator/internal/longrunning_test.cc index f8dfa62086da3..b868b1da0f85f 100644 --- a/generator/internal/longrunning_test.cc +++ b/generator/internal/longrunning_test.cc @@ -16,7 +16,7 @@ #include "generator/testing/error_collectors.h" #include "generator/testing/fake_source_tree.h" #include "google/cloud/internal/absl_str_cat_quiet.h" -#include +#include "google/protobuf/descriptor.pb.h" #include #include diff --git a/generator/internal/make_generators_test.cc b/generator/internal/make_generators_test.cc index 8ffd8cf80b0cc..9d750054976cd 100644 --- a/generator/internal/make_generators_test.cc +++ b/generator/internal/make_generators_test.cc @@ -17,9 +17,9 @@ #include "generator/testing/error_collectors.h" #include "generator/testing/fake_source_tree.h" #include "generator/testing/printer_mocks.h" +#include "google/protobuf/descriptor.pb.h" #include #include -#include #include namespace google { diff --git a/generator/internal/mixin_utils.cc b/generator/internal/mixin_utils.cc index c24a6f943f9bf..c3280f89a6d78 100644 --- a/generator/internal/mixin_utils.cc +++ b/generator/internal/mixin_utils.cc @@ -140,27 +140,28 @@ std::unordered_set GetMethodNames( } // namespace -std::vector GetMixinProtoPaths(YAML::Node const& service_config) { - std::vector proto_paths; - if (service_config.Type() != YAML::NodeType::Map) return proto_paths; +std::vector GetMixinServiceProto( + YAML::Node const& service_config) { + std::vector mixin_services; + if (service_config.Type() != YAML::NodeType::Map) return mixin_services; auto const& apis = service_config["apis"]; - if (apis.Type() != YAML::NodeType::Sequence) return proto_paths; + if (apis.Type() != YAML::NodeType::Sequence) return mixin_services; for (auto const& api : apis) { if (api.Type() != YAML::NodeType::Map) continue; auto const& name = api["name"]; if (name.Type() != YAML::NodeType::Scalar) continue; - auto const package_path = name.as(); + auto const service = name.as(); auto const& mixin_proto_path_map = GetMixinProtoPathMap(); - auto const it = mixin_proto_path_map.find(package_path); + auto const it = mixin_proto_path_map.find(service); if (it == mixin_proto_path_map.end()) continue; - proto_paths.push_back(it->second); + mixin_services.push_back({it->first, it->second}); } - return proto_paths; + return mixin_services; } -std::vector GetMixinProtoPaths( +std::vector GetMixinServiceProto( std::string const& service_yaml_path) { - return GetMixinProtoPaths(YAML::LoadFile(service_yaml_path)); + return GetMixinServiceProto(YAML::LoadFile(service_yaml_path)); } std::vector GetMixinMethods(YAML::Node const& service_config, @@ -173,15 +174,16 @@ std::vector GetMixinMethods(YAML::Node const& service_config, << service.full_name(); } std::unordered_set const method_names = GetMethodNames(service); - auto const mixin_proto_paths = GetMixinProtoPaths(service_config); + auto const mixin_proto_paths = GetMixinServiceProto(service_config); auto const mixin_http_overrides = GetMixinHttpOverrides(service_config); for (auto const& mixin_proto_path : mixin_proto_paths) { - FileDescriptor const* mixin_file = pool->FindFileByName(mixin_proto_path); + FileDescriptor const* mixin_file = + pool->FindFileByName(mixin_proto_path.proto_file_path); if (mixin_file == nullptr) { GCP_LOG(FATAL) << __FILE__ << ":" << __LINE__ << " Mixin FileDescriptor is not found for path: " - << mixin_proto_path + << mixin_proto_path.proto_file_path << " in service: " << service.full_name(); } for (int i = 0; i < mixin_file->service_count(); ++i) { diff --git a/generator/internal/mixin_utils.h b/generator/internal/mixin_utils.h index 2e91cf3418b71..57967a7bb9f7f 100644 --- a/generator/internal/mixin_utils.h +++ b/generator/internal/mixin_utils.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_MIXIN_UTILS_H #include "absl/types/optional.h" -#include +#include "google/api/http.pb.h" #include #include #include @@ -38,16 +38,30 @@ struct MixinMethod { google::api::HttpRule http_override; }; +struct MixinService { + std::string service_full_name; + std::string proto_file_path; +}; + +inline bool operator==(MixinService const& lhs, MixinService const& rhs) { + return lhs.service_full_name == rhs.service_full_name && + lhs.proto_file_path == rhs.proto_file_path; +} +inline bool operator!=(MixinService const& lhs, MixinService const& rhs) { + return !(lhs == rhs); +} + /** * Extract Mixin proto file paths from the YAML Node. */ -std::vector GetMixinProtoPaths(YAML::Node const& service_config); +std::vector GetMixinServiceProto( + YAML::Node const& service_config); /** * Extract Mixin proto file paths from the YAML Node loaded from a YAML file * path. */ -std::vector GetMixinProtoPaths( +std::vector GetMixinServiceProto( std::string const& service_yaml_path); /** diff --git a/generator/internal/mixin_utils_test.cc b/generator/internal/mixin_utils_test.cc index 568156f6833c2..e517e4098c91a 100644 --- a/generator/internal/mixin_utils_test.cc +++ b/generator/internal/mixin_utils_test.cc @@ -15,7 +15,7 @@ #include "generator/internal/mixin_utils.h" #include "generator/testing/descriptor_pool_fixture.h" #include "google/cloud/testing_util/is_proto_equal.h" -#include +#include "google/api/annotations.pb.h" #include #include @@ -207,11 +207,16 @@ TEST_F(MixinUtilsTest, FilesParseSuccessfully) { } TEST_F(MixinUtilsTest, ExtractMixinProtoPathsFromYaml) { - auto const mixin_proto_paths = GetMixinProtoPaths(service_config_); - EXPECT_THAT(mixin_proto_paths, - AllOf(Contains("google/cloud/location/locations.proto"), - Contains("google/iam/v1/iam_policy.proto"), - Contains("google/longrunning/operations.proto"))); + std::vector const mixin_proto_paths = + GetMixinServiceProto(service_config_); + EXPECT_THAT( + mixin_proto_paths, + AllOf(Contains(MixinService{"google.cloud.location.Locations", + "google/cloud/location/locations.proto"}), + Contains(MixinService{"google.iam.v1.IAMPolicy", + "google/iam/v1/iam_policy.proto"}), + Contains(MixinService{"google.longrunning.Operations", + "google/longrunning/operations.proto"}))); } TEST_F(MixinUtilsTest, GetMixinMethods) { diff --git a/generator/internal/pagination_test.cc b/generator/internal/pagination_test.cc index d31223ad428bb..08da0461acbe5 100644 --- a/generator/internal/pagination_test.cc +++ b/generator/internal/pagination_test.cc @@ -17,8 +17,8 @@ #include "generator/testing/error_collectors.h" #include "generator/testing/fake_source_tree.h" #include "google/cloud/internal/absl_str_replace_quiet.h" +#include "google/protobuf/descriptor.pb.h" #include -#include #include #include diff --git a/generator/internal/predicate_utils.cc b/generator/internal/predicate_utils.cc index 6b28d7dddcade..e1f55e1ed8780 100644 --- a/generator/internal/predicate_utils.cc +++ b/generator/internal/predicate_utils.cc @@ -15,7 +15,7 @@ #include "generator/internal/predicate_utils.h" #include "generator/internal/descriptor_utils.h" #include "google/cloud/log.h" -#include +#include "google/longrunning/operations.pb.h" #include namespace google { diff --git a/generator/internal/predicate_utils_test.cc b/generator/internal/predicate_utils_test.cc index 16d14e5c96dce..93fcfb82f8370 100644 --- a/generator/internal/predicate_utils_test.cc +++ b/generator/internal/predicate_utils_test.cc @@ -16,9 +16,9 @@ #include "generator/testing/error_collectors.h" #include "generator/testing/fake_source_tree.h" #include "google/cloud/log.h" +#include "google/protobuf/descriptor.pb.h" #include #include -#include #include #include #include diff --git a/generator/internal/printer.h b/generator/internal/printer.h index d626858d95b84..d565ea29b36a2 100644 --- a/generator/internal/printer.h +++ b/generator/internal/printer.h @@ -56,7 +56,7 @@ class Printer { * are defined by the given map. */ void Print(VarsDictionary const& variables, std::string const& text) { - printer_->Print(variables, text.c_str()); + printer_->Print(variables, text); } /** @@ -64,7 +64,7 @@ class Printer { */ template void Print(std::string const& text, Args&&... args) { - printer_->Print(text.c_str(), std::forward(args)...); + printer_->Print(text, std::forward(args)...); } /** diff --git a/generator/internal/request_id.cc b/generator/internal/request_id.cc index be27ca8525596..4c86a06c743c9 100644 --- a/generator/internal/request_id.cc +++ b/generator/internal/request_id.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "generator/internal/request_id.h" -#include +#include "google/api/field_info.pb.h" namespace google { namespace cloud { diff --git a/generator/internal/resolve_method_return.cc b/generator/internal/resolve_method_return.cc index 1b1b97c64dda6..b78ab41a0d8bf 100644 --- a/generator/internal/resolve_method_return.cc +++ b/generator/internal/resolve_method_return.cc @@ -15,7 +15,7 @@ #include "generator/internal/resolve_method_return.h" #include "generator/internal/longrunning.h" #include "generator/internal/pagination.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/generator/internal/routing.cc b/generator/internal/routing.cc index 408f009ab60ec..ae8ada8ac0b27 100644 --- a/generator/internal/routing.cc +++ b/generator/internal/routing.cc @@ -17,7 +17,7 @@ #include "google/cloud/internal/absl_str_replace_quiet.h" #include "google/cloud/log.h" #include "absl/strings/str_split.h" -#include +#include "google/api/routing.pb.h" #include #include using ::google::protobuf::compiler::cpp::FieldName; diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc index 1ee505cd277a2..96e914cd3449b 100644 --- a/generator/internal/scaffold_generator.cc +++ b/generator/internal/scaffold_generator.cc @@ -424,8 +424,7 @@ this library. google::protobuf::io::Printer printer(&output, '$'); printer.Print( variables, - absl::StrCat(kText1, FormatCloudServiceDocsLink(variables), kText2) - .c_str()); + absl::StrCat(kText1, FormatCloudServiceDocsLink(variables), kText2)); } void GenerateBuild(std::ostream& os, @@ -453,7 +452,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["$service_subdirectory$"] googleapis_deps = [ - "@com_google_googleapis//$directory$:$library$_cc_grpc", + "@googleapis//$directory$:$library$_cc_grpc", ] cc_gapic_library( @@ -560,8 +559,7 @@ which should give you a taste of the $title$ C++ client library API. google::protobuf::io::Printer printer(&output, '$'); printer.Print( variables, - absl::StrCat(kText1, FormatCloudServiceDocsLink(variables), kText2) - .c_str()); + absl::StrCat(kText1, FormatCloudServiceDocsLink(variables), kText2)); } void GenerateDoxygenEnvironmentPage( @@ -1086,7 +1084,7 @@ CLIENT_LIBS := $$(shell pkg-config $$(CLIENT_MODULE) --libs-only-l) )"""; google::protobuf::io::OstreamOutputStream output(&os); google::protobuf::io::Printer printer(&output, '$'); - printer.Print(variables, format.c_str()); + printer.Print(variables, format); } void GenerateQuickstartWorkspace( @@ -1094,7 +1092,7 @@ void GenerateQuickstartWorkspace( std::string const& contents) { google::protobuf::io::OstreamOutputStream output(&os); google::protobuf::io::Printer printer(&output, '$'); - printer.Print(variables, contents.c_str()); + printer.Print(variables, contents); } void GenerateQuickstartBuild( diff --git a/generator/internal/scaffold_generator_test.cc b/generator/internal/scaffold_generator_test.cc index ace489a009a58..b953aaa7b71e1 100644 --- a/generator/internal/scaffold_generator_test.cc +++ b/generator/internal/scaffold_generator_test.cc @@ -122,18 +122,18 @@ class ScaffoldGenerator : public ::testing::Test { for (auto const* s : kHierarchy) MakeDirectory(path_ + s); std::ofstream(path_ + "/external/googleapis/protolists/test.list") - << R"""(@com_google_googleapis//google/cloud/test/v1:foo.proto -@com_google_googleapis//google/cloud/test/v1:admin.proto + << R"""(@googleapis//google/cloud/test/v1:foo.proto +@googleapis//google/cloud/test/v1:admin.proto )"""; std::ofstream(path_ + "/external/googleapis/protodeps/test.deps") - << R"""(@com_google_googleapis//google/longrunning:operations_proto -@com_google_googleapis//google/rpc:status_proto -@com_google_googleapis//google/api:resource_proto -@com_google_googleapis//google/api:field_behavior_proto -@com_google_googleapis//google/api:client_proto -@com_google_googleapis//google/api:annotations_proto -@com_google_googleapis//google/api:http_proto + << R"""(@googleapis//google/longrunning:operations_proto +@googleapis//google/rpc:status_proto +@googleapis//google/api:resource_proto +@googleapis//google/api:field_behavior_proto +@googleapis//google/api:client_proto +@googleapis//google/api:annotations_proto +@googleapis//google/api:http_proto )"""; std::ofstream(path_ + "/google/cloud/test/v1/test_v1.yaml") @@ -274,8 +274,7 @@ TEST_F(ScaffoldGenerator, Build) { EXPECT_THAT(actual, HasSubstr(R"""(name = "test",)""")); EXPECT_THAT( actual, - HasSubstr( - R"""(@com_google_googleapis//google/cloud/test/v1:test_cc_grpc",)""")); + HasSubstr(R"""(@googleapis//google/cloud/test/v1:test_cc_grpc",)""")); } TEST_F(ScaffoldGenerator, CMakeLists) { diff --git a/generator/internal/service_code_generator.cc b/generator/internal/service_code_generator.cc index cb31ba54435b7..51eaced4a680c 100644 --- a/generator/internal/service_code_generator.cc +++ b/generator/internal/service_code_generator.cc @@ -25,8 +25,8 @@ #include "google/cloud/log.h" #include "absl/strings/str_split.h" #include "absl/strings/strip.h" -#include -#include +#include "google/api/client.pb.h" +#include "google/api/routing.pb.h" #include #include #include diff --git a/generator/internal/service_code_generator.h b/generator/internal/service_code_generator.h index d76cc824bd161..de5d03e451145 100644 --- a/generator/internal/service_code_generator.h +++ b/generator/internal/service_code_generator.h @@ -267,7 +267,7 @@ class ServiceCodeGenerator : public GeneratorInterface { std::map service_method_vars_; std::string namespace_; bool define_backwards_compatibility_namespace_alias_ = false; - bool pb_h_system_includes_ = true; + bool pb_h_system_includes_ = false; MethodDescriptorList methods_; MethodDescriptorList async_methods_; Printer header_; diff --git a/generator/internal/service_code_generator_test.cc b/generator/internal/service_code_generator_test.cc index 4a65fb279743a..20080e1e9eb6c 100644 --- a/generator/internal/service_code_generator_test.cc +++ b/generator/internal/service_code_generator_test.cc @@ -19,9 +19,9 @@ #include "generator/testing/fake_source_tree.h" #include "generator/testing/printer_mocks.h" #include "google/cloud/log.h" +#include "google/protobuf/descriptor.pb.h" #include #include -#include #include #include #include diff --git a/generator/internal/tracing_connection_generator.cc b/generator/internal/tracing_connection_generator.cc index 1afea7c3997cb..a8513446ee431 100644 --- a/generator/internal/tracing_connection_generator.cc +++ b/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; } )"""); diff --git a/generator/internal/tracing_stub_generator.cc b/generator/internal/tracing_stub_generator.cc index f48aaab69b27e..e31f1248e02e8 100644 --- a/generator/internal/tracing_stub_generator.cc +++ b/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 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 $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(); diff --git a/generator/standalone_main.cc b/generator/standalone_main.cc index ff7db95f54018..0d838586cd891 100644 --- a/generator/standalone_main.cc +++ b/generator/standalone_main.cc @@ -18,6 +18,7 @@ #include "generator/internal/descriptor_utils.h" #include "generator/internal/discovery_to_proto.h" #include "generator/internal/format_method_comments.h" +#include "generator/internal/mixin_utils.h" #include "generator/internal/scaffold_generator.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -329,10 +330,6 @@ std::vector> GenerateCodeFromProtos( if (service.generate_rest_transport()) { args.emplace_back("--cpp_codegen_opt=generate_rest_transport=true"); } - args.emplace_back(service.service_proto_path()); - for (auto const& additional_proto_file : service.additional_proto_files()) { - args.emplace_back(additional_proto_file); - } if (service.experimental()) { args.emplace_back("--cpp_codegen_opt=experimental=true"); } @@ -388,10 +385,30 @@ std::vector> GenerateCodeFromProtos( "=", kv.second)); } + std::vector mixin_files_to_append; auto path = ServiceConfigYamlPath(yaml_root, scaffold_vars); if (!path.empty()) { + auto mixins = + google::cloud::generator_internal::GetMixinServiceProto(path); args.emplace_back(absl::StrCat("--cpp_codegen_opt=service_config_yaml=", std::move(path))); + for (auto& mixin_service : mixins) { + if (mixin_service.proto_file_path != service.service_proto_path()) { + args.emplace_back("--cpp_codegen_opt=omit_service=" + + std::move(mixin_service.service_full_name)); + mixin_files_to_append.push_back( + std::move(mixin_service.proto_file_path)); + } + } + } + + args.push_back(service.service_proto_path()); + for (auto const& additional_proto_file : service.additional_proto_files()) { + args.push_back(additional_proto_file); + } + + for (auto& mixin_path : mixin_files_to_append) { + args.push_back(std::move(mixin_path)); } GCP_LOG(INFO) << "Generating service code using: " diff --git a/generator/testing/descriptor_pool_fixture.cc b/generator/testing/descriptor_pool_fixture.cc index a6f983892a58b..60ee37a58cf83 100644 --- a/generator/testing/descriptor_pool_fixture.cc +++ b/generator/testing/descriptor_pool_fixture.cc @@ -14,13 +14,13 @@ #include "generator/testing/descriptor_pool_fixture.h" #include "generator/testing/error_collectors.h" -#include -#include -#include -#include -#include -#include -#include +#include "google/api/annotations.pb.h" +#include "google/api/client.pb.h" +#include "google/longrunning/operations.pb.h" +#include "google/protobuf/any.pb.h" +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/empty.pb.h" +#include "google/rpc/status.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/BUILD.bazel b/google/cloud/BUILD.bazel index 51e32938280c6..8ed27115adb70 100644 --- a/google/cloud/BUILD.bazel +++ b/google/cloud/BUILD.bazel @@ -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,6 @@ 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": [], - }), linkopts = select({ "@platforms//os:windows": [ "-DEFAULTLIB:bcrypt.lib", @@ -86,20 +72,16 @@ cc_library( "//:__pkg__", ], deps = [ - "@com_google_absl//absl/base", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", + "@opentelemetry-cpp//api", ] + select({ - ":enable_opentelemetry": [ - "@io_opentelemetry_cpp//api", - ], - "//conditions:default": [], - }) + select({ "@platforms//os:windows": [], "//conditions:default": [ "@boringssl//:crypto", @@ -130,7 +112,7 @@ cc_library( ":google_cloud_cpp_common", ":google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_common_unit_tests] @@ -166,16 +148,15 @@ cc_library( ], deps = [ ":google_cloud_cpp_common", - "@com_github_grpc_grpc//:grpc++", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/time", - "@com_google_googleapis//:googleapis_system_includes", - "@com_google_googleapis//google/cloud/location:location_cc_grpc", - "@com_google_googleapis//google/iam/credentials/v1:credentials_cc_grpc", - "@com_google_googleapis//google/iam/v1:iam_cc_grpc", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", - "@com_google_googleapis//google/rpc:error_details_cc_proto", - "@com_google_googleapis//google/rpc:status_cc_proto", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/time", + "@googleapis//google/cloud/location:location_cc_grpc", + "@googleapis//google/iam/credentials/v1:credentials_cc_grpc", + "@googleapis//google/iam/v1:iam_cc_grpc", + "@googleapis//google/longrunning:longrunning_cc_grpc", + "@googleapis//google/rpc:error_details_cc_proto", + "@googleapis//google/rpc:status_cc_proto", + "@grpc//:grpc++", ], ) @@ -200,9 +181,9 @@ cc_library( ":google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", - "@com_google_googletest//:gtest_main", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_grpc_utils_unit_tests] @@ -217,9 +198,9 @@ cc_library( ":google_cloud_cpp_grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", - "@com_google_googletest//:gtest_main", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_grpc_utils_integration_tests] @@ -231,8 +212,8 @@ cc_library( ":google_cloud_cpp_grpc_utils", "@com_google_benchmark//:benchmark", "@com_google_benchmark//:benchmark_main", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", ], ) for test in google_cloud_cpp_grpc_utils_benchmarks] @@ -279,10 +260,10 @@ cc_library( visibility = ["//:__subpackages__"], deps = [ ":google_cloud_cpp_common", - "@com_github_curl_curl//:curl", - "@com_github_nlohmann_json//:json", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/types:span", + "@curl", + "@nlohmann_json//:json", ] + select({ "@platforms//os:windows": [], "//conditions:default": [ @@ -299,7 +280,7 @@ cc_library( ":google_cloud_cpp_rest_internal", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_internal_unit_tests] @@ -312,7 +293,7 @@ cc_library( deps = [ ":google_cloud_cpp_rest_internal", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_internal_emulator_integration_tests] @@ -325,7 +306,7 @@ cc_library( deps = [ ":google_cloud_cpp_rest_internal", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_internal_production_integration_tests] @@ -360,9 +341,9 @@ cc_library( "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/iam/admin/v1:admin_cc_grpc", - "@com_google_googletest//:gtest_main", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/iam/admin/v1:admin_cc_grpc", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_protobuf_internal_unit_tests] @@ -384,7 +365,7 @@ cc_library( ":google_cloud_cpp_universe_domain", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_universe_domain_unit_tests] diff --git a/google/cloud/accessapproval/BUILD.bazel b/google/cloud/accessapproval/BUILD.bazel index a18e446f3f00d..b14de61afab5b 100644 --- a/google/cloud/accessapproval/BUILD.bazel +++ b/google/cloud/accessapproval/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/accessapproval/v1:accessapproval_cc_grpc", + "@googleapis//google/cloud/accessapproval/v1:accessapproval_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/accessapproval/quickstart/.bazelrc b/google/cloud/accessapproval/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/accessapproval/quickstart/.bazelrc +++ b/google/cloud/accessapproval/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/accessapproval/v1/access_approval_connection.h b/google/cloud/accessapproval/v1/access_approval_connection.h index 613727bf693d7..bf36771e5831b 100644 --- a/google/cloud/accessapproval/v1/access_approval_connection.h +++ b/google/cloud/accessapproval/v1/access_approval_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_V1_ACCESS_APPROVAL_CONNECTION_H #include "google/cloud/accessapproval/v1/access_approval_connection_idempotency_policy.h" +#include "google/cloud/accessapproval/v1/accessapproval.pb.h" #include "google/cloud/accessapproval/v1/internal/access_approval_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/accessapproval/v1/access_approval_connection_idempotency_policy.h b/google/cloud/accessapproval/v1/access_approval_connection_idempotency_policy.h index 348ac7346e7ed..662276327e49f 100644 --- a/google/cloud/accessapproval/v1/access_approval_connection_idempotency_policy.h +++ b/google/cloud/accessapproval/v1/access_approval_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_V1_ACCESS_APPROVAL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_V1_ACCESS_APPROVAL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/accessapproval/v1/accessapproval.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/accessapproval/v1/internal/access_approval_auth_decorator.cc b/google/cloud/accessapproval/v1/internal/access_approval_auth_decorator.cc index 636d93fd8822b..fe5d6706f066d 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_auth_decorator.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/accessapproval/v1/accessapproval.proto #include "google/cloud/accessapproval/v1/internal/access_approval_auth_decorator.h" -#include +#include "google/cloud/accessapproval/v1/accessapproval.grpc.pb.h" #include #include diff --git a/google/cloud/accessapproval/v1/internal/access_approval_logging_decorator.cc b/google/cloud/accessapproval/v1/internal/access_approval_logging_decorator.cc index d71dd6539436e..d97203b6e114d 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_logging_decorator.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/accessapproval/v1/accessapproval.proto #include "google/cloud/accessapproval/v1/internal/access_approval_logging_decorator.h" +#include "google/cloud/accessapproval/v1/accessapproval.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/accessapproval/v1/internal/access_approval_metadata_decorator.cc b/google/cloud/accessapproval/v1/internal/access_approval_metadata_decorator.cc index 9e73c7f2fc264..cb6c830aceefd 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_metadata_decorator.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/accessapproval/v1/accessapproval.proto #include "google/cloud/accessapproval/v1/internal/access_approval_metadata_decorator.h" +#include "google/cloud/accessapproval/v1/accessapproval.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 #include #include #include diff --git a/google/cloud/accessapproval/v1/internal/access_approval_stub.cc b/google/cloud/accessapproval/v1/internal/access_approval_stub.cc index b7327fa7eb667..4b0a7b817efb7 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_stub.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/accessapproval/v1/accessapproval.proto #include "google/cloud/accessapproval/v1/internal/access_approval_stub.h" +#include "google/cloud/accessapproval/v1/accessapproval.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/accessapproval/v1/internal/access_approval_stub.h b/google/cloud/accessapproval/v1/internal/access_approval_stub.h index dd1c7c09e6744..d4899bb40acf9 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_stub.h +++ b/google/cloud/accessapproval/v1/internal/access_approval_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_V1_INTERNAL_ACCESS_APPROVAL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_V1_INTERNAL_ACCESS_APPROVAL_STUB_H +#include "google/cloud/accessapproval/v1/accessapproval.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/accessapproval/v1/internal/access_approval_stub_factory.cc b/google/cloud/accessapproval/v1/internal/access_approval_stub_factory.cc index 590ed2cf44ba4..9f1e3aedc292e 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_stub_factory.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/accessapproval/v1/accessapproval.proto #include "google/cloud/accessapproval/v1/internal/access_approval_stub_factory.h" +#include "google/cloud/accessapproval/v1/accessapproval.grpc.pb.h" #include "google/cloud/accessapproval/v1/internal/access_approval_auth_decorator.h" #include "google/cloud/accessapproval/v1/internal/access_approval_logging_decorator.h" #include "google/cloud/accessapproval/v1/internal/access_approval_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc b/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc index 63330e54258fe..8b535a3f8d0bf 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace accessapproval_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AccessApprovalTracingConnection::AccessApprovalTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -130,16 +128,12 @@ AccessApprovalTracingConnection::GetAccessApprovalServiceAccount( child_->GetAccessApprovalServiceAccount(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAccessApprovalTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.h b/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.h index 66b59d3c6c08c..d406d7f02d799 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.h +++ b/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace accessapproval_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AccessApprovalTracingConnection : public accessapproval_v1::AccessApprovalConnection { public: @@ -88,8 +86,6 @@ class AccessApprovalTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.cc b/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.cc index 365332268e5cf..250c9c1c380a8 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace accessapproval_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AccessApprovalTracingStub::AccessApprovalTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -162,15 +160,9 @@ AccessApprovalTracingStub::GetAccessApprovalServiceAccount( child_->GetAccessApprovalServiceAccount(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAccessApprovalTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.h b/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.h index 64b307080c378..11d0d3dc9ae01 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.h +++ b/google/cloud/accessapproval/v1/internal/access_approval_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace accessapproval_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AccessApprovalTracingStub : public AccessApprovalStub { public: ~AccessApprovalTracingStub() override = default; @@ -97,8 +95,6 @@ class AccessApprovalTracingStub : public AccessApprovalStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/accesscontextmanager/BUILD.bazel b/google/cloud/accesscontextmanager/BUILD.bazel index 9970c6c24fbf3..143b23cb8844e 100644 --- a/google/cloud/accesscontextmanager/BUILD.bazel +++ b/google/cloud/accesscontextmanager/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_cc_grpc", + "@googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/accesscontextmanager/quickstart/.bazelrc b/google/cloud/accesscontextmanager/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/accesscontextmanager/quickstart/.bazelrc +++ b/google/cloud/accesscontextmanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/accesscontextmanager/v1/access_context_manager_client.h b/google/cloud/accesscontextmanager/v1/access_context_manager_client.h index 9dc0e0fa65f3b..4bbe028367b23 100644 --- a/google/cloud/accesscontextmanager/v1/access_context_manager_client.h +++ b/google/cloud/accesscontextmanager/v1/access_context_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/accesscontextmanager/v1/access_context_manager_connection.h b/google/cloud/accesscontextmanager/v1/access_context_manager_connection.h index d086f006f60e9..99ee60ec71b24 100644 --- a/google/cloud/accesscontextmanager/v1/access_context_manager_connection.h +++ b/google/cloud/accesscontextmanager/v1/access_context_manager_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/accesscontextmanager/v1/access_context_manager_connection_idempotency_policy.h b/google/cloud/accesscontextmanager/v1/access_context_manager_connection_idempotency_policy.h index 0eb739ac779b5..0b78cc9623285 100644 --- a/google/cloud/accesscontextmanager/v1/access_context_manager_connection_idempotency_policy.h +++ b/google/cloud/accesscontextmanager/v1/access_context_manager_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.cc index dc864544f7a97..3b00ef593aacf 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/identity/accesscontextmanager/v1/access_context_manager.proto #include "google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.h" -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.h index efde008bcff0c..7f0a28d5b6cce 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_connection_impl.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_connection_impl.h index f3ca0294e700f..3bf72214b08fe 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_connection_impl.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.cc index 3db37e0e4e9dd..501f2cb8cfe9d 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" #include #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.h index 8e68588e6df28..1198d7ed1ef5f 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.cc index 2a22436194ac8..031d59b11173c 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" #include #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.h index f994cd011d061..655fe44f7bab6 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc index de9ae931f53ea..943c85c58bacf 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h index 8201a17b445d6..de67ccd782d9a 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc index a9804819762d4..03b56f50d498f 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/identity/accesscontextmanager/v1/access_context_manager.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc index f5235aea2932f..3c262886e27a1 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace accesscontextmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AccessContextManagerTracingConnection::AccessContextManagerTracingConnection( std::shared_ptr child) @@ -715,18 +713,14 @@ AccessContextManagerTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAccessContextManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.h index 1145661c6db1a..63b5c965a193a 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace accesscontextmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AccessContextManagerTracingConnection : public accesscontextmanager_v1::AccessContextManagerConnection { public: @@ -301,8 +299,6 @@ class AccessContextManagerTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc index 84fdea8249754..2cb3d8d15c03e 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace accesscontextmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AccessContextManagerTracingStub::AccessContextManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -697,15 +695,9 @@ future AccessContextManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAccessContextManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.h index 02c1e1c5aed72..dec111e255c20 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace accesscontextmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AccessContextManagerTracingStub : public AccessContextManagerStub { public: ~AccessContextManagerTracingStub() override = default; @@ -306,8 +304,6 @@ class AccessContextManagerTracingStub : public AccessContextManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/advisorynotifications/BUILD.bazel b/google/cloud/advisorynotifications/BUILD.bazel index f7ac0e5cce0a3..c8b02f28eac04 100644 --- a/google/cloud/advisorynotifications/BUILD.bazel +++ b/google/cloud/advisorynotifications/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/advisorynotifications/v1:advisorynotifications_cc_grpc", + "@googleapis//google/cloud/advisorynotifications/v1:advisorynotifications_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/advisorynotifications/quickstart/.bazelrc b/google/cloud/advisorynotifications/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/advisorynotifications/quickstart/.bazelrc +++ b/google/cloud/advisorynotifications/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/advisorynotifications/v1/advisory_notifications_connection.h b/google/cloud/advisorynotifications/v1/advisory_notifications_connection.h index cfb32f9b0ddc7..c801bcb2313ff 100644 --- a/google/cloud/advisorynotifications/v1/advisory_notifications_connection.h +++ b/google/cloud/advisorynotifications/v1/advisory_notifications_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/advisorynotifications/v1/advisory_notifications_connection_idempotency_policy.h" #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_retry_traits.h" +#include "google/cloud/advisorynotifications/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/advisorynotifications/v1/advisory_notifications_connection_idempotency_policy.h b/google/cloud/advisorynotifications/v1/advisory_notifications_connection_idempotency_policy.h index e2a718e43847b..de901aea7f4f3 100644 --- a/google/cloud/advisorynotifications/v1/advisory_notifications_connection_idempotency_policy.h +++ b/google/cloud/advisorynotifications/v1/advisory_notifications_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ADVISORYNOTIFICATIONS_V1_ADVISORY_NOTIFICATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ADVISORYNOTIFICATIONS_V1_ADVISORY_NOTIFICATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/advisorynotifications/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_auth_decorator.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_auth_decorator.cc index 9900c4e0df921..0d25caf455b2c 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_auth_decorator.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/advisorynotifications/v1/service.proto #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_auth_decorator.h" -#include +#include "google/cloud/advisorynotifications/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_logging_decorator.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_logging_decorator.cc index 87d040cef97f5..9eeefcf4edca2 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_logging_decorator.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/advisorynotifications/v1/service.proto #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_logging_decorator.h" +#include "google/cloud/advisorynotifications/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_metadata_decorator.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_metadata_decorator.cc index 451308c1395be..978dd8aaacaba 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_metadata_decorator.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/advisorynotifications/v1/service.proto #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_metadata_decorator.h" +#include "google/cloud/advisorynotifications/v1/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 #include #include #include diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.cc index 91ab1fd51a198..9298c3cda468a 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/advisorynotifications/v1/service.proto #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.h" +#include "google/cloud/advisorynotifications/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.h b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.h index a4a34d3fe79ec..e7d32201a45d1 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.h +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ADVISORYNOTIFICATIONS_V1_INTERNAL_ADVISORY_NOTIFICATIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ADVISORYNOTIFICATIONS_V1_INTERNAL_ADVISORY_NOTIFICATIONS_STUB_H +#include "google/cloud/advisorynotifications/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub_factory.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub_factory.cc index 8b5e381768696..c9fe0c9fe926d 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub_factory.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_metadata_decorator.h" #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_stub.h" #include "google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.h" +#include "google/cloud/advisorynotifications/v1/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 #include #include diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc index 39fabc0f29c26..ed70ea41287b1 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace advisorynotifications_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AdvisoryNotificationsServiceTracingConnection:: AdvisoryNotificationsServiceTracingConnection( std::shared_ptr< @@ -83,20 +81,16 @@ AdvisoryNotificationsServiceTracingConnection::UpdateSettings( return internal::EndSpan(*span, child_->UpdateSettings(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< advisorynotifications_v1::AdvisoryNotificationsServiceConnection> MakeAdvisoryNotificationsServiceTracingConnection( std::shared_ptr< advisorynotifications_v1::AdvisoryNotificationsServiceConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.h b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.h index ac4fda5815d1a..e8da64991bf1d 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.h +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace advisorynotifications_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AdvisoryNotificationsServiceTracingConnection : public advisorynotifications_v1::AdvisoryNotificationsServiceConnection { public: @@ -66,8 +64,6 @@ class AdvisoryNotificationsServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.cc index 98aa7c2bd0d7e..843908e7c18cc 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace advisorynotifications_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AdvisoryNotificationsServiceTracingStub:: AdvisoryNotificationsServiceTracingStub( std::shared_ptr child) @@ -89,17 +87,11 @@ AdvisoryNotificationsServiceTracingStub::UpdateSettings( child_->UpdateSettings(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAdvisoryNotificationsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.h b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.h index 01a7bb7e41ccd..52d16b8a6f7a9 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.h +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace advisorynotifications_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AdvisoryNotificationsServiceTracingStub : public AdvisoryNotificationsServiceStub { public: @@ -68,8 +66,6 @@ class AdvisoryNotificationsServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/BUILD.bazel b/google/cloud/aiplatform/BUILD.bazel index 3a32819257484..b67fb44afc2f2 100644 --- a/google/cloud/aiplatform/BUILD.bazel +++ b/google/cloud/aiplatform/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/aiplatform/v1:aiplatform_cc_grpc", + "@googleapis//google/cloud/aiplatform/v1:aiplatform_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/aiplatform/quickstart/.bazelrc b/google/cloud/aiplatform/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/aiplatform/quickstart/.bazelrc +++ b/google/cloud/aiplatform/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/aiplatform/v1/dataset_client.h b/google/cloud/aiplatform/v1/dataset_client.h index eb70c8665ef60..d4da487633f17 100644 --- a/google/cloud/aiplatform/v1/dataset_client.h +++ b/google/cloud/aiplatform/v1/dataset_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/dataset_connection.h b/google/cloud/aiplatform/v1/dataset_connection.h index 6607415688baf..cadfd2451138a 100644 --- a/google/cloud/aiplatform/v1/dataset_connection.h +++ b/google/cloud/aiplatform/v1/dataset_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_DATASET_CONNECTION_H #include "google/cloud/aiplatform/v1/dataset_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/dataset_service.pb.h" #include "google/cloud/aiplatform/v1/internal/dataset_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/dataset_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/dataset_connection_idempotency_policy.h index 3f5f321d02bc0..3ddfbbfada5b1 100644 --- a/google/cloud/aiplatform/v1/dataset_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/dataset_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_DATASET_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_DATASET_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/dataset_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/deployment_resource_pool_client.h b/google/cloud/aiplatform/v1/deployment_resource_pool_client.h index ad1b03a170283..d2b90f8025a0b 100644 --- a/google/cloud/aiplatform/v1/deployment_resource_pool_client.h +++ b/google/cloud/aiplatform/v1/deployment_resource_pool_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/deployment_resource_pool_connection.h b/google/cloud/aiplatform/v1/deployment_resource_pool_connection.h index eaa455f09821b..6d858b4f71239 100644 --- a/google/cloud/aiplatform/v1/deployment_resource_pool_connection.h +++ b/google/cloud/aiplatform/v1/deployment_resource_pool_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_DEPLOYMENT_RESOURCE_POOL_CONNECTION_H #include "google/cloud/aiplatform/v1/deployment_resource_pool_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.pb.h" #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/deployment_resource_pool_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/deployment_resource_pool_connection_idempotency_policy.h index b82c38b14afd8..b5fd956d3abbc 100644 --- a/google/cloud/aiplatform/v1/deployment_resource_pool_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/deployment_resource_pool_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_DEPLOYMENT_RESOURCE_POOL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_DEPLOYMENT_RESOURCE_POOL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/endpoint_client.h b/google/cloud/aiplatform/v1/endpoint_client.h index b16970fd895c7..9014bb4e51cce 100644 --- a/google/cloud/aiplatform/v1/endpoint_client.h +++ b/google/cloud/aiplatform/v1/endpoint_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/endpoint_connection.h b/google/cloud/aiplatform/v1/endpoint_connection.h index d5bb5c906ddf0..619565af19b12 100644 --- a/google/cloud/aiplatform/v1/endpoint_connection.h +++ b/google/cloud/aiplatform/v1/endpoint_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_ENDPOINT_CONNECTION_H #include "google/cloud/aiplatform/v1/endpoint_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/endpoint_service.pb.h" #include "google/cloud/aiplatform/v1/internal/endpoint_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/endpoint_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/endpoint_connection_idempotency_policy.h index d743a9be23753..2b9539cb02d2d 100644 --- a/google/cloud/aiplatform/v1/endpoint_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/endpoint_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/endpoint_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/evaluation_connection.h b/google/cloud/aiplatform/v1/evaluation_connection.h index 776ef4d0ca989..2930dc5f9e15b 100644 --- a/google/cloud/aiplatform/v1/evaluation_connection.h +++ b/google/cloud/aiplatform/v1/evaluation_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_EVALUATION_CONNECTION_H #include "google/cloud/aiplatform/v1/evaluation_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/evaluation_service.pb.h" #include "google/cloud/aiplatform/v1/internal/evaluation_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/evaluation_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/evaluation_connection_idempotency_policy.h index 25f5b5f3c58d6..32421e1f33adb 100644 --- a/google/cloud/aiplatform/v1/evaluation_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/evaluation_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_EVALUATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_EVALUATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/evaluation_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/feature_online_store_admin_client.h b/google/cloud/aiplatform/v1/feature_online_store_admin_client.h index 45c419a304b34..c3c23749bfcfa 100644 --- a/google/cloud/aiplatform/v1/feature_online_store_admin_client.h +++ b/google/cloud/aiplatform/v1/feature_online_store_admin_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/feature_online_store_admin_connection.h b/google/cloud/aiplatform/v1/feature_online_store_admin_connection.h index 0ca95936cfb94..82a630e17f31c 100644 --- a/google/cloud/aiplatform/v1/feature_online_store_admin_connection.h +++ b/google/cloud/aiplatform/v1/feature_online_store_admin_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_ONLINE_STORE_ADMIN_CONNECTION_H #include "google/cloud/aiplatform/v1/feature_online_store_admin_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.pb.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/feature_online_store_admin_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/feature_online_store_admin_connection_idempotency_policy.h index 40edb0049b4ec..4991f465900aa 100644 --- a/google/cloud/aiplatform/v1/feature_online_store_admin_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/feature_online_store_admin_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_ONLINE_STORE_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_ONLINE_STORE_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/feature_online_store_connection.h b/google/cloud/aiplatform/v1/feature_online_store_connection.h index 4cae02f7280e4..043a81fed3beb 100644 --- a/google/cloud/aiplatform/v1/feature_online_store_connection.h +++ b/google/cloud/aiplatform/v1/feature_online_store_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_ONLINE_STORE_CONNECTION_H #include "google/cloud/aiplatform/v1/feature_online_store_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/feature_online_store_service.pb.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/async_read_write_stream_impl.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/feature_online_store_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/feature_online_store_connection_idempotency_policy.h index 11afa137a48ac..1dd7b39e8aff7 100644 --- a/google/cloud/aiplatform/v1/feature_online_store_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/feature_online_store_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_ONLINE_STORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_ONLINE_STORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/feature_online_store_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/feature_registry_client.h b/google/cloud/aiplatform/v1/feature_registry_client.h index 21e76c5b5d449..bcc37fe8c96bf 100644 --- a/google/cloud/aiplatform/v1/feature_registry_client.h +++ b/google/cloud/aiplatform/v1/feature_registry_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/feature_registry_connection.h b/google/cloud/aiplatform/v1/feature_registry_connection.h index 9b6656d5aa215..a461a3556f6c5 100644 --- a/google/cloud/aiplatform/v1/feature_registry_connection.h +++ b/google/cloud/aiplatform/v1/feature_registry_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_REGISTRY_CONNECTION_H #include "google/cloud/aiplatform/v1/feature_registry_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/feature_registry_service.pb.h" #include "google/cloud/aiplatform/v1/internal/feature_registry_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/feature_registry_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/feature_registry_connection_idempotency_policy.h index ae95d4f62042a..99fd555cb2224 100644 --- a/google/cloud/aiplatform/v1/feature_registry_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/feature_registry_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURE_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/feature_registry_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/featurestore_client.h b/google/cloud/aiplatform/v1/featurestore_client.h index d80ecad5da24c..79650eaf2c306 100644 --- a/google/cloud/aiplatform/v1/featurestore_client.h +++ b/google/cloud/aiplatform/v1/featurestore_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/featurestore_connection.h b/google/cloud/aiplatform/v1/featurestore_connection.h index ce0d529a4f648..842a45aaa6b6b 100644 --- a/google/cloud/aiplatform/v1/featurestore_connection.h +++ b/google/cloud/aiplatform/v1/featurestore_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_CONNECTION_H #include "google/cloud/aiplatform/v1/featurestore_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/featurestore_service.pb.h" #include "google/cloud/aiplatform/v1/internal/featurestore_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/featurestore_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/featurestore_connection_idempotency_policy.h index b68cf26714780..cb28307d53e0f 100644 --- a/google/cloud/aiplatform/v1/featurestore_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/featurestore_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/featurestore_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/featurestore_online_serving_connection.h b/google/cloud/aiplatform/v1/featurestore_online_serving_connection.h index d6c2c69a520f6..98ecca8d5c36f 100644 --- a/google/cloud/aiplatform/v1/featurestore_online_serving_connection.h +++ b/google/cloud/aiplatform/v1/featurestore_online_serving_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_ONLINE_SERVING_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_ONLINE_SERVING_CONNECTION_H +#include "google/cloud/aiplatform/v1/featurestore_online_service.pb.h" #include "google/cloud/aiplatform/v1/featurestore_online_serving_connection_idempotency_policy.h" #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/featurestore_online_serving_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/featurestore_online_serving_connection_idempotency_policy.h index 27261454e4971..9a2f0af5c1462 100644 --- a/google/cloud/aiplatform/v1/featurestore_online_serving_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/featurestore_online_serving_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_ONLINE_SERVING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_FEATURESTORE_ONLINE_SERVING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/featurestore_online_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/gen_ai_tuning_client.h b/google/cloud/aiplatform/v1/gen_ai_tuning_client.h index 6d0b45a8c3e45..0dde1a79b0881 100644 --- a/google/cloud/aiplatform/v1/gen_ai_tuning_client.h +++ b/google/cloud/aiplatform/v1/gen_ai_tuning_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/gen_ai_tuning_connection.h b/google/cloud/aiplatform/v1/gen_ai_tuning_connection.h index b13055b3fae95..0897d61d845de 100644 --- a/google/cloud/aiplatform/v1/gen_ai_tuning_connection.h +++ b/google/cloud/aiplatform/v1/gen_ai_tuning_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_GEN_AI_TUNING_CONNECTION_H #include "google/cloud/aiplatform/v1/gen_ai_tuning_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/genai_tuning_service.pb.h" #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/gen_ai_tuning_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/gen_ai_tuning_connection_idempotency_policy.h index 0ee9dff240655..bae4f749f36ef 100644 --- a/google/cloud/aiplatform/v1/gen_ai_tuning_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/gen_ai_tuning_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_GEN_AI_TUNING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_GEN_AI_TUNING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/genai_tuning_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/index_client.h b/google/cloud/aiplatform/v1/index_client.h index f6b76cf49a56b..01048b5562221 100644 --- a/google/cloud/aiplatform/v1/index_client.h +++ b/google/cloud/aiplatform/v1/index_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/index_connection.h b/google/cloud/aiplatform/v1/index_connection.h index 03835e83241e9..1b8883df73826 100644 --- a/google/cloud/aiplatform/v1/index_connection.h +++ b/google/cloud/aiplatform/v1/index_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INDEX_CONNECTION_H #include "google/cloud/aiplatform/v1/index_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/index_service.pb.h" #include "google/cloud/aiplatform/v1/internal/index_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/index_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/index_connection_idempotency_policy.h index 2d6a4a9f33f24..4a84e43b6a358 100644 --- a/google/cloud/aiplatform/v1/index_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/index_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INDEX_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INDEX_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/index_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/index_endpoint_client.h b/google/cloud/aiplatform/v1/index_endpoint_client.h index d02cb0518af57..0caddbbe2e4fb 100644 --- a/google/cloud/aiplatform/v1/index_endpoint_client.h +++ b/google/cloud/aiplatform/v1/index_endpoint_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/index_endpoint_connection.h b/google/cloud/aiplatform/v1/index_endpoint_connection.h index 667f0e461cfb5..494516bfccf50 100644 --- a/google/cloud/aiplatform/v1/index_endpoint_connection.h +++ b/google/cloud/aiplatform/v1/index_endpoint_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INDEX_ENDPOINT_CONNECTION_H #include "google/cloud/aiplatform/v1/index_endpoint_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/index_endpoint_service.pb.h" #include "google/cloud/aiplatform/v1/internal/index_endpoint_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/index_endpoint_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/index_endpoint_connection_idempotency_policy.h index 85c76ee774687..45380a935a59e 100644 --- a/google/cloud/aiplatform/v1/index_endpoint_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/index_endpoint_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INDEX_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INDEX_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/index_endpoint_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.cc index ad1a80e259ac7..d53793140ee44 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/dataset_service.proto #include "google/cloud/aiplatform/v1/internal/dataset_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/dataset_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.h b/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.h index 83b88efb15374..43f67d1e551d1 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/dataset_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/dataset_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_connection_impl.h b/google/cloud/aiplatform/v1/internal/dataset_connection_impl.h index d8ad53b542c98..f4ac8d1b8a61a 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/dataset_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.cc index d5dcc11797295..679c374bb59fb 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/dataset_service.proto #include "google/cloud/aiplatform/v1/internal/dataset_logging_decorator.h" +#include "google/cloud/aiplatform/v1/dataset_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.h b/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.h index 19a4f110e9b28..e6258d77cbff4 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/dataset_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/dataset_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.cc index 53a4dc71a767b..e06f6cd4b0286 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/dataset_service.proto #include "google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/dataset_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.h index 67f613312af82..5b220184ce37c 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/dataset_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_stub.cc b/google/cloud/aiplatform/v1/internal/dataset_stub.cc index 4f6a50568bc0a..033665155f6e4 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_stub.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/dataset_service.proto #include "google/cloud/aiplatform/v1/internal/dataset_stub.h" +#include "google/cloud/aiplatform/v1/dataset_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_stub.h b/google/cloud/aiplatform/v1/internal/dataset_stub.h index 3c3dffaa040d1..93fe674d5b50c 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_stub.h +++ b/google/cloud/aiplatform/v1/internal/dataset_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_DATASET_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_DATASET_STUB_H +#include "google/cloud/aiplatform/v1/dataset_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc b/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc index 422c77c91999f..cae33342c2d8f 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/dataset_service.proto #include "google/cloud/aiplatform/v1/internal/dataset_stub_factory.h" +#include "google/cloud/aiplatform/v1/dataset_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/dataset_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/dataset_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/dataset_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/dataset_stub.h" #include "google/cloud/aiplatform/v1/internal/dataset_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc index d491cb283ffa3..437c5c8975606 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatasetServiceTracingConnection::DatasetServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -475,16 +473,12 @@ DatasetServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatasetServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.h b/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.h index 91827a87b5e80..e0816301ce192 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatasetServiceTracingConnection : public aiplatform_v1::DatasetServiceConnection { public: @@ -212,8 +210,6 @@ class DatasetServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc index 84a1aca6330ac..dcc3a4c11299e 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatasetServiceTracingStub::DatasetServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -520,15 +518,9 @@ future DatasetServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatasetServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.h b/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.h index 9d387745c42eb..f9992f4b4b0f1 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatasetServiceTracingStub : public DatasetServiceStub { public: ~DatasetServiceTracingStub() override = default; @@ -243,8 +241,6 @@ class DatasetServiceTracingStub : public DatasetServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.cc index dd93af66a992c..5bd2a437789c9 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/deployment_resource_pool_service.proto #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.h index 24ae4f899b2e5..27909c8c59ef5 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_connection_impl.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_connection_impl.h index 644df1274b835..d8b6aa32a84ef 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.cc index 424a67da7717a..ef14fd7bb2963 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/deployment_resource_pool_service.proto #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.h" +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.h index 48a02beab4b4d..55fecb2f35aaf 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.cc index fd881f57d9a0b..6c3da3b96bf47 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/deployment_resource_pool_service.proto #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/deployment_resource_pool_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.h index 0e5f2ab320785..3c59abccc2a23 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc index f29ccf725822b..87a6c91534d4b 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/deployment_resource_pool_service.proto #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h" +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h index 3097782e6834a..07a439e343422 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_DEPLOYMENT_RESOURCE_POOL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_DEPLOYMENT_RESOURCE_POOL_STUB_H +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc index 9f607c7304c3c..70a1d4a6ce9a8 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/deployment_resource_pool_service.proto #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.h" +#include "google/cloud/aiplatform/v1/deployment_resource_pool_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h" #include "google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.cc index 4504c3d03ae98..445e4019ed3c1 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeploymentResourcePoolServiceTracingConnection:: DeploymentResourcePoolServiceTracingConnection( std::shared_ptr @@ -262,18 +260,14 @@ DeploymentResourcePoolServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeploymentResourcePoolServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.h index 64b1d492576a0..70fc188e69c53 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeploymentResourcePoolServiceTracingConnection : public aiplatform_v1::DeploymentResourcePoolServiceConnection { public: @@ -128,8 +126,6 @@ class DeploymentResourcePoolServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.cc index cd3c2c84ec81f..0e019740558cb 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeploymentResourcePoolServiceTracingStub:: DeploymentResourcePoolServiceTracingStub( std::shared_ptr child) @@ -315,17 +313,11 @@ future DeploymentResourcePoolServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeploymentResourcePoolServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.h index a773b0b32ada7..62253ea906b99 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeploymentResourcePoolServiceTracingStub : public DeploymentResourcePoolServiceStub { public: @@ -149,8 +147,6 @@ class DeploymentResourcePoolServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.cc index b2aaf5cb2f537..36d96a9d71867 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/endpoint_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.h b/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.h index b0e91beb3d96d..518d251eddb07 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/endpoint_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_connection_impl.h b/google/cloud/aiplatform/v1/internal/endpoint_connection_impl.h index f47cd8ed64348..a5a61855f4295 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.cc index 14498fc29b6fa..260e05cee1682 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.h" +#include "google/cloud/aiplatform/v1/endpoint_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.h b/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.h index 0a61443564422..60668ee475f14 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/endpoint_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.cc index f0beb0de14446..5834fb2f02ba3 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/endpoint_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.h index 0ad7500bcab41..1fd5cd9412f2c 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/endpoint_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_stub.cc b/google/cloud/aiplatform/v1/internal/endpoint_stub.cc index d07ca910bf68c..1377c0ecff10b 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_stub.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/endpoint_stub.h" +#include "google/cloud/aiplatform/v1/endpoint_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_stub.h b/google/cloud/aiplatform/v1/internal/endpoint_stub.h index ad2e887552109..ec822bd066a04 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_stub.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_ENDPOINT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_ENDPOINT_STUB_H +#include "google/cloud/aiplatform/v1/endpoint_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc b/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc index bf05ffca0ba7d..f3ffa78f2b5e0 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/endpoint_stub_factory.h" +#include "google/cloud/aiplatform/v1/endpoint_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/endpoint_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/endpoint_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/endpoint_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/endpoint_stub.h" #include "google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc index 6fcf2b4bee9ce..1a3f41853e485 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EndpointServiceTracingConnection::EndpointServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -332,16 +330,12 @@ EndpointServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEndpointServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.h b/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.h index 7e49a57ee0956..950fe8ea853dd 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EndpointServiceTracingConnection : public aiplatform_v1::EndpointServiceConnection { public: @@ -160,8 +158,6 @@ class EndpointServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc index 7316f3f1a8d26..1471584c3eb2a 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EndpointServiceTracingStub::EndpointServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -377,15 +375,9 @@ future EndpointServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEndpointServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.h b/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.h index 454c56c3f824f..1f7ea0a23a2e4 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EndpointServiceTracingStub : public EndpointServiceStub { public: ~EndpointServiceTracingStub() override = default; @@ -185,8 +183,6 @@ class EndpointServiceTracingStub : public EndpointServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/evaluation_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/evaluation_auth_decorator.cc index 407aaa6689be5..7f5e849cb6018 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/evaluation_service.proto #include "google/cloud/aiplatform/v1/internal/evaluation_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/evaluation_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/evaluation_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/evaluation_logging_decorator.cc index 7d47e43e0fde4..44a8e21b26028 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/evaluation_service.proto #include "google/cloud/aiplatform/v1/internal/evaluation_logging_decorator.h" +#include "google/cloud/aiplatform/v1/evaluation_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/evaluation_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/evaluation_metadata_decorator.cc index fafd56bb9397a..ab4a952e112d8 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/evaluation_service.proto #include "google/cloud/aiplatform/v1/internal/evaluation_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/evaluation_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/evaluation_stub.cc b/google/cloud/aiplatform/v1/internal/evaluation_stub.cc index 301423f05946a..ffe9d8b18e7f8 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_stub.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/evaluation_service.proto #include "google/cloud/aiplatform/v1/internal/evaluation_stub.h" +#include "google/cloud/aiplatform/v1/evaluation_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/evaluation_stub.h b/google/cloud/aiplatform/v1/internal/evaluation_stub.h index 3689bb3bce21a..ee76dfe5d00f8 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_stub.h +++ b/google/cloud/aiplatform/v1/internal/evaluation_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_EVALUATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_EVALUATION_STUB_H +#include "google/cloud/aiplatform/v1/evaluation_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/evaluation_stub_factory.cc b/google/cloud/aiplatform/v1/internal/evaluation_stub_factory.cc index f70ddf3088f87..74fd7abc3b3d0 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/evaluation_service.proto #include "google/cloud/aiplatform/v1/internal/evaluation_stub_factory.h" +#include "google/cloud/aiplatform/v1/evaluation_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/evaluation_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/evaluation_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/evaluation_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/evaluation_stub.h" #include "google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.cc index d0444ab154450..b7066f56fbba8 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EvaluationServiceTracingConnection::EvaluationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -134,17 +132,13 @@ EvaluationServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEvaluationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.h b/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.h index ce8ef35478fcb..aa0d1fd3f9e44 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/evaluation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EvaluationServiceTracingConnection : public aiplatform_v1::EvaluationServiceConnection { public: @@ -79,8 +77,6 @@ class EvaluationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.cc index fa7ef3f07f1a7..d5f776904baa4 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EvaluationServiceTracingStub::EvaluationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -160,15 +158,9 @@ EvaluationServiceTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEvaluationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.h b/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.h index 6c63eca305aeb..b73434bbe471f 100644 --- a/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/evaluation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EvaluationServiceTracingStub : public EvaluationServiceStub { public: ~EvaluationServiceTracingStub() override = default; @@ -91,8 +89,6 @@ class EvaluationServiceTracingStub : public EvaluationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.cc index 9ce33b09c9967..86ecf88dc9c1d 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/feature_online_store_admin_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.h index 9a02562f2a83d..5339b88708f6f 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_connection_impl.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_connection_impl.h index 1bb71592f12e5..fde2abf0f77c8 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.cc index 51810252dc1b6..ae4b777de6a3b 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/feature_online_store_admin_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.h" +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.h index 8bfc6a9aa8b08..a821c74955877 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.cc index 04a2d630d3b9e..44d12e1997e2d 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/feature_online_store_admin_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/feature_online_store_admin_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.h index af7016f613c89..fae29e53a0519 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc index 9fe66cf582223..703e1cd13292c 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/feature_online_store_admin_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h" +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h index 87647af1ec515..57ecd022370b2 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURE_ONLINE_STORE_ADMIN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURE_ONLINE_STORE_ADMIN_STUB_H +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc index c5c2b1bda290a..0f9702e1173f5 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/feature_online_store_admin_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.h" +#include "google/cloud/aiplatform/v1/feature_online_store_admin_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.cc index f5e66fab917ba..3ce7dfa39e1b6 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeatureOnlineStoreAdminServiceTracingConnection:: FeatureOnlineStoreAdminServiceTracingConnection( std::shared_ptr @@ -418,18 +416,14 @@ FeatureOnlineStoreAdminServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeatureOnlineStoreAdminServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.h index 0cba9b13c61b5..5c50d75e297cb 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeatureOnlineStoreAdminServiceTracingConnection : public aiplatform_v1::FeatureOnlineStoreAdminServiceConnection { public: @@ -187,8 +185,6 @@ class FeatureOnlineStoreAdminServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.cc index 24b92e9ff994c..40e420bd29323 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeatureOnlineStoreAdminServiceTracingStub:: FeatureOnlineStoreAdminServiceTracingStub( std::shared_ptr child) @@ -466,17 +464,11 @@ future FeatureOnlineStoreAdminServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeatureOnlineStoreAdminServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.h index 5d1dbe3bf7b09..58fb539130e4f 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeatureOnlineStoreAdminServiceTracingStub : public FeatureOnlineStoreAdminServiceStub { public: @@ -211,8 +209,6 @@ class FeatureOnlineStoreAdminServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_auth_decorator.cc index 461c6604cb30c..0ca90c22ffa2d 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/aiplatform/v1/feature_online_store_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_auth_decorator.h" +#include "google/cloud/aiplatform/v1/feature_online_store_service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_logging_decorator.cc index f449fcf481fe2..4224943ccd38a 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/feature_online_store_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_logging_decorator.h" +#include "google/cloud/aiplatform/v1/feature_online_store_service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_metadata_decorator.cc index 92fbf6dd621ba..e29c5c4d27872 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/feature_online_store_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/feature_online_store_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_stub.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_stub.cc index 665c1e046f933..89f6cb3c0da0d 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/feature_online_store_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_stub.h" +#include "google/cloud/aiplatform/v1/feature_online_store_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_stub.h b/google/cloud/aiplatform/v1/internal/feature_online_store_stub.h index c9c7fa272af75..fa0c7c006460e 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURE_ONLINE_STORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURE_ONLINE_STORE_STUB_H +#include "google/cloud/aiplatform/v1/feature_online_store_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_stub_factory.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_stub_factory.cc index 661fa97a4f9e3..cbb58b130f429 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/feature_online_store_service.proto #include "google/cloud/aiplatform/v1/internal/feature_online_store_stub_factory.h" +#include "google/cloud/aiplatform/v1/feature_online_store_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_stub.h" #include "google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.cc index 6cb9d8b582ea9..b35d187f8042a 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeatureOnlineStoreServiceTracingConnection:: FeatureOnlineStoreServiceTracingConnection( std::shared_ptr @@ -165,17 +163,13 @@ FeatureOnlineStoreServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeatureOnlineStoreServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.h b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.h index 9c85fcbc74bcd..1e3bb89bfb029 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeatureOnlineStoreServiceTracingConnection : public aiplatform_v1::FeatureOnlineStoreServiceConnection { public: @@ -95,8 +93,6 @@ class FeatureOnlineStoreServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.cc index 3438ecfa21b64..465d8723153ff 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeatureOnlineStoreServiceTracingStub::FeatureOnlineStoreServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -215,17 +213,11 @@ FeatureOnlineStoreServiceTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeatureOnlineStoreServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.h b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.h index cde29d18cbc44..e3808fd34dd9b 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeatureOnlineStoreServiceTracingStub : public FeatureOnlineStoreServiceStub { public: @@ -112,8 +110,6 @@ class FeatureOnlineStoreServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.cc index 1b04333f98c19..205238828d339 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/feature_registry_service.proto #include "google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/feature_registry_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.h b/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.h index a67bfeb7944dd..d59596997f060 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/feature_registry_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_connection_impl.h b/google/cloud/aiplatform/v1/internal/feature_registry_connection_impl.h index 0d265a94b6b9b..99a45a4833e4c 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.cc index bfb92cd69f858..9f73067f40518 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/feature_registry_service.proto #include "google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.h" +#include "google/cloud/aiplatform/v1/feature_registry_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.h b/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.h index 0e98771688c94..791c77211cfeb 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/feature_registry_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.cc index 1acbafb58f5a1..f1ccd22f63e79 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/feature_registry_service.proto #include "google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/feature_registry_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.h index ba3e829743b39..fc2033de1014b 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/feature_registry_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc b/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc index 1ce5fc329fef9..a33f45977f220 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/feature_registry_service.proto #include "google/cloud/aiplatform/v1/internal/feature_registry_stub.h" +#include "google/cloud/aiplatform/v1/feature_registry_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_stub.h b/google/cloud/aiplatform/v1/internal/feature_registry_stub.h index 2552d71dfada9..1bff00462d083 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURE_REGISTRY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURE_REGISTRY_STUB_H +#include "google/cloud/aiplatform/v1/feature_registry_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc b/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc index e22411b9d6fce..66262b541e4dc 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/feature_registry_service.proto #include "google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.h" +#include "google/cloud/aiplatform/v1/feature_registry_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/feature_registry_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_registry_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_registry_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/feature_registry_stub.h" #include "google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.cc index 22486d8f9f840..5d100ccc674c1 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeatureRegistryServiceTracingConnection:: FeatureRegistryServiceTracingConnection( std::shared_ptr child) @@ -375,17 +373,13 @@ FeatureRegistryServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeatureRegistryServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.h b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.h index 5a0fe6aa2c242..e4517b5574d12 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeatureRegistryServiceTracingConnection : public aiplatform_v1::FeatureRegistryServiceConnection { public: @@ -175,8 +173,6 @@ class FeatureRegistryServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.cc index f091632fb6c5b..b0f7531b77209 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeatureRegistryServiceTracingStub::FeatureRegistryServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -421,16 +419,10 @@ future FeatureRegistryServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeatureRegistryServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.h b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.h index 1143e615e8646..190d22abc47a6 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeatureRegistryServiceTracingStub : public FeatureRegistryServiceStub { public: ~FeatureRegistryServiceTracingStub() override = default; @@ -201,8 +199,6 @@ class FeatureRegistryServiceTracingStub : public FeatureRegistryServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.cc index 3c6e519991a32..103823c5c41ad 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/featurestore_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/featurestore_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.h b/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.h index e0968a62866b1..3ad9e596cabbb 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/featurestore_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_connection_impl.h b/google/cloud/aiplatform/v1/internal/featurestore_connection_impl.h index 5daf4b771d1bb..fef37ae62e664 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.cc index 1cffac611d310..e9f01fb113c28 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/featurestore_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.h" +#include "google/cloud/aiplatform/v1/featurestore_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.h b/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.h index ae22c91068a23..7e0c6162edf74 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/featurestore_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.cc index 9106fdfc69bfb..a8fa90b3738cb 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/featurestore_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/featurestore_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.h index aff8a544ccdd0..4190974cc2810 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/featurestore_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_auth_decorator.cc index 9030868cf78c2..be0c4ccbcf903 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/featurestore_online_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/featurestore_online_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_logging_decorator.cc index 8c7daae5589de..a8e3297032834 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/featurestore_online_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_logging_decorator.h" +#include "google/cloud/aiplatform/v1/featurestore_online_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_metadata_decorator.cc index 9b9d312bfeda1..8d2349fd43fd9 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/featurestore_online_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/featurestore_online_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.cc index 6a584b1cbf124..4bda30a652e99 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/featurestore_online_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.h" +#include "google/cloud/aiplatform/v1/featurestore_online_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.h b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.h index 08f42e67e90ff..d752528234e75 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURESTORE_ONLINE_SERVING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURESTORE_ONLINE_SERVING_STUB_H +#include "google/cloud/aiplatform/v1/featurestore_online_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub_factory.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub_factory.cc index 4dd7bde13e473..ce6daef0c5b6d 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/featurestore_online_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub_factory.h" +#include "google/cloud/aiplatform/v1/featurestore_online_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_stub.h" #include "google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc index ba7ffd0928bc5..03a793a8c534f 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeaturestoreOnlineServingServiceTracingConnection:: FeaturestoreOnlineServingServiceTracingConnection( std::shared_ptr< @@ -170,18 +168,14 @@ FeaturestoreOnlineServingServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeaturestoreOnlineServingServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.h b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.h index 418a08aafa2e0..1b17dc0a7dc65 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeaturestoreOnlineServingServiceTracingConnection : public aiplatform_v1::FeaturestoreOnlineServingServiceConnection { public: @@ -91,8 +89,6 @@ class FeaturestoreOnlineServingServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.cc index da2abd7e3dc0d..c1b139b5318ec 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeaturestoreOnlineServingServiceTracingStub:: FeaturestoreOnlineServingServiceTracingStub( std::shared_ptr child) @@ -205,17 +203,11 @@ FeaturestoreOnlineServingServiceTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeaturestoreOnlineServingServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.h b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.h index 5cc9249bc780a..57a394003a7a1 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeaturestoreOnlineServingServiceTracingStub : public FeaturestoreOnlineServingServiceStub { public: @@ -105,8 +103,6 @@ class FeaturestoreOnlineServingServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/featurestore_stub.cc b/google/cloud/aiplatform/v1/internal/featurestore_stub.cc index e55a7247f15e4..611afdd751c6c 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_stub.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/featurestore_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_stub.h" +#include "google/cloud/aiplatform/v1/featurestore_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_stub.h b/google/cloud/aiplatform/v1/internal/featurestore_stub.h index 2edf9eed58974..99388a74a0e2b 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_stub.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURESTORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_FEATURESTORE_STUB_H +#include "google/cloud/aiplatform/v1/featurestore_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc b/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc index fefe00b3dbceb..c57b0e24cc78c 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/featurestore_service.proto #include "google/cloud/aiplatform/v1/internal/featurestore_stub_factory.h" +#include "google/cloud/aiplatform/v1/featurestore_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/featurestore_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/featurestore_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/featurestore_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/featurestore_stub.h" #include "google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc index a616ea9ebeea3..7d340c7a532c3 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeaturestoreServiceTracingConnection::FeaturestoreServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -582,17 +580,13 @@ FeaturestoreServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeaturestoreServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.h b/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.h index 15853b5c74622..7183a998520f5 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeaturestoreServiceTracingConnection : public aiplatform_v1::FeaturestoreServiceConnection { public: @@ -260,8 +258,6 @@ class FeaturestoreServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc index 3083bcc9771cc..4d6315db03abd 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FeaturestoreServiceTracingStub::FeaturestoreServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -611,15 +609,9 @@ future FeaturestoreServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFeaturestoreServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.h b/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.h index a57448bbc80da..1019d504b26b0 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FeaturestoreServiceTracingStub : public FeaturestoreServiceStub { public: ~FeaturestoreServiceTracingStub() override = default; @@ -286,8 +284,6 @@ class FeaturestoreServiceTracingStub : public FeaturestoreServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.cc index d3490880a4538..a94d9c7ebe854 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/genai_tuning_service.proto #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/genai_tuning_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.h index 685b885e767b1..615ee3e976609 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_connection_impl.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_connection_impl.h index 0dbaa5a496cb5..afba9f45d298d 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.cc index 95f6c86fc02ec..73aa018af89ba 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/genai_tuning_service.proto #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.h" +#include "google/cloud/aiplatform/v1/genai_tuning_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.h index 72dc1ccc454d1..5d0b5cc10b7f6 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.cc index d6c3abfccedf8..f5223cbbe3ee6 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/genai_tuning_service.proto #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/genai_tuning_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.h index 4fa43fb245c9c..16e0c6ae7410d 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc index 61728e12152e0..0faae07d23b07 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/genai_tuning_service.proto #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h" +#include "google/cloud/aiplatform/v1/genai_tuning_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h index 90995f0dfc97a..e0647b1ba6710 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_GEN_AI_TUNING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_GEN_AI_TUNING_STUB_H +#include "google/cloud/aiplatform/v1/genai_tuning_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc index 67b1854720a07..7cf6d0cf9c096 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/genai_tuning_service.proto #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.h" +#include "google/cloud/aiplatform/v1/genai_tuning_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h" #include "google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.cc index 04f4c25684838..cb2261d6865d7 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GenAiTuningServiceTracingConnection::GenAiTuningServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -192,17 +190,13 @@ GenAiTuningServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGenAiTuningServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.h index ef1d4f33daa34..fc8eed57f03ec 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GenAiTuningServiceTracingConnection : public aiplatform_v1::GenAiTuningServiceConnection { public: @@ -101,8 +99,6 @@ class GenAiTuningServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.cc index db66cfdecfed0..0ff9b86d08828 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GenAiTuningServiceTracingStub::GenAiTuningServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -250,15 +248,9 @@ future GenAiTuningServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGenAiTuningServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.h index 29ad1bdb690fd..6f03d124b614a 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GenAiTuningServiceTracingStub : public GenAiTuningServiceStub { public: ~GenAiTuningServiceTracingStub() override = default; @@ -129,8 +127,6 @@ class GenAiTuningServiceTracingStub : public GenAiTuningServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/index_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/index_auth_decorator.cc index 6f7bf9cdb718e..24c5d4e4ff523 100644 --- a/google/cloud/aiplatform/v1/internal/index_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/index_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/index_service.proto #include "google/cloud/aiplatform/v1/internal/index_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/index_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_auth_decorator.h b/google/cloud/aiplatform/v1/internal/index_auth_decorator.h index 7d615341d6e85..dd0a88a8afc55 100644 --- a/google/cloud/aiplatform/v1/internal/index_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/index_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/index_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_connection_impl.h b/google/cloud/aiplatform/v1/internal/index_connection_impl.h index 88f90b7a8bca9..f7148e72d0c00 100644 --- a/google/cloud/aiplatform/v1/internal/index_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/index_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.cc index 388da09f4b777..949dafa3f8427 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/index_endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/index_endpoint_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.h b/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.h index 9df9faadf5387..57d0060917ab1 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/index_endpoint_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_connection_impl.h b/google/cloud/aiplatform/v1/internal/index_endpoint_connection_impl.h index a9455057c8d48..1954d8c76b72e 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.cc index 83e0630fc4c59..a5da99259c8af 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/index_endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.h" +#include "google/cloud/aiplatform/v1/index_endpoint_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.h b/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.h index 807dd358d4e29..ef7d0822fc882 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/index_endpoint_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.cc index 565e93006d0c7..af3406212d237 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/index_endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/index_endpoint_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.h index 43b5f368e9119..e5e5b200983b8 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/index_endpoint_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc index 8e88bb310273e..8b80d6f297c3e 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/index_endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/index_endpoint_stub.h" +#include "google/cloud/aiplatform/v1/index_endpoint_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h index 925d944cf9158..004cdb614110f 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_INDEX_ENDPOINT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_INDEX_ENDPOINT_STUB_H +#include "google/cloud/aiplatform/v1/index_endpoint_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc index 85076d33ee753..3a7f757379e7e 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/index_endpoint_service.proto #include "google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.h" +#include "google/cloud/aiplatform/v1/index_endpoint_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/index_endpoint_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/index_endpoint_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/index_endpoint_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/index_endpoint_stub.h" #include "google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc index eda5cfea4d0a9..a7247f4307a5f 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IndexEndpointServiceTracingConnection::IndexEndpointServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -304,17 +302,13 @@ IndexEndpointServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIndexEndpointServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.h b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.h index 6e52b5bebbc76..c693fbbc4c93e 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IndexEndpointServiceTracingConnection : public aiplatform_v1::IndexEndpointServiceConnection { public: @@ -149,8 +147,6 @@ class IndexEndpointServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc index 0c6ebc04e7ed2..1ceac8a304d54 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IndexEndpointServiceTracingStub::IndexEndpointServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -345,15 +343,9 @@ future IndexEndpointServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIndexEndpointServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.h b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.h index 3253974c179c7..144335d5e61a1 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IndexEndpointServiceTracingStub : public IndexEndpointServiceStub { public: ~IndexEndpointServiceTracingStub() override = default; @@ -173,8 +171,6 @@ class IndexEndpointServiceTracingStub : public IndexEndpointServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/index_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/index_logging_decorator.cc index a0317bf9a67ea..5c77dd9593ca6 100644 --- a/google/cloud/aiplatform/v1/internal/index_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/index_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/index_service.proto #include "google/cloud/aiplatform/v1/internal/index_logging_decorator.h" +#include "google/cloud/aiplatform/v1/index_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_logging_decorator.h b/google/cloud/aiplatform/v1/internal/index_logging_decorator.h index ff27751de1f6a..5c3bd157c6a03 100644 --- a/google/cloud/aiplatform/v1/internal/index_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/index_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/index_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/index_metadata_decorator.cc index 512b560c07978..e9d0d2d41dd64 100644 --- a/google/cloud/aiplatform/v1/internal/index_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/index_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/index_service.proto #include "google/cloud/aiplatform/v1/internal/index_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/index_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/index_metadata_decorator.h index 60b3115519c75..5491fa372c51b 100644 --- a/google/cloud/aiplatform/v1/internal/index_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/index_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/index_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_stub.cc b/google/cloud/aiplatform/v1/internal/index_stub.cc index b09586e01527f..bd7d7540bd717 100644 --- a/google/cloud/aiplatform/v1/internal/index_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/index_service.proto #include "google/cloud/aiplatform/v1/internal/index_stub.h" +#include "google/cloud/aiplatform/v1/index_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_stub.h b/google/cloud/aiplatform/v1/internal/index_stub.h index 00685327e71be..09a2d0398fa8b 100644 --- a/google/cloud/aiplatform/v1/internal/index_stub.h +++ b/google/cloud/aiplatform/v1/internal/index_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_INDEX_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_INDEX_STUB_H +#include "google/cloud/aiplatform/v1/index_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_stub_factory.cc b/google/cloud/aiplatform/v1/internal/index_stub_factory.cc index 942271ee114ba..f9ef17fc79274 100644 --- a/google/cloud/aiplatform/v1/internal/index_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/index_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/aiplatform/v1/index_service.proto #include "google/cloud/aiplatform/v1/internal/index_stub_factory.h" +#include "google/cloud/aiplatform/v1/index_service.grpc.pb.h" #include "google/cloud/aiplatform/v1/internal/index_auth_decorator.h" #include "google/cloud/aiplatform/v1/internal/index_logging_decorator.h" #include "google/cloud/aiplatform/v1/internal/index_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/index_stub.h" #include "google/cloud/aiplatform/v1/internal/index_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc index 63e47c99bcd79..360562d2365ff 100644 --- a/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IndexServiceTracingConnection::IndexServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -245,16 +243,12 @@ IndexServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIndexServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/index_tracing_connection.h b/google/cloud/aiplatform/v1/internal/index_tracing_connection.h index b8762c0754e54..22ec0fa1985c4 100644 --- a/google/cloud/aiplatform/v1/internal/index_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/index_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IndexServiceTracingConnection : public aiplatform_v1::IndexServiceConnection { public: @@ -124,8 +122,6 @@ class IndexServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc index d97b44f113337..27ebef1bd67c5 100644 --- a/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IndexServiceTracingStub::IndexServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -297,15 +295,9 @@ future IndexServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIndexServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/index_tracing_stub.h b/google/cloud/aiplatform/v1/internal/index_tracing_stub.h index f56724dd48c5b..ec24855975d58 100644 --- a/google/cloud/aiplatform/v1/internal/index_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/index_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IndexServiceTracingStub : public IndexServiceStub { public: ~IndexServiceTracingStub() override = default; @@ -151,8 +149,6 @@ class IndexServiceTracingStub : public IndexServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/job_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/job_auth_decorator.cc index 6618f31d44575..06bf9d472e401 100644 --- a/google/cloud/aiplatform/v1/internal/job_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/job_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/job_service.proto #include "google/cloud/aiplatform/v1/internal/job_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/job_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_auth_decorator.h b/google/cloud/aiplatform/v1/internal/job_auth_decorator.h index b9b9db5971119..ea83e326c9a0f 100644 --- a/google/cloud/aiplatform/v1/internal/job_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/job_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/job_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_connection_impl.h b/google/cloud/aiplatform/v1/internal/job_connection_impl.h index 4a1e9093b9a7b..6b75e793f521d 100644 --- a/google/cloud/aiplatform/v1/internal/job_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/job_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/job_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/job_logging_decorator.cc index 7246f93d8cded..946e92d1c5c72 100644 --- a/google/cloud/aiplatform/v1/internal/job_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/job_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/job_service.proto #include "google/cloud/aiplatform/v1/internal/job_logging_decorator.h" +#include "google/cloud/aiplatform/v1/job_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_logging_decorator.h b/google/cloud/aiplatform/v1/internal/job_logging_decorator.h index ceb3aaa9986e8..2a4a8e21f2769 100644 --- a/google/cloud/aiplatform/v1/internal/job_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/job_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/job_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/job_metadata_decorator.cc index bbbb689befcde..ef3879d30b364 100644 --- a/google/cloud/aiplatform/v1/internal/job_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/job_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/job_service.proto #include "google/cloud/aiplatform/v1/internal/job_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/job_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/job_metadata_decorator.h index 9cecf5e666b98..46cf155ccaa91 100644 --- a/google/cloud/aiplatform/v1/internal/job_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/job_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/job_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_stub.cc b/google/cloud/aiplatform/v1/internal/job_stub.cc index 6df2a36a6e0d8..4cfdf22ea503b 100644 --- a/google/cloud/aiplatform/v1/internal/job_stub.cc +++ b/google/cloud/aiplatform/v1/internal/job_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/job_service.proto #include "google/cloud/aiplatform/v1/internal/job_stub.h" +#include "google/cloud/aiplatform/v1/job_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_stub.h b/google/cloud/aiplatform/v1/internal/job_stub.h index 7c40ff6eafef5..45e2d28a522de 100644 --- a/google/cloud/aiplatform/v1/internal/job_stub.h +++ b/google/cloud/aiplatform/v1/internal/job_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_JOB_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_JOB_STUB_H +#include "google/cloud/aiplatform/v1/job_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_stub_factory.cc b/google/cloud/aiplatform/v1/internal/job_stub_factory.cc index 701d198f483f0..c0ca2671f0784 100644 --- a/google/cloud/aiplatform/v1/internal/job_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/job_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/job_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/job_stub.h" #include "google/cloud/aiplatform/v1/internal/job_tracing_stub.h" +#include "google/cloud/aiplatform/v1/job_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc index 653d4fe2aab00..bb0e5702ea31d 100644 --- a/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobServiceTracingConnection::JobServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -641,16 +639,12 @@ JobServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/job_tracing_connection.h b/google/cloud/aiplatform/v1/internal/job_tracing_connection.h index 04da12fc38384..e0a3d5328f206 100644 --- a/google/cloud/aiplatform/v1/internal/job_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/job_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobServiceTracingConnection : public aiplatform_v1::JobServiceConnection { public: ~JobServiceTracingConnection() override = default; @@ -288,8 +286,6 @@ class JobServiceTracingConnection : public aiplatform_v1::JobServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc index 0898fa7512a9a..b2cd6d2747ecf 100644 --- a/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobServiceTracingStub::JobServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -735,15 +733,9 @@ future JobServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/job_tracing_stub.h b/google/cloud/aiplatform/v1/internal/job_tracing_stub.h index fb656016fe6ad..0d03be493ba7f 100644 --- a/google/cloud/aiplatform/v1/internal/job_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/job_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobServiceTracingStub : public JobServiceStub { public: ~JobServiceTracingStub() override = default; @@ -338,8 +336,6 @@ class JobServiceTracingStub : public JobServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/llm_utility_auth_decorator.cc index 0b3f3b0b3d80a..98f07718f0300 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/llm_utility_service.proto #include "google/cloud/aiplatform/v1/internal/llm_utility_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/llm_utility_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/llm_utility_logging_decorator.cc index 70061887b3012..026eb80711956 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/llm_utility_service.proto #include "google/cloud/aiplatform/v1/internal/llm_utility_logging_decorator.h" +#include "google/cloud/aiplatform/v1/llm_utility_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/llm_utility_metadata_decorator.cc index 717f722c77191..1f24e11ad533a 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/llm_utility_service.proto #include "google/cloud/aiplatform/v1/internal/llm_utility_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/llm_utility_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_stub.cc b/google/cloud/aiplatform/v1/internal/llm_utility_stub.cc index 8ee839c47f102..c3a8ae6a2ba82 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_stub.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/llm_utility_service.proto #include "google/cloud/aiplatform/v1/internal/llm_utility_stub.h" +#include "google/cloud/aiplatform/v1/llm_utility_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_stub.h b/google/cloud/aiplatform/v1/internal/llm_utility_stub.h index 01e3c91d90f77..eabc200967c41 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_stub.h +++ b/google/cloud/aiplatform/v1/internal/llm_utility_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_LLM_UTILITY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_LLM_UTILITY_STUB_H +#include "google/cloud/aiplatform/v1/llm_utility_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_stub_factory.cc b/google/cloud/aiplatform/v1/internal/llm_utility_stub_factory.cc index c842326478816..5cc25c0535077 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/llm_utility_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/llm_utility_stub.h" #include "google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.h" +#include "google/cloud/aiplatform/v1/llm_utility_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.cc index c87ebad3c7479..33837f38fa214 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LlmUtilityServiceTracingConnection::LlmUtilityServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -143,17 +141,13 @@ LlmUtilityServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLlmUtilityServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.h b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.h index ce19704faf7f0..0d5a7e2be99fb 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LlmUtilityServiceTracingConnection : public aiplatform_v1::LlmUtilityServiceConnection { public: @@ -82,8 +80,6 @@ class LlmUtilityServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.cc index d6b3f67afd1eb..a344c8f55caae 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LlmUtilityServiceTracingStub::LlmUtilityServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -172,15 +170,9 @@ LlmUtilityServiceTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLlmUtilityServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.h b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.h index 73d3c59dc56e5..e0169975a8a66 100644 --- a/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/llm_utility_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LlmUtilityServiceTracingStub : public LlmUtilityServiceStub { public: ~LlmUtilityServiceTracingStub() override = default; @@ -95,8 +93,6 @@ class LlmUtilityServiceTracingStub : public LlmUtilityServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/match_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/match_auth_decorator.cc index 169a2aad33276..ff1a21406d33e 100644 --- a/google/cloud/aiplatform/v1/internal/match_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/match_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/match_service.proto #include "google/cloud/aiplatform/v1/internal/match_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/match_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/match_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/match_logging_decorator.cc index 07b6461e09bb8..f38c258b71dfd 100644 --- a/google/cloud/aiplatform/v1/internal/match_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/match_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/match_service.proto #include "google/cloud/aiplatform/v1/internal/match_logging_decorator.h" +#include "google/cloud/aiplatform/v1/match_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/match_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/match_metadata_decorator.cc index 3a9b866f30ad6..fca122542aceb 100644 --- a/google/cloud/aiplatform/v1/internal/match_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/match_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/match_service.proto #include "google/cloud/aiplatform/v1/internal/match_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/match_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/match_stub.cc b/google/cloud/aiplatform/v1/internal/match_stub.cc index 01c5625626eb5..0b3e848e24e93 100644 --- a/google/cloud/aiplatform/v1/internal/match_stub.cc +++ b/google/cloud/aiplatform/v1/internal/match_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/match_service.proto #include "google/cloud/aiplatform/v1/internal/match_stub.h" +#include "google/cloud/aiplatform/v1/match_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/match_stub.h b/google/cloud/aiplatform/v1/internal/match_stub.h index 1f873ad330e02..9beaa47b93c55 100644 --- a/google/cloud/aiplatform/v1/internal/match_stub.h +++ b/google/cloud/aiplatform/v1/internal/match_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MATCH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MATCH_STUB_H +#include "google/cloud/aiplatform/v1/match_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/match_stub_factory.cc b/google/cloud/aiplatform/v1/internal/match_stub_factory.cc index ddc23fb9581ed..589e2595f937c 100644 --- a/google/cloud/aiplatform/v1/internal/match_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/match_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/match_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/match_stub.h" #include "google/cloud/aiplatform/v1/internal/match_tracing_stub.h" +#include "google/cloud/aiplatform/v1/match_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/match_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/match_tracing_connection.cc index 11f580130ac5a..f728c37b97711 100644 --- a/google/cloud/aiplatform/v1/internal/match_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/match_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MatchServiceTracingConnection::MatchServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -141,16 +139,12 @@ MatchServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMatchServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/match_tracing_connection.h b/google/cloud/aiplatform/v1/internal/match_tracing_connection.h index 9fde896895324..b17e70a144cbf 100644 --- a/google/cloud/aiplatform/v1/internal/match_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/match_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MatchServiceTracingConnection : public aiplatform_v1::MatchServiceConnection { public: @@ -83,8 +81,6 @@ class MatchServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/match_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/match_tracing_stub.cc index ac69ace20446d..6f11d27251d60 100644 --- a/google/cloud/aiplatform/v1/internal/match_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/match_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MatchServiceTracingStub::MatchServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -170,15 +168,9 @@ StatusOr MatchServiceTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMatchServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/match_tracing_stub.h b/google/cloud/aiplatform/v1/internal/match_tracing_stub.h index af9f24428d6dc..3702d63f51ccb 100644 --- a/google/cloud/aiplatform/v1/internal/match_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/match_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MatchServiceTracingStub : public MatchServiceStub { public: ~MatchServiceTracingStub() override = default; @@ -95,8 +93,6 @@ class MatchServiceTracingStub : public MatchServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.cc index bca5649794111..a007f84c8df6f 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/metadata_service.proto #include "google/cloud/aiplatform/v1/internal/metadata_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/metadata_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.h b/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.h index 75ffb3cbcc251..24e1ec497a469 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/metadata_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/metadata_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_connection_impl.h b/google/cloud/aiplatform/v1/internal/metadata_connection_impl.h index 0584c00d57a1d..65cb9578ae25e 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/metadata_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.cc index 8f8c1954c23b9..3e1bea9f44a90 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/metadata_service.proto #include "google/cloud/aiplatform/v1/internal/metadata_logging_decorator.h" +#include "google/cloud/aiplatform/v1/metadata_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.h b/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.h index d362e4b8e434b..e65d8a83927c5 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/metadata_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/metadata_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.cc index d682e4451e579..32bbcbed3a004 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/metadata_service.proto #include "google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/metadata_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.h index bed00b283513d..253801c2abb39 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/metadata_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_stub.cc b/google/cloud/aiplatform/v1/internal/metadata_stub.cc index e58c05ad4ff57..1eb259526e719 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_stub.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/metadata_service.proto #include "google/cloud/aiplatform/v1/internal/metadata_stub.h" +#include "google/cloud/aiplatform/v1/metadata_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_stub.h b/google/cloud/aiplatform/v1/internal/metadata_stub.h index d529b6e7f23fb..41b66dd09108d 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_stub.h +++ b/google/cloud/aiplatform/v1/internal/metadata_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_METADATA_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_METADATA_STUB_H +#include "google/cloud/aiplatform/v1/metadata_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc b/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc index a65abdf6bed7c..1cc6e071bfb34 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/metadata_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/metadata_stub.h" #include "google/cloud/aiplatform/v1/internal/metadata_tracing_stub.h" +#include "google/cloud/aiplatform/v1/metadata_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc index 2633507caf6a5..b4cc74ef433ad 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetadataServiceTracingConnection::MetadataServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -600,16 +598,12 @@ MetadataServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetadataServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.h b/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.h index f0958482808da..2de74ef303fcd 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetadataServiceTracingConnection : public aiplatform_v1::MetadataServiceConnection { public: @@ -274,8 +272,6 @@ class MetadataServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc index 267484029bc4d..378428679ecb9 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetadataServiceTracingStub::MetadataServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -692,15 +690,9 @@ future MetadataServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetadataServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.h b/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.h index f5612096e0300..36693826e320b 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetadataServiceTracingStub : public MetadataServiceStub { public: ~MetadataServiceTracingStub() override = default; @@ -322,8 +320,6 @@ class MetadataServiceTracingStub : public MetadataServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/migration_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/migration_auth_decorator.cc index b979a135d774f..ff909e9ddae2d 100644 --- a/google/cloud/aiplatform/v1/internal/migration_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/migration_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/migration_service.proto #include "google/cloud/aiplatform/v1/internal/migration_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/migration_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_auth_decorator.h b/google/cloud/aiplatform/v1/internal/migration_auth_decorator.h index 9cd7bfc76b989..8dfcbcb4a8438 100644 --- a/google/cloud/aiplatform/v1/internal/migration_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/migration_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/migration_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_connection_impl.h b/google/cloud/aiplatform/v1/internal/migration_connection_impl.h index 945462fa06fad..372d6a41759c7 100644 --- a/google/cloud/aiplatform/v1/internal/migration_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/migration_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/migration_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/migration_logging_decorator.cc index c79c84beda3b1..d9bc5ad7436ca 100644 --- a/google/cloud/aiplatform/v1/internal/migration_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/migration_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/migration_service.proto #include "google/cloud/aiplatform/v1/internal/migration_logging_decorator.h" +#include "google/cloud/aiplatform/v1/migration_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_logging_decorator.h b/google/cloud/aiplatform/v1/internal/migration_logging_decorator.h index a1b5aa18c5635..c10069858ccea 100644 --- a/google/cloud/aiplatform/v1/internal/migration_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/migration_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/migration_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.cc index fd58fa7db4557..813faa75f4464 100644 --- a/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/migration_service.proto #include "google/cloud/aiplatform/v1/internal/migration_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/migration_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.h index b6d1549b80f31..be9559f3b0571 100644 --- a/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/migration_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/migration_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_stub.cc b/google/cloud/aiplatform/v1/internal/migration_stub.cc index c0ec77ab7f8ec..0c3f550831726 100644 --- a/google/cloud/aiplatform/v1/internal/migration_stub.cc +++ b/google/cloud/aiplatform/v1/internal/migration_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/migration_service.proto #include "google/cloud/aiplatform/v1/internal/migration_stub.h" +#include "google/cloud/aiplatform/v1/migration_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_stub.h b/google/cloud/aiplatform/v1/internal/migration_stub.h index 828fb58c7b8c2..510a52af82814 100644 --- a/google/cloud/aiplatform/v1/internal/migration_stub.h +++ b/google/cloud/aiplatform/v1/internal/migration_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MIGRATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MIGRATION_STUB_H +#include "google/cloud/aiplatform/v1/migration_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc b/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc index ff538294f5e42..2d82522576451 100644 --- a/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/migration_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/migration_stub.h" #include "google/cloud/aiplatform/v1/internal/migration_tracing_stub.h" +#include "google/cloud/aiplatform/v1/migration_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc index 21aa88a6a5a81..5058c920c796d 100644 --- a/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MigrationServiceTracingConnection::MigrationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -170,16 +168,12 @@ MigrationServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMigrationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/migration_tracing_connection.h b/google/cloud/aiplatform/v1/internal/migration_tracing_connection.h index 68b4edd35e6c4..cd75d6801cafc 100644 --- a/google/cloud/aiplatform/v1/internal/migration_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/migration_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MigrationServiceTracingConnection : public aiplatform_v1::MigrationServiceConnection { public: @@ -93,8 +91,6 @@ class MigrationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc index 27f46567ec427..af42f715988e1 100644 --- a/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MigrationServiceTracingStub::MigrationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -220,15 +218,9 @@ future MigrationServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMigrationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/migration_tracing_stub.h b/google/cloud/aiplatform/v1/internal/migration_tracing_stub.h index 340b34282df10..3800c65e394eb 100644 --- a/google/cloud/aiplatform/v1/internal/migration_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/migration_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MigrationServiceTracingStub : public MigrationServiceStub { public: ~MigrationServiceTracingStub() override = default; @@ -115,8 +113,6 @@ class MigrationServiceTracingStub : public MigrationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/model_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/model_auth_decorator.cc index 8e7c4758591bd..0bea87c5c7dbd 100644 --- a/google/cloud/aiplatform/v1/internal/model_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/model_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/model_service.proto #include "google/cloud/aiplatform/v1/internal/model_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/model_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_auth_decorator.h b/google/cloud/aiplatform/v1/internal/model_auth_decorator.h index 2a18d231572a4..37947ded2f218 100644 --- a/google/cloud/aiplatform/v1/internal/model_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/model_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/model_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_connection_impl.h b/google/cloud/aiplatform/v1/internal/model_connection_impl.h index d7bad7c0ec829..eb3936cefdee1 100644 --- a/google/cloud/aiplatform/v1/internal/model_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/model_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.cc index 8364d719db038..22df782e0283b 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/model_garden_service.proto #include "google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/model_garden_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.h b/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.h index 35316c8707bde..db51b614f9876 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/model_garden_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_connection_impl.h b/google/cloud/aiplatform/v1/internal/model_garden_connection_impl.h index aa284dbf3b901..6dec955b26cce 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.cc index 054023dc5e905..7bb00a7f39213 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/model_garden_service.proto #include "google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.h" +#include "google/cloud/aiplatform/v1/model_garden_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.h b/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.h index b4931ca211f14..6fc1b8a386bbc 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/model_garden_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.cc index 99d47433413bd..debb11c492ab0 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/model_garden_service.proto #include "google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/model_garden_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.h index 5e05533b329dc..32109bcfdb15e 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/model_garden_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_stub.cc b/google/cloud/aiplatform/v1/internal/model_garden_stub.cc index 1dae9ace2d294..06200bba42a76 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_stub.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/model_garden_service.proto #include "google/cloud/aiplatform/v1/internal/model_garden_stub.h" +#include "google/cloud/aiplatform/v1/model_garden_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_stub.h b/google/cloud/aiplatform/v1/internal/model_garden_stub.h index 6fe4bf9517d12..0db6c767e613a 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_stub.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MODEL_GARDEN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MODEL_GARDEN_STUB_H +#include "google/cloud/aiplatform/v1/model_garden_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_stub_factory.cc b/google/cloud/aiplatform/v1/internal/model_garden_stub_factory.cc index e5aa9ba918298..7247339ad0258 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/model_garden_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/model_garden_stub.h" #include "google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.h" +#include "google/cloud/aiplatform/v1/model_garden_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.cc index a22a9ab0e01c9..621b284e33f82 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelGardenServiceTracingConnection::ModelGardenServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -161,17 +159,13 @@ ModelGardenServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelGardenServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.h b/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.h index bd1849a45228c..9deab23d3cf71 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelGardenServiceTracingConnection : public aiplatform_v1::ModelGardenServiceConnection { public: @@ -88,8 +86,6 @@ class ModelGardenServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.cc index 1204881fdd49e..b5663eb8e11e4 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelGardenServiceTracingStub::ModelGardenServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -213,15 +211,9 @@ future ModelGardenServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelGardenServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.h b/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.h index ff03af012ba9e..9d3f1425fb9e9 100644 --- a/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/model_garden_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelGardenServiceTracingStub : public ModelGardenServiceStub { public: ~ModelGardenServiceTracingStub() override = default; @@ -112,8 +110,6 @@ class ModelGardenServiceTracingStub : public ModelGardenServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/model_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/model_logging_decorator.cc index 7e65f6f1b6fbe..709f2e630f2a1 100644 --- a/google/cloud/aiplatform/v1/internal/model_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/model_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/model_service.proto #include "google/cloud/aiplatform/v1/internal/model_logging_decorator.h" +#include "google/cloud/aiplatform/v1/model_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_logging_decorator.h b/google/cloud/aiplatform/v1/internal/model_logging_decorator.h index ac7d78131a730..450151035421e 100644 --- a/google/cloud/aiplatform/v1/internal/model_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/model_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/model_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/model_metadata_decorator.cc index 33571d0239c26..593862f15b91d 100644 --- a/google/cloud/aiplatform/v1/internal/model_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/model_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/model_service.proto #include "google/cloud/aiplatform/v1/internal/model_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/model_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/model_metadata_decorator.h index 609febf3e4be9..69a186a226b80 100644 --- a/google/cloud/aiplatform/v1/internal/model_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/model_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/model_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_stub.cc b/google/cloud/aiplatform/v1/internal/model_stub.cc index 1c96ec5c5a6f7..c8918bf444df9 100644 --- a/google/cloud/aiplatform/v1/internal/model_stub.cc +++ b/google/cloud/aiplatform/v1/internal/model_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/model_service.proto #include "google/cloud/aiplatform/v1/internal/model_stub.h" +#include "google/cloud/aiplatform/v1/model_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_stub.h b/google/cloud/aiplatform/v1/internal/model_stub.h index dd75acbd68c1c..504bd2efbbbee 100644 --- a/google/cloud/aiplatform/v1/internal/model_stub.h +++ b/google/cloud/aiplatform/v1/internal/model_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MODEL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_MODEL_STUB_H +#include "google/cloud/aiplatform/v1/model_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_stub_factory.cc b/google/cloud/aiplatform/v1/internal/model_stub_factory.cc index 509f837315b14..99497aeaa28b0 100644 --- a/google/cloud/aiplatform/v1/internal/model_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/model_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/model_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/model_stub.h" #include "google/cloud/aiplatform/v1/internal/model_tracing_stub.h" +#include "google/cloud/aiplatform/v1/model_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc index fa83f90980e3b..5cbede77dc90b 100644 --- a/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelServiceTracingConnection::ModelServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -439,16 +437,12 @@ ModelServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/model_tracing_connection.h b/google/cloud/aiplatform/v1/internal/model_tracing_connection.h index 8ceffc7bd6d8a..81d7c0c9fd5ed 100644 --- a/google/cloud/aiplatform/v1/internal/model_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/model_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelServiceTracingConnection : public aiplatform_v1::ModelServiceConnection { public: @@ -207,8 +205,6 @@ class ModelServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc index 1f19efb642d52..8a974f8aaa2d4 100644 --- a/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelServiceTracingStub::ModelServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -499,15 +497,9 @@ future ModelServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/model_tracing_stub.h b/google/cloud/aiplatform/v1/internal/model_tracing_stub.h index 57a4cd056a36a..2542def9333d4 100644 --- a/google/cloud/aiplatform/v1/internal/model_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/model_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelServiceTracingStub : public ModelServiceStub { public: ~ModelServiceTracingStub() override = default; @@ -240,8 +238,6 @@ class ModelServiceTracingStub : public ModelServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.cc index 8170e503c78f0..f8cd3bdd78465 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/notebook_service.proto #include "google/cloud/aiplatform/v1/internal/notebook_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/notebook_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.h b/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.h index 552dc4f4821b5..19d7d6a0eb27a 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/notebook_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/notebook_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_connection_impl.h b/google/cloud/aiplatform/v1/internal/notebook_connection_impl.h index e4f05481252a9..afc154846f687 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/notebook_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.cc index 02c75e946ecee..d82b7d630ee28 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/notebook_service.proto #include "google/cloud/aiplatform/v1/internal/notebook_logging_decorator.h" +#include "google/cloud/aiplatform/v1/notebook_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.h b/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.h index 2bdeeb9ceb0e1..8de105915f42e 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/notebook_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/notebook_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.cc index 903e963cb376e..9c8259a84772d 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/notebook_service.proto #include "google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/notebook_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.h index a989d617d6b16..68f07c59f5083 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/notebook_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_stub.cc b/google/cloud/aiplatform/v1/internal/notebook_stub.cc index b4debca94a5c8..a5236da2b80ea 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_stub.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/notebook_service.proto #include "google/cloud/aiplatform/v1/internal/notebook_stub.h" +#include "google/cloud/aiplatform/v1/notebook_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_stub.h b/google/cloud/aiplatform/v1/internal/notebook_stub.h index c88c1803084e0..ffdde89db0f68 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_stub.h +++ b/google/cloud/aiplatform/v1/internal/notebook_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_NOTEBOOK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_NOTEBOOK_STUB_H +#include "google/cloud/aiplatform/v1/notebook_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc b/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc index 2abb664bff2fa..6a80ea48f764a 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/notebook_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/notebook_stub.h" #include "google/cloud/aiplatform/v1/internal/notebook_tracing_stub.h" +#include "google/cloud/aiplatform/v1/notebook_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.cc index 0f54a7b3bc8b5..650f5347177ea 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotebookServiceTracingConnection::NotebookServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -502,16 +500,12 @@ NotebookServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotebookServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.h b/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.h index 63d2a20c07f7b..427405b246f7e 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/notebook_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotebookServiceTracingConnection : public aiplatform_v1::NotebookServiceConnection { public: @@ -235,8 +233,6 @@ class NotebookServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.cc index 24f669d348eba..72f22d587119b 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotebookServiceTracingStub::NotebookServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -544,15 +542,9 @@ future NotebookServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotebookServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.h b/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.h index 2a8c107360d8c..d700a3ed953ad 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/notebook_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotebookServiceTracingStub : public NotebookServiceStub { public: ~NotebookServiceTracingStub() override = default; @@ -250,8 +248,6 @@ class NotebookServiceTracingStub : public NotebookServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.cc index 27cdfe41dd900..9ca0c205a4676 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/persistent_resource_service.proto #include "google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/persistent_resource_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.h b/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.h index 2a233cc812167..e8d02e4b469d5 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/persistent_resource_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_connection_impl.h b/google/cloud/aiplatform/v1/internal/persistent_resource_connection_impl.h index ff50567f084f1..5ffc836f8fdae 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.cc index b23e8d783ce50..a15eb9ebe9afd 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/persistent_resource_service.proto #include "google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.h" +#include "google/cloud/aiplatform/v1/persistent_resource_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.h b/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.h index dbcf0dadc5bbc..ace9824463241 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/persistent_resource_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.cc index 0d021f98800f6..72e533987ad00 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/persistent_resource_service.proto #include "google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/persistent_resource_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.h index 542bd95f2a16c..23f7b415be9b3 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/persistent_resource_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc index a53d617de7fd0..40aee6fc7c67c 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/persistent_resource_service.proto #include "google/cloud/aiplatform/v1/internal/persistent_resource_stub.h" +#include "google/cloud/aiplatform/v1/persistent_resource_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h index 4135276d851d5..3fbf3f6e0317b 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_PERSISTENT_RESOURCE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_PERSISTENT_RESOURCE_STUB_H +#include "google/cloud/aiplatform/v1/persistent_resource_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc index f285d96824b02..c8bb29c2ba088 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/persistent_resource_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/persistent_resource_stub.h" #include "google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.h" +#include "google/cloud/aiplatform/v1/persistent_resource_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.cc index 336ecf4a963d9..a71c277894c30 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PersistentResourceServiceTracingConnection:: PersistentResourceServiceTracingConnection( std::shared_ptr @@ -295,17 +293,13 @@ PersistentResourceServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePersistentResourceServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.h b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.h index b22ae0c624ebe..981da883868f8 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PersistentResourceServiceTracingConnection : public aiplatform_v1::PersistentResourceServiceConnection { public: @@ -141,8 +139,6 @@ class PersistentResourceServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.cc index 120407fabb943..89e7749a5f406 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PersistentResourceServiceTracingStub::PersistentResourceServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -338,17 +336,11 @@ future PersistentResourceServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePersistentResourceServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.h b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.h index e9297235108fb..158b181d3081d 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PersistentResourceServiceTracingStub : public PersistentResourceServiceStub { public: @@ -162,8 +160,6 @@ class PersistentResourceServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.cc index 685f70781763b..b65a5c51cf079 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/pipeline_service.proto #include "google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/pipeline_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.h b/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.h index 1e2fc3c621fb7..d130196faf222 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/pipeline_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_connection_impl.h b/google/cloud/aiplatform/v1/internal/pipeline_connection_impl.h index 97aaa4ce5ab7a..60d7249fc0173 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.cc index 80c486868ad56..7c89c81a11ca5 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/pipeline_service.proto #include "google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.h" +#include "google/cloud/aiplatform/v1/pipeline_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.h b/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.h index 09f98eef8af1a..b13b97a17cb0a 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/pipeline_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.cc index 72dcad2df4f2c..2bf6a79ec02f5 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/pipeline_service.proto #include "google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/pipeline_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.h index 9c368c2ea2942..0e6641e67aee1 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/pipeline_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_stub.cc b/google/cloud/aiplatform/v1/internal/pipeline_stub.cc index 3fe72031e865e..382c4bdc8c662 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_stub.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/pipeline_service.proto #include "google/cloud/aiplatform/v1/internal/pipeline_stub.h" +#include "google/cloud/aiplatform/v1/pipeline_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_stub.h b/google/cloud/aiplatform/v1/internal/pipeline_stub.h index 856177ab4f873..663d87c558248 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_stub.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_PIPELINE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_PIPELINE_STUB_H +#include "google/cloud/aiplatform/v1/pipeline_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc b/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc index d53fb3e99dff7..1db242c975e3a 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/pipeline_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/pipeline_stub.h" #include "google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.h" +#include "google/cloud/aiplatform/v1/pipeline_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc index 2e9ecea13af50..0b815a1290928 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PipelineServiceTracingConnection::PipelineServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -332,16 +330,12 @@ PipelineServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePipelineServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.h b/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.h index 396c815a836d8..0acba441e5804 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PipelineServiceTracingConnection : public aiplatform_v1::PipelineServiceConnection { public: @@ -166,8 +164,6 @@ class PipelineServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc index fed723308c89f..8498d5c7c573a 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PipelineServiceTracingStub::PipelineServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -392,15 +390,9 @@ future PipelineServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePipelineServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.h b/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.h index e20c8b9259cea..bc6de3a0a0ef3 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PipelineServiceTracingStub : public PipelineServiceStub { public: ~PipelineServiceTracingStub() override = default; @@ -187,8 +185,6 @@ class PipelineServiceTracingStub : public PipelineServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/prediction_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/prediction_auth_decorator.cc index 92defa2eb1e73..d5ff26f772e89 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/aiplatform/v1/prediction_service.proto #include "google/cloud/aiplatform/v1/internal/prediction_auth_decorator.h" +#include "google/cloud/aiplatform/v1/prediction_service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/prediction_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/prediction_logging_decorator.cc index f4534f0b8d193..da64e803fa70e 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_logging_decorator.cc @@ -17,11 +17,11 @@ // source: google/cloud/aiplatform/v1/prediction_service.proto #include "google/cloud/aiplatform/v1/internal/prediction_logging_decorator.h" +#include "google/cloud/aiplatform/v1/prediction_service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/prediction_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/prediction_metadata_decorator.cc index e61cdca2aa952..e391c9a79ae89 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/prediction_service.proto #include "google/cloud/aiplatform/v1/internal/prediction_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/prediction_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/prediction_stub.cc b/google/cloud/aiplatform/v1/internal/prediction_stub.cc index 9fe265094cbf1..c71be6b8028c7 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_stub.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/prediction_service.proto #include "google/cloud/aiplatform/v1/internal/prediction_stub.h" +#include "google/cloud/aiplatform/v1/prediction_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/internal/prediction_stub.h b/google/cloud/aiplatform/v1/internal/prediction_stub.h index 9fcd28cb8ddd2..c86b3c059e5c9 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_stub.h +++ b/google/cloud/aiplatform/v1/internal/prediction_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_PREDICTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_PREDICTION_STUB_H +#include "google/cloud/aiplatform/v1/prediction_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/prediction_stub_factory.cc b/google/cloud/aiplatform/v1/internal/prediction_stub_factory.cc index 28d1d4221ad0a..c7821d98cb9c9 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/prediction_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/prediction_stub.h" #include "google/cloud/aiplatform/v1/internal/prediction_tracing_stub.h" +#include "google/cloud/aiplatform/v1/prediction_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc index 94ad46219a977..142d364cdf5f9 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PredictionServiceTracingConnection::PredictionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -247,17 +245,13 @@ PredictionServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePredictionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.h b/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.h index 034c291082190..6d57f76c878f1 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PredictionServiceTracingConnection : public aiplatform_v1::PredictionServiceConnection { public: @@ -133,8 +131,6 @@ class PredictionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.cc index 6329fabf2efcb..661433cde24a4 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.cc @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PredictionServiceTracingStub::PredictionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -349,15 +347,9 @@ PredictionServiceTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePredictionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.h b/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.h index 9efedd095ea76..be9285a26f24f 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/prediction_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PredictionServiceTracingStub : public PredictionServiceStub { public: ~PredictionServiceTracingStub() override = default; @@ -170,8 +168,6 @@ class PredictionServiceTracingStub : public PredictionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.cc index 22ebeb51fce0e..2022999a53646 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/schedule_service.proto #include "google/cloud/aiplatform/v1/internal/schedule_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/schedule_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.h b/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.h index 491fc533077b0..aa3a9ead2e987 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/schedule_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/schedule_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_connection_impl.h b/google/cloud/aiplatform/v1/internal/schedule_connection_impl.h index dae0584614b4a..e0e742b516dd4 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/schedule_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.cc index 65d4b515936b9..0c32646fbbe73 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/schedule_service.proto #include "google/cloud/aiplatform/v1/internal/schedule_logging_decorator.h" +#include "google/cloud/aiplatform/v1/schedule_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.h b/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.h index c1a20787aed2b..d195de0538c29 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/schedule_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/schedule_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.cc index f4d9db5703795..f0100eb9844c1 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/schedule_service.proto #include "google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/schedule_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.h index 1cb9f44a5e97f..5850d5a4f8a59 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/schedule_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_stub.cc b/google/cloud/aiplatform/v1/internal/schedule_stub.cc index f3711d706c48a..5902802b581f7 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_stub.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/schedule_service.proto #include "google/cloud/aiplatform/v1/internal/schedule_stub.h" +#include "google/cloud/aiplatform/v1/schedule_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_stub.h b/google/cloud/aiplatform/v1/internal/schedule_stub.h index 5e3cc59354173..930f74399c7ba 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_stub.h +++ b/google/cloud/aiplatform/v1/internal/schedule_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_SCHEDULE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_SCHEDULE_STUB_H +#include "google/cloud/aiplatform/v1/schedule_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc b/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc index 8a6c4c899830f..514d0d516a4c7 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/schedule_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/schedule_stub.h" #include "google/cloud/aiplatform/v1/internal/schedule_tracing_stub.h" +#include "google/cloud/aiplatform/v1/schedule_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.cc index f025448a5b62a..4039ce9aef634 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ScheduleServiceTracingConnection::ScheduleServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -208,16 +206,12 @@ ScheduleServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeScheduleServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.h b/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.h index 25a6f339c2e48..1752686a1936e 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/schedule_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ScheduleServiceTracingConnection : public aiplatform_v1::ScheduleServiceConnection { public: @@ -109,8 +107,6 @@ class ScheduleServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.cc index 9caf9919b78f0..b159dd09c77b6 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ScheduleServiceTracingStub::ScheduleServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -273,15 +271,9 @@ future ScheduleServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeScheduleServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.h b/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.h index f3e80a81d77b1..ac1446bb398ae 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/schedule_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ScheduleServiceTracingStub : public ScheduleServiceStub { public: ~ScheduleServiceTracingStub() override = default; @@ -139,8 +137,6 @@ class ScheduleServiceTracingStub : public ScheduleServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.cc index c60d355f50100..238251848c6a0 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/specialist_pool_service.proto #include "google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/specialist_pool_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.h b/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.h index 4a406c5f7d082..545ca57263498 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/specialist_pool_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_connection_impl.h b/google/cloud/aiplatform/v1/internal/specialist_pool_connection_impl.h index 8e3a3f117818b..2f5474705a13e 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.cc index 982e6a3bab8e2..c10bc5a8dc334 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/specialist_pool_service.proto #include "google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.h" +#include "google/cloud/aiplatform/v1/specialist_pool_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.h b/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.h index 2be66816765af..cb07ee0706904 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/specialist_pool_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.cc index 7574d8989b9d2..5d4c8083eeaaf 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/specialist_pool_service.proto #include "google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/specialist_pool_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.h index 64a29fe777d6d..a3447fd8c4109 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/specialist_pool_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc index 841c9c013ef67..743fc01834be9 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/specialist_pool_service.proto #include "google/cloud/aiplatform/v1/internal/specialist_pool_stub.h" +#include "google/cloud/aiplatform/v1/specialist_pool_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h index 43a77d0569957..255a0a734450b 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_SPECIALIST_POOL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_SPECIALIST_POOL_STUB_H +#include "google/cloud/aiplatform/v1/specialist_pool_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc index 24c792ff1a719..a20bd1c889012 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/specialist_pool_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/specialist_pool_stub.h" #include "google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.h" +#include "google/cloud/aiplatform/v1/specialist_pool_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc index 3b05bdbcb8d82..08240a6673ab9 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpecialistPoolServiceTracingConnection::SpecialistPoolServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -239,17 +237,13 @@ SpecialistPoolServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpecialistPoolServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.h b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.h index 14835ac33192e..00aa26d9ced4d 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpecialistPoolServiceTracingConnection : public aiplatform_v1::SpecialistPoolServiceConnection { public: @@ -124,8 +122,6 @@ class SpecialistPoolServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc index a83e32d22d736..5145b09d715c5 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpecialistPoolServiceTracingStub::SpecialistPoolServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -290,15 +288,9 @@ future SpecialistPoolServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpecialistPoolServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.h b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.h index 8e12b6b0d78d0..9e73be1713b2a 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpecialistPoolServiceTracingStub : public SpecialistPoolServiceStub { public: ~SpecialistPoolServiceTracingStub() override = default; @@ -144,8 +142,6 @@ class SpecialistPoolServiceTracingStub : public SpecialistPoolServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.cc index 670ccaa7104cb..a5d1222183c11 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/tensorboard_service.proto #include "google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/tensorboard_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.h b/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.h index d368603c0115e..651b2292486e7 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/tensorboard_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_connection_impl.h b/google/cloud/aiplatform/v1/internal/tensorboard_connection_impl.h index aa7acdf469c75..de8631c8f5f7c 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.cc index ddc000d245b4a..f7e2919fb1196 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/tensorboard_service.proto #include "google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.h" +#include "google/cloud/aiplatform/v1/tensorboard_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.h b/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.h index 4be5647485a56..b67a599b5cbe2 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/tensorboard_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.cc index 7b9322c7e8b2c..6c93efff9af1d 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/tensorboard_service.proto #include "google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/tensorboard_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.h index 8c435cb1f9c95..697e8ca5aa049 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/tensorboard_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc b/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc index 7d225b0cce8d8..10ab6755508b2 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/tensorboard_service.proto #include "google/cloud/aiplatform/v1/internal/tensorboard_stub.h" +#include "google/cloud/aiplatform/v1/tensorboard_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_stub.h b/google/cloud/aiplatform/v1/internal/tensorboard_stub.h index d89eb5e236944..00e6ac54a7843 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_stub.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_TENSORBOARD_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_TENSORBOARD_STUB_H +#include "google/cloud/aiplatform/v1/tensorboard_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc b/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc index af4e993d9299c..621f5f7f66ee0 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/tensorboard_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/tensorboard_stub.h" #include "google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.h" +#include "google/cloud/aiplatform/v1/tensorboard_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc index d6bc9ec2ec262..d99a66bf99d2e 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TensorboardServiceTracingConnection::TensorboardServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -582,17 +580,13 @@ TensorboardServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTensorboardServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.h b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.h index 824973f4ea846..50f2b29f7b51a 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TensorboardServiceTracingConnection : public aiplatform_v1::TensorboardServiceConnection { public: @@ -271,8 +269,6 @@ class TensorboardServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc index 55276a5e7514a..5010f6638c3dc 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TensorboardServiceTracingStub::TensorboardServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -689,15 +687,9 @@ future TensorboardServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTensorboardServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.h b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.h index 5c9b863789d6a..b3ababd292fc6 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TensorboardServiceTracingStub : public TensorboardServiceStub { public: ~TensorboardServiceTracingStub() override = default; @@ -315,8 +313,6 @@ class TensorboardServiceTracingStub : public TensorboardServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.cc b/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.cc index 6805d476d2485..cd25e46932fea 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/aiplatform/v1/vizier_service.proto #include "google/cloud/aiplatform/v1/internal/vizier_auth_decorator.h" -#include +#include "google/cloud/aiplatform/v1/vizier_service.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.h b/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.h index afef20b19185a..1b5d559afe391 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.h +++ b/google/cloud/aiplatform/v1/internal/vizier_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/vizier_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_connection_impl.h b/google/cloud/aiplatform/v1/internal/vizier_connection_impl.h index 223676940fa04..4dc4689fd0a41 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_connection_impl.h +++ b/google/cloud/aiplatform/v1/internal/vizier_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.cc b/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.cc index 1e1bf57902070..13cf29b3eb584 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/aiplatform/v1/vizier_service.proto #include "google/cloud/aiplatform/v1/internal/vizier_logging_decorator.h" +#include "google/cloud/aiplatform/v1/vizier_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.h b/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.h index 2de7fbe6b4b78..bc7403d507578 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.h +++ b/google/cloud/aiplatform/v1/internal/vizier_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/vizier_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.cc b/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.cc index ff7f1960111a0..5f558939756ea 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/aiplatform/v1/vizier_service.proto #include "google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.h" +#include "google/cloud/aiplatform/v1/vizier_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 #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.h b/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.h index 186deaf547ecd..eb605b9ca68bf 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.h +++ b/google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/aiplatform/v1/internal/vizier_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_stub.cc b/google/cloud/aiplatform/v1/internal/vizier_stub.cc index ca92970cbf97d..b39fc8ac30c02 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_stub.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/aiplatform/v1/vizier_service.proto #include "google/cloud/aiplatform/v1/internal/vizier_stub.h" +#include "google/cloud/aiplatform/v1/vizier_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_stub.h b/google/cloud/aiplatform/v1/internal/vizier_stub.h index 8bdad179953a9..8f126216359c1 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_stub.h +++ b/google/cloud/aiplatform/v1/internal/vizier_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_VIZIER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_INTERNAL_VIZIER_STUB_H +#include "google/cloud/aiplatform/v1/vizier_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc b/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc index a62f4e0206bd3..b07fad51d8c39 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/aiplatform/v1/internal/vizier_metadata_decorator.h" #include "google/cloud/aiplatform/v1/internal/vizier_stub.h" #include "google/cloud/aiplatform/v1/internal/vizier_tracing_stub.h" +#include "google/cloud/aiplatform/v1/vizier_service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc index c409ce92dee41..3d82dba4471a6 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VizierServiceTracingConnection::VizierServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -305,16 +303,12 @@ VizierServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVizierServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.h b/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.h index 38b4a4a1d638a..8d4ebdffff0f1 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.h +++ b/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VizierServiceTracingConnection : public aiplatform_v1::VizierServiceConnection { public: @@ -148,8 +146,6 @@ class VizierServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc index 76c9aa7f8c077..fc1b67d4c84c0 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VizierServiceTracingStub::VizierServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -385,15 +383,9 @@ future VizierServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVizierServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.h b/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.h index f2cb2ec0c94c4..1cd457a7e92d1 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.h +++ b/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace aiplatform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VizierServiceTracingStub : public VizierServiceStub { public: ~VizierServiceTracingStub() override = default; @@ -181,8 +179,6 @@ class VizierServiceTracingStub : public VizierServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/aiplatform/v1/job_client.h b/google/cloud/aiplatform/v1/job_client.h index d161580a96854..b7a93ead72212 100644 --- a/google/cloud/aiplatform/v1/job_client.h +++ b/google/cloud/aiplatform/v1/job_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/job_connection.h b/google/cloud/aiplatform/v1/job_connection.h index 36211341f6fec..33c162a632b61 100644 --- a/google/cloud/aiplatform/v1/job_connection.h +++ b/google/cloud/aiplatform/v1/job_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/job_retry_traits.h" #include "google/cloud/aiplatform/v1/job_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/job_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/job_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/job_connection_idempotency_policy.h index 69814e5a459c0..620ff2bd2de91 100644 --- a/google/cloud/aiplatform/v1/job_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/job_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_JOB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_JOB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/job_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/llm_utility_connection.h b/google/cloud/aiplatform/v1/llm_utility_connection.h index cbbbab31abfa4..191a1b59ca0bd 100644 --- a/google/cloud/aiplatform/v1/llm_utility_connection.h +++ b/google/cloud/aiplatform/v1/llm_utility_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/aiplatform/v1/internal/llm_utility_retry_traits.h" #include "google/cloud/aiplatform/v1/llm_utility_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/llm_utility_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/llm_utility_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/llm_utility_connection_idempotency_policy.h index dc9d95c02a6c6..e7a571ba732ea 100644 --- a/google/cloud/aiplatform/v1/llm_utility_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/llm_utility_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_LLM_UTILITY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_LLM_UTILITY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/llm_utility_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/match_connection.h b/google/cloud/aiplatform/v1/match_connection.h index ae3c16010343d..7ac977c10d15a 100644 --- a/google/cloud/aiplatform/v1/match_connection.h +++ b/google/cloud/aiplatform/v1/match_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/aiplatform/v1/internal/match_retry_traits.h" #include "google/cloud/aiplatform/v1/match_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/match_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/match_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/match_connection_idempotency_policy.h index 3fdd966b0e886..79a1993966abe 100644 --- a/google/cloud/aiplatform/v1/match_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/match_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MATCH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MATCH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/match_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/metadata_client.h b/google/cloud/aiplatform/v1/metadata_client.h index 28548d9428724..8fc349016330f 100644 --- a/google/cloud/aiplatform/v1/metadata_client.h +++ b/google/cloud/aiplatform/v1/metadata_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/metadata_connection.h b/google/cloud/aiplatform/v1/metadata_connection.h index ff802d1254bc3..70236da9b8c59 100644 --- a/google/cloud/aiplatform/v1/metadata_connection.h +++ b/google/cloud/aiplatform/v1/metadata_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/metadata_retry_traits.h" #include "google/cloud/aiplatform/v1/metadata_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/metadata_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/metadata_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/metadata_connection_idempotency_policy.h index cc88b3f5bf6b4..5680c4b071cb0 100644 --- a/google/cloud/aiplatform/v1/metadata_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/metadata_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/metadata_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/migration_client.h b/google/cloud/aiplatform/v1/migration_client.h index 7204cf37b3452..b8f61135d1acd 100644 --- a/google/cloud/aiplatform/v1/migration_client.h +++ b/google/cloud/aiplatform/v1/migration_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/migration_connection.h b/google/cloud/aiplatform/v1/migration_connection.h index bbadd5bfa71b7..b1dce629941cf 100644 --- a/google/cloud/aiplatform/v1/migration_connection.h +++ b/google/cloud/aiplatform/v1/migration_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/migration_retry_traits.h" #include "google/cloud/aiplatform/v1/migration_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/migration_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/migration_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/migration_connection_idempotency_policy.h index 228a4dfb989b3..e5382a8efcd71 100644 --- a/google/cloud/aiplatform/v1/migration_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/migration_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/migration_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/model_client.h b/google/cloud/aiplatform/v1/model_client.h index 05c9d14ce41a3..823454f1840e2 100644 --- a/google/cloud/aiplatform/v1/model_client.h +++ b/google/cloud/aiplatform/v1/model_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/model_connection.h b/google/cloud/aiplatform/v1/model_connection.h index c4f57b5c83d5e..35c90921fed5d 100644 --- a/google/cloud/aiplatform/v1/model_connection.h +++ b/google/cloud/aiplatform/v1/model_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/model_retry_traits.h" #include "google/cloud/aiplatform/v1/model_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/model_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/model_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/model_connection_idempotency_policy.h index 2be68a892c44a..9651156dadd22 100644 --- a/google/cloud/aiplatform/v1/model_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/model_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MODEL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MODEL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/model_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/model_garden_client.h b/google/cloud/aiplatform/v1/model_garden_client.h index 78a1a0a8905a8..5932ce9e6e6d1 100644 --- a/google/cloud/aiplatform/v1/model_garden_client.h +++ b/google/cloud/aiplatform/v1/model_garden_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/model_garden_connection.h b/google/cloud/aiplatform/v1/model_garden_connection.h index 9a82b9d264fdf..ed39fe437ea82 100644 --- a/google/cloud/aiplatform/v1/model_garden_connection.h +++ b/google/cloud/aiplatform/v1/model_garden_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/model_garden_retry_traits.h" #include "google/cloud/aiplatform/v1/model_garden_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/model_garden_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/model_garden_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/model_garden_connection_idempotency_policy.h index 5d5743ff0f564..9894b122a7057 100644 --- a/google/cloud/aiplatform/v1/model_garden_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/model_garden_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MODEL_GARDEN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_MODEL_GARDEN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/model_garden_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/notebook_client.h b/google/cloud/aiplatform/v1/notebook_client.h index 7dff5106fd915..e398003f92ac5 100644 --- a/google/cloud/aiplatform/v1/notebook_client.h +++ b/google/cloud/aiplatform/v1/notebook_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/notebook_connection.h b/google/cloud/aiplatform/v1/notebook_connection.h index be9505e1563e9..c33de4c75ff9b 100644 --- a/google/cloud/aiplatform/v1/notebook_connection.h +++ b/google/cloud/aiplatform/v1/notebook_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/notebook_retry_traits.h" #include "google/cloud/aiplatform/v1/notebook_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/notebook_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/notebook_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/notebook_connection_idempotency_policy.h index 1495b6fa70022..4ae60255120b9 100644 --- a/google/cloud/aiplatform/v1/notebook_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/notebook_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/notebook_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/persistent_resource_client.h b/google/cloud/aiplatform/v1/persistent_resource_client.h index 6e1da918e5ab3..94a3a2719b7ac 100644 --- a/google/cloud/aiplatform/v1/persistent_resource_client.h +++ b/google/cloud/aiplatform/v1/persistent_resource_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/persistent_resource_connection.h b/google/cloud/aiplatform/v1/persistent_resource_connection.h index 6dac0171625ec..f676b4654d675 100644 --- a/google/cloud/aiplatform/v1/persistent_resource_connection.h +++ b/google/cloud/aiplatform/v1/persistent_resource_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/persistent_resource_retry_traits.h" #include "google/cloud/aiplatform/v1/persistent_resource_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/persistent_resource_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/persistent_resource_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/persistent_resource_connection_idempotency_policy.h index 835dfcbe513aa..92a3a9d131c4d 100644 --- a/google/cloud/aiplatform/v1/persistent_resource_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/persistent_resource_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_PERSISTENT_RESOURCE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_PERSISTENT_RESOURCE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/persistent_resource_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/pipeline_client.h b/google/cloud/aiplatform/v1/pipeline_client.h index 88b967418b822..b52895c309b21 100644 --- a/google/cloud/aiplatform/v1/pipeline_client.h +++ b/google/cloud/aiplatform/v1/pipeline_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/pipeline_connection.h b/google/cloud/aiplatform/v1/pipeline_connection.h index 43561cd9cc7bb..3311d9eceaa3b 100644 --- a/google/cloud/aiplatform/v1/pipeline_connection.h +++ b/google/cloud/aiplatform/v1/pipeline_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/pipeline_retry_traits.h" #include "google/cloud/aiplatform/v1/pipeline_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/pipeline_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/pipeline_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/pipeline_connection_idempotency_policy.h index 9d11d229dbe82..811234c1ee4f3 100644 --- a/google/cloud/aiplatform/v1/pipeline_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/pipeline_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_PIPELINE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_PIPELINE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/pipeline_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/prediction_connection.h b/google/cloud/aiplatform/v1/prediction_connection.h index 61a4011a3aa49..7eb7aba43e99b 100644 --- a/google/cloud/aiplatform/v1/prediction_connection.h +++ b/google/cloud/aiplatform/v1/prediction_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/prediction_retry_traits.h" #include "google/cloud/aiplatform/v1/prediction_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/prediction_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/aiplatform/v1/prediction_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/prediction_connection_idempotency_policy.h index 2cbe32a74e1c8..39d04a7567bc2 100644 --- a/google/cloud/aiplatform/v1/prediction_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/prediction_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/prediction_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/schedule_client.h b/google/cloud/aiplatform/v1/schedule_client.h index 93f744c9a7282..06933e2ae4a8e 100644 --- a/google/cloud/aiplatform/v1/schedule_client.h +++ b/google/cloud/aiplatform/v1/schedule_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/schedule_connection.h b/google/cloud/aiplatform/v1/schedule_connection.h index 0be8920d0a862..497c4d1066c44 100644 --- a/google/cloud/aiplatform/v1/schedule_connection.h +++ b/google/cloud/aiplatform/v1/schedule_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/schedule_retry_traits.h" #include "google/cloud/aiplatform/v1/schedule_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/schedule_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/schedule_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/schedule_connection_idempotency_policy.h index 15e1a41e4869e..4dfdbce8390bd 100644 --- a/google/cloud/aiplatform/v1/schedule_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/schedule_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_SCHEDULE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_SCHEDULE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/schedule_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/specialist_pool_client.h b/google/cloud/aiplatform/v1/specialist_pool_client.h index dbd2ea4919019..9b3c9ef544dac 100644 --- a/google/cloud/aiplatform/v1/specialist_pool_client.h +++ b/google/cloud/aiplatform/v1/specialist_pool_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/specialist_pool_connection.h b/google/cloud/aiplatform/v1/specialist_pool_connection.h index 91c4c39a7505b..1cc5eadef32a3 100644 --- a/google/cloud/aiplatform/v1/specialist_pool_connection.h +++ b/google/cloud/aiplatform/v1/specialist_pool_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/specialist_pool_retry_traits.h" #include "google/cloud/aiplatform/v1/specialist_pool_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/specialist_pool_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/specialist_pool_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/specialist_pool_connection_idempotency_policy.h index c21ee99f1bcdc..f297d723a698c 100644 --- a/google/cloud/aiplatform/v1/specialist_pool_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/specialist_pool_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_SPECIALIST_POOL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_SPECIALIST_POOL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/specialist_pool_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/tensorboard_client.h b/google/cloud/aiplatform/v1/tensorboard_client.h index d6f10a11cd36b..9844c0b24ac3f 100644 --- a/google/cloud/aiplatform/v1/tensorboard_client.h +++ b/google/cloud/aiplatform/v1/tensorboard_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/tensorboard_connection.h b/google/cloud/aiplatform/v1/tensorboard_connection.h index 353d2277041f1..baa2d6199d97b 100644 --- a/google/cloud/aiplatform/v1/tensorboard_connection.h +++ b/google/cloud/aiplatform/v1/tensorboard_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/tensorboard_retry_traits.h" #include "google/cloud/aiplatform/v1/tensorboard_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/tensorboard_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/tensorboard_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/tensorboard_connection_idempotency_policy.h index de0b426880245..342e83ca0d870 100644 --- a/google/cloud/aiplatform/v1/tensorboard_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/tensorboard_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_TENSORBOARD_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_TENSORBOARD_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/tensorboard_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/aiplatform/v1/vizier_client.h b/google/cloud/aiplatform/v1/vizier_client.h index 39bdf58b2bcfa..e7faea5ecd189 100644 --- a/google/cloud/aiplatform/v1/vizier_client.h +++ b/google/cloud/aiplatform/v1/vizier_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/aiplatform/v1/vizier_connection.h b/google/cloud/aiplatform/v1/vizier_connection.h index 23ca3d936d359..47b078d3a0177 100644 --- a/google/cloud/aiplatform/v1/vizier_connection.h +++ b/google/cloud/aiplatform/v1/vizier_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/aiplatform/v1/internal/vizier_retry_traits.h" #include "google/cloud/aiplatform/v1/vizier_connection_idempotency_policy.h" +#include "google/cloud/aiplatform/v1/vizier_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/aiplatform/v1/vizier_connection_idempotency_policy.h b/google/cloud/aiplatform/v1/vizier_connection_idempotency_policy.h index a94b8ebcfa0ec..4342b560891c7 100644 --- a/google/cloud/aiplatform/v1/vizier_connection_idempotency_policy.h +++ b/google/cloud/aiplatform/v1/vizier_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_VIZIER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AIPLATFORM_V1_VIZIER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/aiplatform/v1/vizier_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/alloydb/BUILD.bazel b/google/cloud/alloydb/BUILD.bazel index 9b90196e9337c..1a6fc0ddfa957 100644 --- a/google/cloud/alloydb/BUILD.bazel +++ b/google/cloud/alloydb/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/alloydb/v1:alloydb_cc_grpc", + "@googleapis//google/cloud/alloydb/v1:alloydb_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/alloydb/quickstart/.bazelrc b/google/cloud/alloydb/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/alloydb/quickstart/.bazelrc +++ b/google/cloud/alloydb/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/alloydb/v1/alloy_db_admin_client.h b/google/cloud/alloydb/v1/alloy_db_admin_client.h index a8fe6f1431d73..8e124b0f0bb85 100644 --- a/google/cloud/alloydb/v1/alloy_db_admin_client.h +++ b/google/cloud/alloydb/v1/alloy_db_admin_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/alloydb/v1/alloy_db_admin_connection.h b/google/cloud/alloydb/v1/alloy_db_admin_connection.h index 3d1d8a21ff748..a9ec08c2a38e6 100644 --- a/google/cloud/alloydb/v1/alloy_db_admin_connection.h +++ b/google/cloud/alloydb/v1/alloy_db_admin_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/alloydb/v1/alloy_db_admin_connection_idempotency_policy.h" #include "google/cloud/alloydb/v1/internal/alloy_db_admin_retry_traits.h" +#include "google/cloud/alloydb/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/alloydb/v1/alloy_db_admin_connection_idempotency_policy.h b/google/cloud/alloydb/v1/alloy_db_admin_connection_idempotency_policy.h index 351efc9e62522..e11bcadb9dea7 100644 --- a/google/cloud/alloydb/v1/alloy_db_admin_connection_idempotency_policy.h +++ b/google/cloud/alloydb/v1/alloy_db_admin_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ALLOYDB_V1_ALLOY_DB_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ALLOYDB_V1_ALLOY_DB_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/alloydb/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.cc index 0555447f5b519..24f4391dff2e7 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/alloydb/v1/service.proto #include "google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.h" -#include +#include "google/cloud/alloydb/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.h index 290c386e554aa..18c8e79a28d5a 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_connection_impl.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_connection_impl.h index 2122c10698b20..d1170b5b70661 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_connection_impl.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.cc index e4451b8c60dd1..8779c1b244e9d 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/alloydb/v1/service.proto #include "google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.h" +#include "google/cloud/alloydb/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.h index 32d1b789a8d3d..5f26d62790d59 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.cc index 6fcce41ba2af3..f568ac00ed568 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/alloydb/v1/service.proto #include "google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.h" +#include "google/cloud/alloydb/v1/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 #include #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.h index 72630a43e6388..6bc54731d8760 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc index a0f18ecd4205d..3e97fc148eb77 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/alloydb/v1/service.proto #include "google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h" +#include "google/cloud/alloydb/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h index 448991524bb62..6c0fb007418ca 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ALLOYDB_V1_INTERNAL_ALLOY_DB_ADMIN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ALLOYDB_V1_INTERNAL_ALLOY_DB_ADMIN_STUB_H +#include "google/cloud/alloydb/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc index f82f732e137e3..e8c74e4e1d179 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/alloydb/v1/internal/alloy_db_admin_metadata_decorator.h" #include "google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h" #include "google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.h" +#include "google/cloud/alloydb/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc index c021f389e8d33..2870a46744f37 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace alloydb_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AlloyDBAdminTracingConnection::AlloyDBAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -852,16 +850,12 @@ Status AlloyDBAdminTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAlloyDBAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.h index 44aa83f712883..b8e8c12e94df7 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace alloydb_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AlloyDBAdminTracingConnection : public alloydb_v1::AlloyDBAdminConnection { public: @@ -355,8 +353,6 @@ class AlloyDBAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc index b5b776d547499..3df1c56d1b797 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace alloydb_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AlloyDBAdminTracingStub::AlloyDBAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -871,15 +869,9 @@ future AlloyDBAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAlloyDBAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.h index abc55c7320afc..6a39f663f50b4 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace alloydb_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AlloyDBAdminTracingStub : public AlloyDBAdminStub { public: ~AlloyDBAdminTracingStub() override = default; @@ -383,8 +381,6 @@ class AlloyDBAdminTracingStub : public AlloyDBAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/apigateway/BUILD.bazel b/google/cloud/apigateway/BUILD.bazel index 78feee464f8bc..7b34a88dd50fd 100644 --- a/google/cloud/apigateway/BUILD.bazel +++ b/google/cloud/apigateway/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/apigateway/v1:apigateway_cc_grpc", + "@googleapis//google/cloud/apigateway/v1:apigateway_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apigateway/quickstart/.bazelrc b/google/cloud/apigateway/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/apigateway/quickstart/.bazelrc +++ b/google/cloud/apigateway/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/apigateway/v1/api_gateway_client.h b/google/cloud/apigateway/v1/api_gateway_client.h index a5c8d59062d90..73eb87ee11038 100644 --- a/google/cloud/apigateway/v1/api_gateway_client.h +++ b/google/cloud/apigateway/v1/api_gateway_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apigateway/v1/api_gateway_connection.h b/google/cloud/apigateway/v1/api_gateway_connection.h index ebaf51e29e0d8..a376f5d952702 100644 --- a/google/cloud/apigateway/v1/api_gateway_connection.h +++ b/google/cloud/apigateway/v1/api_gateway_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_V1_API_GATEWAY_CONNECTION_H #include "google/cloud/apigateway/v1/api_gateway_connection_idempotency_policy.h" +#include "google/cloud/apigateway/v1/apigateway_service.pb.h" #include "google/cloud/apigateway/v1/internal/api_gateway_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apigateway/v1/api_gateway_connection_idempotency_policy.h b/google/cloud/apigateway/v1/api_gateway_connection_idempotency_policy.h index f7643569af365..66d28e6b09a43 100644 --- a/google/cloud/apigateway/v1/api_gateway_connection_idempotency_policy.h +++ b/google/cloud/apigateway/v1/api_gateway_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_V1_API_GATEWAY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_V1_API_GATEWAY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/apigateway/v1/apigateway_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.cc b/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.cc index dadcf70243831..6d680bd820fab 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/apigateway/v1/apigateway_service.proto #include "google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.h" -#include +#include "google/cloud/apigateway/v1/apigateway_service.grpc.pb.h" #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.h b/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.h index 93c3156215daf..e040311eef0b1 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apigateway/v1/internal/api_gateway_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_connection_impl.h b/google/cloud/apigateway/v1/internal/api_gateway_connection_impl.h index 7ecf3194e2e63..c2965086db970 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_connection_impl.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.cc b/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.cc index b0c6358a39a2d..e9ca2e3ad4908 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/apigateway/v1/apigateway_service.proto #include "google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.h" +#include "google/cloud/apigateway/v1/apigateway_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.h b/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.h index edd5a751bc940..f8dff0a9502db 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apigateway/v1/internal/api_gateway_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.cc b/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.cc index 09771ce5fb159..fbf43d96ad29d 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/apigateway/v1/apigateway_service.proto #include "google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.h" +#include "google/cloud/apigateway/v1/apigateway_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 #include #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.h b/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.h index f7fb5e6ee2d53..fded050c0d74a 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apigateway/v1/internal/api_gateway_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_stub.cc b/google/cloud/apigateway/v1/internal/api_gateway_stub.cc index 09d5f97b2b025..7353bfe825669 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_stub.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/apigateway/v1/apigateway_service.proto #include "google/cloud/apigateway/v1/internal/api_gateway_stub.h" +#include "google/cloud/apigateway/v1/apigateway_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_stub.h b/google/cloud/apigateway/v1/internal/api_gateway_stub.h index a0e1f55b004db..8bcece4587f68 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_stub.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_V1_INTERNAL_API_GATEWAY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_V1_INTERNAL_API_GATEWAY_STUB_H +#include "google/cloud/apigateway/v1/apigateway_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_stub_factory.cc b/google/cloud/apigateway/v1/internal/api_gateway_stub_factory.cc index dd40a5d2a1247..73c47610fccb1 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_stub_factory.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/apigateway/v1/apigateway_service.proto #include "google/cloud/apigateway/v1/internal/api_gateway_stub_factory.h" +#include "google/cloud/apigateway/v1/apigateway_service.grpc.pb.h" #include "google/cloud/apigateway/v1/internal/api_gateway_auth_decorator.h" #include "google/cloud/apigateway/v1/internal/api_gateway_logging_decorator.h" #include "google/cloud/apigateway/v1/internal/api_gateway_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc b/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc index 539f41bc71d48..19844e08f35f4 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace apigateway_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ApiGatewayServiceTracingConnection::ApiGatewayServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -348,17 +346,13 @@ ApiGatewayServiceTracingConnection::DeleteApiConfig( return internal::EndSpan(std::move(span), child_->DeleteApiConfig(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeApiGatewayServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.h b/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.h index 7a180a7ce1054..39c967f077577 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace apigateway_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ApiGatewayServiceTracingConnection : public apigateway_v1::ApiGatewayServiceConnection { public: @@ -165,8 +163,6 @@ class ApiGatewayServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc b/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc index 50b4ff12a5f75..1edb7f45e5d75 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace apigateway_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ApiGatewayServiceTracingStub::ApiGatewayServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -369,15 +367,9 @@ future ApiGatewayServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeApiGatewayServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.h b/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.h index a21e4de539d4a..3b7460c8d39e3 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace apigateway_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ApiGatewayServiceTracingStub : public ApiGatewayServiceStub { public: ~ApiGatewayServiceTracingStub() override = default; @@ -186,8 +184,6 @@ class ApiGatewayServiceTracingStub : public ApiGatewayServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/apigeeconnect/BUILD.bazel b/google/cloud/apigeeconnect/BUILD.bazel index 6a8714fa07948..c274e55b3bd79 100644 --- a/google/cloud/apigeeconnect/BUILD.bazel +++ b/google/cloud/apigeeconnect/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/apigeeconnect/v1:apigeeconnect_cc_grpc", + "@googleapis//google/cloud/apigeeconnect/v1:apigeeconnect_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apigeeconnect/quickstart/.bazelrc b/google/cloud/apigeeconnect/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/apigeeconnect/quickstart/.bazelrc +++ b/google/cloud/apigeeconnect/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/apigeeconnect/v1/connection_connection.h b/google/cloud/apigeeconnect/v1/connection_connection.h index 506e345332ec4..0acd5da0b0674 100644 --- a/google/cloud/apigeeconnect/v1/connection_connection.h +++ b/google/cloud/apigeeconnect/v1/connection_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_V1_CONNECTION_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_V1_CONNECTION_CONNECTION_H +#include "google/cloud/apigeeconnect/v1/connection.pb.h" #include "google/cloud/apigeeconnect/v1/connection_connection_idempotency_policy.h" #include "google/cloud/apigeeconnect/v1/internal/connection_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/apigeeconnect/v1/connection_connection_idempotency_policy.h b/google/cloud/apigeeconnect/v1/connection_connection_idempotency_policy.h index 19bf869a8a2b9..bb1b3b5f8632a 100644 --- a/google/cloud/apigeeconnect/v1/connection_connection_idempotency_policy.h +++ b/google/cloud/apigeeconnect/v1/connection_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_V1_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_V1_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/apigeeconnect/v1/connection.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/apigeeconnect/v1/internal/connection_auth_decorator.cc b/google/cloud/apigeeconnect/v1/internal/connection_auth_decorator.cc index 92d3995628ea6..e3012ecfe4359 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_auth_decorator.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/apigeeconnect/v1/connection.proto #include "google/cloud/apigeeconnect/v1/internal/connection_auth_decorator.h" -#include +#include "google/cloud/apigeeconnect/v1/connection.grpc.pb.h" #include #include diff --git a/google/cloud/apigeeconnect/v1/internal/connection_logging_decorator.cc b/google/cloud/apigeeconnect/v1/internal/connection_logging_decorator.cc index fc9c8cbcc1c1b..6ca92dba4b491 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_logging_decorator.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/apigeeconnect/v1/connection.proto #include "google/cloud/apigeeconnect/v1/internal/connection_logging_decorator.h" +#include "google/cloud/apigeeconnect/v1/connection.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/apigeeconnect/v1/internal/connection_metadata_decorator.cc b/google/cloud/apigeeconnect/v1/internal/connection_metadata_decorator.cc index f4ff80e2e7942..ebb48513af37d 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_metadata_decorator.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/apigeeconnect/v1/connection.proto #include "google/cloud/apigeeconnect/v1/internal/connection_metadata_decorator.h" +#include "google/cloud/apigeeconnect/v1/connection.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 #include #include #include diff --git a/google/cloud/apigeeconnect/v1/internal/connection_stub.cc b/google/cloud/apigeeconnect/v1/internal/connection_stub.cc index 61bd92a3d2fc2..db5ba375bc869 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_stub.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/apigeeconnect/v1/connection.proto #include "google/cloud/apigeeconnect/v1/internal/connection_stub.h" +#include "google/cloud/apigeeconnect/v1/connection.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/apigeeconnect/v1/internal/connection_stub.h b/google/cloud/apigeeconnect/v1/internal/connection_stub.h index d24cbc8b7cad5..39a259e72745e 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_stub.h +++ b/google/cloud/apigeeconnect/v1/internal/connection_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_V1_INTERNAL_CONNECTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_V1_INTERNAL_CONNECTION_STUB_H +#include "google/cloud/apigeeconnect/v1/connection.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/apigeeconnect/v1/internal/connection_stub_factory.cc b/google/cloud/apigeeconnect/v1/internal/connection_stub_factory.cc index bc2c14d37cf80..c18a849fbe665 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_stub_factory.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/apigeeconnect/v1/connection.proto #include "google/cloud/apigeeconnect/v1/internal/connection_stub_factory.h" +#include "google/cloud/apigeeconnect/v1/connection.grpc.pb.h" #include "google/cloud/apigeeconnect/v1/internal/connection_auth_decorator.h" #include "google/cloud/apigeeconnect/v1/internal/connection_logging_decorator.h" #include "google/cloud/apigeeconnect/v1/internal/connection_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc b/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc index 91dd2035e8453..7097253d7072d 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace apigeeconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConnectionServiceTracingConnection::ConnectionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -45,17 +43,13 @@ ConnectionServiceTracingConnection::ListConnections( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConnectionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.h b/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.h index 1052cb0d351be..d597a0964f6ae 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.h +++ b/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace apigeeconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConnectionServiceTracingConnection : public apigeeconnect_v1::ConnectionServiceConnection { public: @@ -48,8 +46,6 @@ class ConnectionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.cc b/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.cc index 005cd0ffcb7dd..5973b151c1bb1 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace apigeeconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConnectionServiceTracingStub::ConnectionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ ConnectionServiceTracingStub::ListConnections( child_->ListConnections(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConnectionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.h b/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.h index 9bf61f26ff102..c3d572e72b175 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.h +++ b/google/cloud/apigeeconnect/v1/internal/connection_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace apigeeconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConnectionServiceTracingStub : public ConnectionServiceStub { public: ~ConnectionServiceTracingStub() override = default; @@ -51,8 +49,6 @@ class ConnectionServiceTracingStub : public ConnectionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/apikeys/BUILD.bazel b/google/cloud/apikeys/BUILD.bazel index 5cdf8c63ef63e..1be25cbf1ae44 100644 --- a/google/cloud/apikeys/BUILD.bazel +++ b/google/cloud/apikeys/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/api/apikeys/v2:apikeys_cc_grpc", + "@googleapis//google/api/apikeys/v2:apikeys_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apikeys/quickstart/.bazelrc b/google/cloud/apikeys/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/apikeys/quickstart/.bazelrc +++ b/google/cloud/apikeys/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/apikeys/v2/api_keys_client.h b/google/cloud/apikeys/v2/api_keys_client.h index 2be36706202f2..497962470258a 100644 --- a/google/cloud/apikeys/v2/api_keys_client.h +++ b/google/cloud/apikeys/v2/api_keys_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apikeys/v2/api_keys_connection.h b/google/cloud/apikeys/v2/api_keys_connection.h index d31c39d5016fe..e2ed3166006aa 100644 --- a/google/cloud/apikeys/v2/api_keys_connection.h +++ b/google/cloud/apikeys/v2/api_keys_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/apikeys/v2/apikeys.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apikeys/v2/api_keys_connection_idempotency_policy.h b/google/cloud/apikeys/v2/api_keys_connection_idempotency_policy.h index ae88488a6f709..c130e9565ffa2 100644 --- a/google/cloud/apikeys/v2/api_keys_connection_idempotency_policy.h +++ b/google/cloud/apikeys/v2/api_keys_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.cc b/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.cc index 2cee7a101ec3e..7807421c988bf 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/apikeys/v2/apikeys.proto #include "google/cloud/apikeys/v2/internal/api_keys_auth_decorator.h" -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.h b/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.h index 2022492482f28..787112bda7169 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.h +++ b/google/cloud/apikeys/v2/internal/api_keys_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apikeys/v2/internal/api_keys_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_connection_impl.h b/google/cloud/apikeys/v2/internal/api_keys_connection_impl.h index 0b4affed839a1..00f3d701d0e37 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_connection_impl.h +++ b/google/cloud/apikeys/v2/internal/api_keys_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.cc b/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.cc index dc08d8cf174c3..552d75f9cbee9 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/apikeys/v2/internal/api_keys_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" #include #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.h b/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.h index c1e1a80148367..d135d30c71ffd 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.h +++ b/google/cloud/apikeys/v2/internal/api_keys_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apikeys/v2/internal/api_keys_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.cc b/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.cc index a38b3c956bce4..aa9f5bf52fdca 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" #include #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.h b/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.h index 28b73655e3f18..280bc9908a962 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.h +++ b/google/cloud/apikeys/v2/internal/api_keys_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apikeys/v2/internal/api_keys_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_stub.cc b/google/cloud/apikeys/v2/internal/api_keys_stub.cc index aa19c80e4136f..7d3e76eb166d5 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_stub.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/apikeys/v2/internal/api_keys_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_stub.h b/google/cloud/apikeys/v2/internal/api_keys_stub.h index 83759ad184c58..bc81ff93508fe 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_stub.h +++ b/google/cloud/apikeys/v2/internal/api_keys_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc b/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc index 5195d11709456..ae7d2ceb3947c 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/api/apikeys/v2/apikeys.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc b/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc index 85e578504fddf..4eb8e3db000c8 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace apikeys_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ApiKeysTracingConnection::ApiKeysTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -164,15 +162,11 @@ StatusOr ApiKeysTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeApiKeysTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.h b/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.h index 7e40c48d17fc3..209a16af49e38 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.h +++ b/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace apikeys_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ApiKeysTracingConnection : public apikeys_v2::ApiKeysConnection { public: ~ApiKeysTracingConnection() override = default; @@ -98,8 +96,6 @@ class ApiKeysTracingConnection : public apikeys_v2::ApiKeysConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc b/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc index 88df642e28a5c..9699a9c48ff3b 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace apikeys_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ApiKeysTracingStub::ApiKeysTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -216,15 +214,9 @@ future ApiKeysTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeApiKeysTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.h b/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.h index 0633583786c4d..cbc817114b1ab 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.h +++ b/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace apikeys_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ApiKeysTracingStub : public ApiKeysStub { public: ~ApiKeysTracingStub() override = default; @@ -116,8 +114,6 @@ class ApiKeysTracingStub : public ApiKeysStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/BUILD.bazel b/google/cloud/appengine/BUILD.bazel index dbc35a71b2972..7e4deb9427d93 100644 --- a/google/cloud/appengine/BUILD.bazel +++ b/google/cloud/appengine/BUILD.bazel @@ -24,9 +24,9 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/appengine/legacy:legacy_cc_grpc", - "@com_google_googleapis//google/appengine/logging/v1:logging_cc_grpc", - "@com_google_googleapis//google/appengine/v1:appengine_cc_grpc", + "@googleapis//google/appengine/legacy:legacy_cc_grpc", + "@googleapis//google/appengine/logging/v1:logging_cc_grpc", + "@googleapis//google/appengine/v1:appengine_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/appengine/quickstart/.bazelrc b/google/cloud/appengine/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/appengine/quickstart/.bazelrc +++ b/google/cloud/appengine/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/appengine/v1/applications_client.h b/google/cloud/appengine/v1/applications_client.h index 858b253225e14..886d19815fb29 100644 --- a/google/cloud/appengine/v1/applications_client.h +++ b/google/cloud/appengine/v1/applications_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/applications_connection.h b/google/cloud/appengine/v1/applications_connection.h index 2cde9edc612de..60e2d20bef5ef 100644 --- a/google/cloud/appengine/v1/applications_connection.h +++ b/google/cloud/appengine/v1/applications_connection.h @@ -29,9 +29,9 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/applications_connection_idempotency_policy.h b/google/cloud/appengine/v1/applications_connection_idempotency_policy.h index 0e3d3d4afa7fe..50885547b435f 100644 --- a/google/cloud/appengine/v1/applications_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/applications_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/authorized_certificates_connection.h b/google/cloud/appengine/v1/authorized_certificates_connection.h index bd2cbfdd1f457..0a17cb2917e39 100644 --- a/google/cloud/appengine/v1/authorized_certificates_connection.h +++ b/google/cloud/appengine/v1/authorized_certificates_connection.h @@ -27,8 +27,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/authorized_certificates_connection_idempotency_policy.h b/google/cloud/appengine/v1/authorized_certificates_connection_idempotency_policy.h index c2603b3aa0a04..a1950e2b18871 100644 --- a/google/cloud/appengine/v1/authorized_certificates_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/authorized_certificates_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/authorized_domains_connection.h b/google/cloud/appengine/v1/authorized_domains_connection.h index 396a0235da93f..14ba727bf2dcd 100644 --- a/google/cloud/appengine/v1/authorized_domains_connection.h +++ b/google/cloud/appengine/v1/authorized_domains_connection.h @@ -27,8 +27,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/authorized_domains_connection_idempotency_policy.h b/google/cloud/appengine/v1/authorized_domains_connection_idempotency_policy.h index 1c208e1e49940..ec917751c4561 100644 --- a/google/cloud/appengine/v1/authorized_domains_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/authorized_domains_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/domain_mappings_client.h b/google/cloud/appengine/v1/domain_mappings_client.h index ee4f5df537551..0be96fd049670 100644 --- a/google/cloud/appengine/v1/domain_mappings_client.h +++ b/google/cloud/appengine/v1/domain_mappings_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/domain_mappings_connection.h b/google/cloud/appengine/v1/domain_mappings_connection.h index fb918bcf886d2..d7f7e25dfbe75 100644 --- a/google/cloud/appengine/v1/domain_mappings_connection.h +++ b/google/cloud/appengine/v1/domain_mappings_connection.h @@ -30,9 +30,9 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/domain_mappings_connection_idempotency_policy.h b/google/cloud/appengine/v1/domain_mappings_connection_idempotency_policy.h index b568538e1652f..fc18543d459be 100644 --- a/google/cloud/appengine/v1/domain_mappings_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/domain_mappings_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/firewall_connection.h b/google/cloud/appengine/v1/firewall_connection.h index 63d558a56d152..7ec4c6e27089c 100644 --- a/google/cloud/appengine/v1/firewall_connection.h +++ b/google/cloud/appengine/v1/firewall_connection.h @@ -27,8 +27,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/firewall_connection_idempotency_policy.h b/google/cloud/appengine/v1/firewall_connection_idempotency_policy.h index e33f5d4f7463a..dc4b08950980b 100644 --- a/google/cloud/appengine/v1/firewall_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/firewall_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/instances_client.h b/google/cloud/appengine/v1/instances_client.h index 9c2f8779eed68..190f36922be90 100644 --- a/google/cloud/appengine/v1/instances_client.h +++ b/google/cloud/appengine/v1/instances_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/instances_connection.h b/google/cloud/appengine/v1/instances_connection.h index 839adaaf4bc9a..f82664ff815f0 100644 --- a/google/cloud/appengine/v1/instances_connection.h +++ b/google/cloud/appengine/v1/instances_connection.h @@ -30,9 +30,9 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/instances_connection_idempotency_policy.h b/google/cloud/appengine/v1/instances_connection_idempotency_policy.h index 468212711766d..12d0d17907d23 100644 --- a/google/cloud/appengine/v1/instances_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/instances_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/internal/applications_auth_decorator.cc b/google/cloud/appengine/v1/internal/applications_auth_decorator.cc index 282336771331a..fecd1c10c344d 100644 --- a/google/cloud/appengine/v1/internal/applications_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/applications_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/applications_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/applications_auth_decorator.h b/google/cloud/appengine/v1/internal/applications_auth_decorator.h index 9fee26d361c8b..80158b4e19ee8 100644 --- a/google/cloud/appengine/v1/internal/applications_auth_decorator.h +++ b/google/cloud/appengine/v1/internal/applications_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/applications_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/applications_connection_impl.h b/google/cloud/appengine/v1/internal/applications_connection_impl.h index cb2e3cb703c96..cd87094394313 100644 --- a/google/cloud/appengine/v1/internal/applications_connection_impl.h +++ b/google/cloud/appengine/v1/internal/applications_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/internal/applications_logging_decorator.cc b/google/cloud/appengine/v1/internal/applications_logging_decorator.cc index 3448dcf84e5e6..a083210061e19 100644 --- a/google/cloud/appengine/v1/internal/applications_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/applications_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/applications_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/applications_logging_decorator.h b/google/cloud/appengine/v1/internal/applications_logging_decorator.h index 0170a9751c031..dd969eac8bc03 100644 --- a/google/cloud/appengine/v1/internal/applications_logging_decorator.h +++ b/google/cloud/appengine/v1/internal/applications_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/applications_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/applications_metadata_decorator.cc b/google/cloud/appengine/v1/internal/applications_metadata_decorator.cc index 4f66faf429770..c2f3de840827c 100644 --- a/google/cloud/appengine/v1/internal/applications_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/applications_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/applications_metadata_decorator.h b/google/cloud/appengine/v1/internal/applications_metadata_decorator.h index 7244fd7d2ab9c..4786619feaae4 100644 --- a/google/cloud/appengine/v1/internal/applications_metadata_decorator.h +++ b/google/cloud/appengine/v1/internal/applications_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/applications_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/applications_stub.cc b/google/cloud/appengine/v1/internal/applications_stub.cc index d91b01ce047bc..7834df027b674 100644 --- a/google/cloud/appengine/v1/internal/applications_stub.cc +++ b/google/cloud/appengine/v1/internal/applications_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/appengine/v1/internal/applications_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/applications_stub.h b/google/cloud/appengine/v1/internal/applications_stub.h index bb4cccb85ba7f..90879fcafe05e 100644 --- a/google/cloud/appengine/v1/internal/applications_stub.h +++ b/google/cloud/appengine/v1/internal/applications_stub.h @@ -24,9 +24,9 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/applications_stub_factory.cc b/google/cloud/appengine/v1/internal/applications_stub_factory.cc index 57cf34d56fc8f..d1426ebc927b0 100644 --- a/google/cloud/appengine/v1/internal/applications_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/applications_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/applications_tracing_connection.cc b/google/cloud/appengine/v1/internal/applications_tracing_connection.cc index c35ddc1c0c8bc..f2fdbf3dffdf2 100644 --- a/google/cloud/appengine/v1/internal/applications_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/applications_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ApplicationsTracingConnection::ApplicationsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -131,16 +129,12 @@ ApplicationsTracingConnection::RepairApplication( child_->RepairApplication(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeApplicationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/applications_tracing_connection.h b/google/cloud/appengine/v1/internal/applications_tracing_connection.h index e14ebebcfbb08..6c6a08c54bfea 100644 --- a/google/cloud/appengine/v1/internal/applications_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/applications_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ApplicationsTracingConnection : public appengine_v1::ApplicationsConnection { public: @@ -77,8 +75,6 @@ class ApplicationsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/applications_tracing_stub.cc b/google/cloud/appengine/v1/internal/applications_tracing_stub.cc index 9819abf8b9986..c38dedec39a77 100644 --- a/google/cloud/appengine/v1/internal/applications_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/applications_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ApplicationsTracingStub::ApplicationsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -153,15 +151,9 @@ future ApplicationsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeApplicationsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/applications_tracing_stub.h b/google/cloud/appengine/v1/internal/applications_tracing_stub.h index d78d8dc774d18..8a3c898b4c985 100644 --- a/google/cloud/appengine/v1/internal/applications_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/applications_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ApplicationsTracingStub : public ApplicationsStub { public: ~ApplicationsTracingStub() override = default; @@ -90,8 +88,6 @@ class ApplicationsTracingStub : public ApplicationsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_auth_decorator.cc b/google/cloud/appengine/v1/internal/authorized_certificates_auth_decorator.cc index 65ad8d61a3dfd..185a29d010b5b 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/authorized_certificates_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_logging_decorator.cc b/google/cloud/appengine/v1/internal/authorized_certificates_logging_decorator.cc index 4ecf60d08a380..bff4ac3a326a8 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/authorized_certificates_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_metadata_decorator.cc b/google/cloud/appengine/v1/internal/authorized_certificates_metadata_decorator.cc index 6959ed147d1d0..812081de556ea 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_stub.cc b/google/cloud/appengine/v1/internal/authorized_certificates_stub.cc index 45278d3884910..59f70bc20123c 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_stub.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/authorized_certificates_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_stub.h b/google/cloud/appengine/v1/internal/authorized_certificates_stub.h index 47ef0d0aa39e3..e944c4b17a13d 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_stub.h +++ b/google/cloud/appengine/v1/internal/authorized_certificates_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_stub_factory.cc b/google/cloud/appengine/v1/internal/authorized_certificates_stub_factory.cc index 4f2f146032649..58d68416412d2 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc index aa9611a7b308a..e99f5e55a0f19 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AuthorizedCertificatesTracingConnection:: AuthorizedCertificatesTracingConnection( std::shared_ptr child) @@ -86,17 +84,13 @@ Status AuthorizedCertificatesTracingConnection::DeleteAuthorizedCertificate( return internal::EndSpan(*span, child_->DeleteAuthorizedCertificate(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAuthorizedCertificatesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.h b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.h index ed4b6f5937cd1..88efffc4aabc9 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AuthorizedCertificatesTracingConnection : public appengine_v1::AuthorizedCertificatesConnection { public: @@ -68,8 +66,6 @@ class AuthorizedCertificatesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.cc b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.cc index 2ecb9c3b6ae1f..b26c3033f87ac 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AuthorizedCertificatesTracingStub::AuthorizedCertificatesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -100,16 +98,10 @@ Status AuthorizedCertificatesTracingStub::DeleteAuthorizedCertificate( child_->DeleteAuthorizedCertificate(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAuthorizedCertificatesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.h b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.h index 665d11b2bd928..028261d76aefb 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AuthorizedCertificatesTracingStub : public AuthorizedCertificatesStub { public: ~AuthorizedCertificatesTracingStub() override = default; @@ -74,8 +72,6 @@ class AuthorizedCertificatesTracingStub : public AuthorizedCertificatesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/authorized_domains_auth_decorator.cc b/google/cloud/appengine/v1/internal/authorized_domains_auth_decorator.cc index b1eecbffb6e5d..d5eb8bccfc89e 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/authorized_domains_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_domains_logging_decorator.cc b/google/cloud/appengine/v1/internal/authorized_domains_logging_decorator.cc index 84e04e22130ab..68635c45897a3 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/authorized_domains_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_domains_metadata_decorator.cc b/google/cloud/appengine/v1/internal/authorized_domains_metadata_decorator.cc index 62e8f3486c620..63d4f06cf319d 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_domains_stub.cc b/google/cloud/appengine/v1/internal/authorized_domains_stub.cc index 0dabc689a6fb9..3e0f35526621a 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_stub.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/authorized_domains_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_domains_stub.h b/google/cloud/appengine/v1/internal/authorized_domains_stub.h index 8736625bcb1e9..42a67be85ae4a 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_stub.h +++ b/google/cloud/appengine/v1/internal/authorized_domains_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_domains_stub_factory.cc b/google/cloud/appengine/v1/internal/authorized_domains_stub_factory.cc index ad88107fa9b44..b44050a037fdf 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc b/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc index 85543616a90de..f952d047b18e1 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AuthorizedDomainsTracingConnection::AuthorizedDomainsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -44,17 +42,13 @@ AuthorizedDomainsTracingConnection::ListAuthorizedDomains( google::appengine::v1::AuthorizedDomain>(std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAuthorizedDomainsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.h b/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.h index b310f5153f8fa..ee1b003e38be5 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AuthorizedDomainsTracingConnection : public appengine_v1::AuthorizedDomainsConnection { public: @@ -47,8 +45,6 @@ class AuthorizedDomainsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.cc b/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.cc index 6e2826252d38d..42125bd87a9d2 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AuthorizedDomainsTracingStub::AuthorizedDomainsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ AuthorizedDomainsTracingStub::ListAuthorizedDomains( context, *span, child_->ListAuthorizedDomains(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAuthorizedDomainsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.h b/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.h index b7165266027e1..890f05ac0f5b2 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/authorized_domains_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AuthorizedDomainsTracingStub : public AuthorizedDomainsStub { public: ~AuthorizedDomainsTracingStub() override = default; @@ -51,8 +49,6 @@ class AuthorizedDomainsTracingStub : public AuthorizedDomainsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.cc b/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.cc index 4e37c8bb1b192..710c27b18de97 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.h b/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.h index 1cca255964231..bcb450b84e93d 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/domain_mappings_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_connection_impl.h b/google/cloud/appengine/v1/internal/domain_mappings_connection_impl.h index 4f1de87cccbb5..feac915343bd0 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_connection_impl.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.cc b/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.cc index 29a6109f9a415..c1b958a1b30db 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.h b/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.h index 0da2847d4bd7f..eac61a31c6f5e 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/domain_mappings_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.cc b/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.cc index b95243c5a604b..bb34cc60a65c6 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.h b/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.h index dbd7b7cf72c7d..2c13d6125f198 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/domain_mappings_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_stub.cc b/google/cloud/appengine/v1/internal/domain_mappings_stub.cc index 3a9f8b71b9bce..25552c89edaa0 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_stub.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/appengine/v1/internal/domain_mappings_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_stub.h b/google/cloud/appengine/v1/internal/domain_mappings_stub.h index e8396daf9c3fb..05476a477fd5e 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_stub.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_stub.h @@ -24,9 +24,9 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_stub_factory.cc b/google/cloud/appengine/v1/internal/domain_mappings_stub_factory.cc index fc8c386d2d33b..95a9e1bc88413 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc b/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc index a78f31edd9810..4a45ebe79583c 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DomainMappingsTracingConnection::DomainMappingsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -146,16 +144,12 @@ DomainMappingsTracingConnection::DeleteDomainMapping( child_->DeleteDomainMapping(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDomainMappingsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.h b/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.h index 48ea354b0ab93..9b3abdcdda0bb 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DomainMappingsTracingConnection : public appengine_v1::DomainMappingsConnection { public: @@ -86,8 +84,6 @@ class DomainMappingsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc b/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc index 2d1944ed2b8f7..edf299809e1b4 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DomainMappingsTracingStub::DomainMappingsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -165,15 +163,9 @@ future DomainMappingsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDomainMappingsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.h b/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.h index bba974650a5f2..51b01715794ec 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DomainMappingsTracingStub : public DomainMappingsStub { public: ~DomainMappingsTracingStub() override = default; @@ -101,8 +99,6 @@ class DomainMappingsTracingStub : public DomainMappingsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/firewall_auth_decorator.cc b/google/cloud/appengine/v1/internal/firewall_auth_decorator.cc index ece924a1c1717..35f727643df92 100644 --- a/google/cloud/appengine/v1/internal/firewall_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/firewall_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/firewall_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/firewall_logging_decorator.cc b/google/cloud/appengine/v1/internal/firewall_logging_decorator.cc index ec8107af18bc3..42e61c8b789d5 100644 --- a/google/cloud/appengine/v1/internal/firewall_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/firewall_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/firewall_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/firewall_metadata_decorator.cc b/google/cloud/appengine/v1/internal/firewall_metadata_decorator.cc index 2b6934cfb9eaf..773cf8ed914b7 100644 --- a/google/cloud/appengine/v1/internal/firewall_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/firewall_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/firewall_stub.cc b/google/cloud/appengine/v1/internal/firewall_stub.cc index 6051df0a471de..b3d98a7f15d04 100644 --- a/google/cloud/appengine/v1/internal/firewall_stub.cc +++ b/google/cloud/appengine/v1/internal/firewall_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/firewall_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/firewall_stub.h b/google/cloud/appengine/v1/internal/firewall_stub.h index 7d4135cbf737b..15572f18ef353 100644 --- a/google/cloud/appengine/v1/internal/firewall_stub.h +++ b/google/cloud/appengine/v1/internal/firewall_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/firewall_stub_factory.cc b/google/cloud/appengine/v1/internal/firewall_stub_factory.cc index 814ea94685739..4b0ad23cf4abf 100644 --- a/google/cloud/appengine/v1/internal/firewall_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/firewall_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc b/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc index db9ccadffeec4..a1e9d475024cf 100644 --- a/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FirewallTracingConnection::FirewallTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -88,15 +86,11 @@ Status FirewallTracingConnection::DeleteIngressRule( return internal::EndSpan(*span, child_->DeleteIngressRule(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFirewallTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/firewall_tracing_connection.h b/google/cloud/appengine/v1/internal/firewall_tracing_connection.h index ff4c5cf236730..a4fc505b38bcf 100644 --- a/google/cloud/appengine/v1/internal/firewall_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/firewall_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FirewallTracingConnection : public appengine_v1::FirewallConnection { public: ~FirewallTracingConnection() override = default; @@ -63,8 +61,6 @@ class FirewallTracingConnection : public appengine_v1::FirewallConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/firewall_tracing_stub.cc b/google/cloud/appengine/v1/internal/firewall_tracing_stub.cc index 0817ad775be99..a0a3e8d83e956 100644 --- a/google/cloud/appengine/v1/internal/firewall_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/firewall_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FirewallTracingStub::FirewallTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -103,15 +101,9 @@ Status FirewallTracingStub::DeleteIngressRule( context, *span, child_->DeleteIngressRule(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFirewallTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/firewall_tracing_stub.h b/google/cloud/appengine/v1/internal/firewall_tracing_stub.h index 7890a025deaa7..899194ab5ccf0 100644 --- a/google/cloud/appengine/v1/internal/firewall_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/firewall_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FirewallTracingStub : public FirewallStub { public: ~FirewallTracingStub() override = default; @@ -70,8 +68,6 @@ class FirewallTracingStub : public FirewallStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/instances_auth_decorator.cc b/google/cloud/appengine/v1/internal/instances_auth_decorator.cc index 10d0d651bb679..66ccfedd9d7a5 100644 --- a/google/cloud/appengine/v1/internal/instances_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/instances_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/instances_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/instances_auth_decorator.h b/google/cloud/appengine/v1/internal/instances_auth_decorator.h index 5b8c15b9171db..ce6d4bf2a89e6 100644 --- a/google/cloud/appengine/v1/internal/instances_auth_decorator.h +++ b/google/cloud/appengine/v1/internal/instances_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/instances_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/instances_connection_impl.h b/google/cloud/appengine/v1/internal/instances_connection_impl.h index 7eb4be50b2f92..f37ebb2bfccca 100644 --- a/google/cloud/appengine/v1/internal/instances_connection_impl.h +++ b/google/cloud/appengine/v1/internal/instances_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/internal/instances_logging_decorator.cc b/google/cloud/appengine/v1/internal/instances_logging_decorator.cc index f121e89ab5762..f1ecdaf7d376d 100644 --- a/google/cloud/appengine/v1/internal/instances_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/instances_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/instances_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/instances_logging_decorator.h b/google/cloud/appengine/v1/internal/instances_logging_decorator.h index 122ed4b8e8089..d16d9adbd8242 100644 --- a/google/cloud/appengine/v1/internal/instances_logging_decorator.h +++ b/google/cloud/appengine/v1/internal/instances_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/instances_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/instances_metadata_decorator.cc b/google/cloud/appengine/v1/internal/instances_metadata_decorator.cc index 5e63760cf9ec2..cc250a09738b8 100644 --- a/google/cloud/appengine/v1/internal/instances_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/instances_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/instances_metadata_decorator.h b/google/cloud/appengine/v1/internal/instances_metadata_decorator.h index ec67073047bc2..2f9bef5e06d14 100644 --- a/google/cloud/appengine/v1/internal/instances_metadata_decorator.h +++ b/google/cloud/appengine/v1/internal/instances_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/instances_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/instances_stub.cc b/google/cloud/appengine/v1/internal/instances_stub.cc index 0f0f648407573..d4fa1e7fb28ff 100644 --- a/google/cloud/appengine/v1/internal/instances_stub.cc +++ b/google/cloud/appengine/v1/internal/instances_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/appengine/v1/internal/instances_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/instances_stub.h b/google/cloud/appengine/v1/internal/instances_stub.h index cb3e8d4316070..33598577a899f 100644 --- a/google/cloud/appengine/v1/internal/instances_stub.h +++ b/google/cloud/appengine/v1/internal/instances_stub.h @@ -24,9 +24,9 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/instances_stub_factory.cc b/google/cloud/appengine/v1/internal/instances_stub_factory.cc index 8c93005a726e8..16536939d9238 100644 --- a/google/cloud/appengine/v1/internal/instances_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/instances_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/instances_tracing_connection.cc b/google/cloud/appengine/v1/internal/instances_tracing_connection.cc index 9754f6ec18683..8ffcda2a8ff92 100644 --- a/google/cloud/appengine/v1/internal/instances_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/instances_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstancesTracingConnection::InstancesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -108,16 +106,12 @@ InstancesTracingConnection::DebugInstance( return internal::EndSpan(std::move(span), child_->DebugInstance(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstancesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/instances_tracing_connection.h b/google/cloud/appengine/v1/internal/instances_tracing_connection.h index 4d1a16f6445e5..537844ee7e01e 100644 --- a/google/cloud/appengine/v1/internal/instances_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/instances_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstancesTracingConnection : public appengine_v1::InstancesConnection { public: ~InstancesTracingConnection() override = default; @@ -69,8 +67,6 @@ class InstancesTracingConnection : public appengine_v1::InstancesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/instances_tracing_stub.cc b/google/cloud/appengine/v1/internal/instances_tracing_stub.cc index a11e273e04424..50679b9de6c90 100644 --- a/google/cloud/appengine/v1/internal/instances_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/instances_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstancesTracingStub::InstancesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -133,15 +131,9 @@ future InstancesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstancesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/instances_tracing_stub.h b/google/cloud/appengine/v1/internal/instances_tracing_stub.h index 07beaa58419aa..957805a9d623f 100644 --- a/google/cloud/appengine/v1/internal/instances_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/instances_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstancesTracingStub : public InstancesStub { public: ~InstancesTracingStub() override = default; @@ -84,8 +82,6 @@ class InstancesTracingStub : public InstancesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/services_auth_decorator.cc b/google/cloud/appengine/v1/internal/services_auth_decorator.cc index a113a7e0a7224..0ebee27ef361a 100644 --- a/google/cloud/appengine/v1/internal/services_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/services_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/services_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/services_auth_decorator.h b/google/cloud/appengine/v1/internal/services_auth_decorator.h index 38af16469a1f4..be59cda90bd5a 100644 --- a/google/cloud/appengine/v1/internal/services_auth_decorator.h +++ b/google/cloud/appengine/v1/internal/services_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/services_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/services_connection_impl.h b/google/cloud/appengine/v1/internal/services_connection_impl.h index 1f25749575ecb..31b927105c601 100644 --- a/google/cloud/appengine/v1/internal/services_connection_impl.h +++ b/google/cloud/appengine/v1/internal/services_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/internal/services_logging_decorator.cc b/google/cloud/appengine/v1/internal/services_logging_decorator.cc index 8dd0238a7aa9d..b537160f13ca1 100644 --- a/google/cloud/appengine/v1/internal/services_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/services_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/services_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/services_logging_decorator.h b/google/cloud/appengine/v1/internal/services_logging_decorator.h index 71d03651f60dc..e433c8d8edcee 100644 --- a/google/cloud/appengine/v1/internal/services_logging_decorator.h +++ b/google/cloud/appengine/v1/internal/services_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/services_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/services_metadata_decorator.cc b/google/cloud/appengine/v1/internal/services_metadata_decorator.cc index 70c1046a70a5a..6f2d737e47d04 100644 --- a/google/cloud/appengine/v1/internal/services_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/services_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/services_metadata_decorator.h b/google/cloud/appengine/v1/internal/services_metadata_decorator.h index 2ec01f076d748..f6031e57f12f6 100644 --- a/google/cloud/appengine/v1/internal/services_metadata_decorator.h +++ b/google/cloud/appengine/v1/internal/services_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/services_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/services_stub.cc b/google/cloud/appengine/v1/internal/services_stub.cc index cec7dceabbee0..88f7b9495e4cd 100644 --- a/google/cloud/appengine/v1/internal/services_stub.cc +++ b/google/cloud/appengine/v1/internal/services_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/appengine/v1/internal/services_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/services_stub.h b/google/cloud/appengine/v1/internal/services_stub.h index 7b0d31246d9bb..8af175ccd11dd 100644 --- a/google/cloud/appengine/v1/internal/services_stub.h +++ b/google/cloud/appengine/v1/internal/services_stub.h @@ -24,9 +24,9 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/services_stub_factory.cc b/google/cloud/appengine/v1/internal/services_stub_factory.cc index e43c9da1f9cb5..1c79ec9f49911 100644 --- a/google/cloud/appengine/v1/internal/services_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/services_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/services_tracing_connection.cc b/google/cloud/appengine/v1/internal/services_tracing_connection.cc index 24d806c96a9f1..8bfbc134cd34e 100644 --- a/google/cloud/appengine/v1/internal/services_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/services_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServicesTracingConnection::ServicesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -106,15 +104,11 @@ ServicesTracingConnection::DeleteService( return internal::EndSpan(std::move(span), child_->DeleteService(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServicesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/services_tracing_connection.h b/google/cloud/appengine/v1/internal/services_tracing_connection.h index 90f66b56626ac..cd6893a84f61e 100644 --- a/google/cloud/appengine/v1/internal/services_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/services_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServicesTracingConnection : public appengine_v1::ServicesConnection { public: ~ServicesTracingConnection() override = default; @@ -69,8 +67,6 @@ class ServicesTracingConnection : public appengine_v1::ServicesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/services_tracing_stub.cc b/google/cloud/appengine/v1/internal/services_tracing_stub.cc index ecd270ca728c3..4d894c7275a8b 100644 --- a/google/cloud/appengine/v1/internal/services_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/services_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServicesTracingStub::ServicesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -132,15 +130,9 @@ future ServicesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServicesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/services_tracing_stub.h b/google/cloud/appengine/v1/internal/services_tracing_stub.h index 1dfa5977d3b25..2333b59fc69ed 100644 --- a/google/cloud/appengine/v1/internal/services_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/services_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServicesTracingStub : public ServicesStub { public: ~ServicesTracingStub() override = default; @@ -84,8 +82,6 @@ class ServicesTracingStub : public ServicesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/internal/versions_auth_decorator.cc b/google/cloud/appengine/v1/internal/versions_auth_decorator.cc index 5002a54db7e84..10c524bb8fc7d 100644 --- a/google/cloud/appengine/v1/internal/versions_auth_decorator.cc +++ b/google/cloud/appengine/v1/internal/versions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/appengine/v1/appengine.proto #include "google/cloud/appengine/v1/internal/versions_auth_decorator.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/versions_auth_decorator.h b/google/cloud/appengine/v1/internal/versions_auth_decorator.h index f9b92a9842838..bbb8c67597735 100644 --- a/google/cloud/appengine/v1/internal/versions_auth_decorator.h +++ b/google/cloud/appengine/v1/internal/versions_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/versions_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/versions_connection_impl.h b/google/cloud/appengine/v1/internal/versions_connection_impl.h index 6126bdf65087a..9ad5e6270b20b 100644 --- a/google/cloud/appengine/v1/internal/versions_connection_impl.h +++ b/google/cloud/appengine/v1/internal/versions_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/internal/versions_logging_decorator.cc b/google/cloud/appengine/v1/internal/versions_logging_decorator.cc index 50b8cb9a45b85..6dfaba833384f 100644 --- a/google/cloud/appengine/v1/internal/versions_logging_decorator.cc +++ b/google/cloud/appengine/v1/internal/versions_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/appengine/v1/internal/versions_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/versions_logging_decorator.h b/google/cloud/appengine/v1/internal/versions_logging_decorator.h index 3feec16fa7beb..f12e0be6d1c70 100644 --- a/google/cloud/appengine/v1/internal/versions_logging_decorator.h +++ b/google/cloud/appengine/v1/internal/versions_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/versions_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/versions_metadata_decorator.cc b/google/cloud/appengine/v1/internal/versions_metadata_decorator.cc index f50adae9c4fe5..74be5fbf47e2c 100644 --- a/google/cloud/appengine/v1/internal/versions_metadata_decorator.cc +++ b/google/cloud/appengine/v1/internal/versions_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/versions_metadata_decorator.h b/google/cloud/appengine/v1/internal/versions_metadata_decorator.h index a6e195e8a0580..1f565abfcc174 100644 --- a/google/cloud/appengine/v1/internal/versions_metadata_decorator.h +++ b/google/cloud/appengine/v1/internal/versions_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/appengine/v1/internal/versions_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/internal/versions_stub.cc b/google/cloud/appengine/v1/internal/versions_stub.cc index 1b99381ddda1a..91bd253a6226d 100644 --- a/google/cloud/appengine/v1/internal/versions_stub.cc +++ b/google/cloud/appengine/v1/internal/versions_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/appengine/v1/internal/versions_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/versions_stub.h b/google/cloud/appengine/v1/internal/versions_stub.h index 5c117b15e2cb5..a47f3cce015a1 100644 --- a/google/cloud/appengine/v1/internal/versions_stub.h +++ b/google/cloud/appengine/v1/internal/versions_stub.h @@ -24,9 +24,9 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.grpc.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/versions_stub_factory.cc b/google/cloud/appengine/v1/internal/versions_stub_factory.cc index 3c17501525d90..7e653f43bcfef 100644 --- a/google/cloud/appengine/v1/internal/versions_stub_factory.cc +++ b/google/cloud/appengine/v1/internal/versions_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include #include diff --git a/google/cloud/appengine/v1/internal/versions_tracing_connection.cc b/google/cloud/appengine/v1/internal/versions_tracing_connection.cc index 568ffb44bbb3f..fb6cf6f97d142 100644 --- a/google/cloud/appengine/v1/internal/versions_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/versions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VersionsTracingConnection::VersionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -133,15 +131,11 @@ VersionsTracingConnection::DeleteVersion( return internal::EndSpan(std::move(span), child_->DeleteVersion(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVersionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/appengine/v1/internal/versions_tracing_connection.h b/google/cloud/appengine/v1/internal/versions_tracing_connection.h index 002f10c1fd714..db32d79d30cda 100644 --- a/google/cloud/appengine/v1/internal/versions_tracing_connection.h +++ b/google/cloud/appengine/v1/internal/versions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VersionsTracingConnection : public appengine_v1::VersionsConnection { public: ~VersionsTracingConnection() override = default; @@ -79,8 +77,6 @@ class VersionsTracingConnection : public appengine_v1::VersionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/appengine/v1/internal/versions_tracing_stub.cc b/google/cloud/appengine/v1/internal/versions_tracing_stub.cc index 9169c902e19ee..f9488544ea87e 100644 --- a/google/cloud/appengine/v1/internal/versions_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/versions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VersionsTracingStub::VersionsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -157,15 +155,9 @@ future VersionsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVersionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/versions_tracing_stub.h b/google/cloud/appengine/v1/internal/versions_tracing_stub.h index f0b18e876c14f..51935c48e6b0b 100644 --- a/google/cloud/appengine/v1/internal/versions_tracing_stub.h +++ b/google/cloud/appengine/v1/internal/versions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace appengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VersionsTracingStub : public VersionsStub { public: ~VersionsTracingStub() override = default; @@ -94,8 +92,6 @@ class VersionsTracingStub : public VersionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/appengine/v1/services_client.h b/google/cloud/appengine/v1/services_client.h index bdce72c302c88..c3c1269fd81c5 100644 --- a/google/cloud/appengine/v1/services_client.h +++ b/google/cloud/appengine/v1/services_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/services_connection.h b/google/cloud/appengine/v1/services_connection.h index bcdf2cc9cd041..df7b86574b371 100644 --- a/google/cloud/appengine/v1/services_connection.h +++ b/google/cloud/appengine/v1/services_connection.h @@ -30,9 +30,9 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/services_connection_idempotency_policy.h b/google/cloud/appengine/v1/services_connection_idempotency_policy.h index 626e1e1a4aed8..c2cd4f4d06b7e 100644 --- a/google/cloud/appengine/v1/services_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/services_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/versions_client.h b/google/cloud/appengine/v1/versions_client.h index 434c2fbb64d8a..5f4497294ed7a 100644 --- a/google/cloud/appengine/v1/versions_client.h +++ b/google/cloud/appengine/v1/versions_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/appengine/v1/versions_connection.h b/google/cloud/appengine/v1/versions_connection.h index 427e86c3923ef..8b5d7fcf9089d 100644 --- a/google/cloud/appengine/v1/versions_connection.h +++ b/google/cloud/appengine/v1/versions_connection.h @@ -30,9 +30,9 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/appengine/v1/appengine.pb.h" +#include "google/appengine/v1/operation.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/appengine/v1/versions_connection_idempotency_policy.h b/google/cloud/appengine/v1/versions_connection_idempotency_policy.h index 354d10df0f1b0..3c51d65d8625b 100644 --- a/google/cloud/appengine/v1/versions_connection_idempotency_policy.h +++ b/google/cloud/appengine/v1/versions_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/appengine/v1/appengine.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apphub/BUILD.bazel b/google/cloud/apphub/BUILD.bazel index 61ab437e885b4..a65ea4dbdfe27 100644 --- a/google/cloud/apphub/BUILD.bazel +++ b/google/cloud/apphub/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/apphub/v1:apphub_cc_grpc", + "@googleapis//google/cloud/apphub/v1:apphub_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apphub/quickstart/.bazelrc b/google/cloud/apphub/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/apphub/quickstart/.bazelrc +++ b/google/cloud/apphub/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/apphub/v1/app_hub_client.h b/google/cloud/apphub/v1/app_hub_client.h index 24a8b45035896..341ab90c6a3b9 100644 --- a/google/cloud/apphub/v1/app_hub_client.h +++ b/google/cloud/apphub/v1/app_hub_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apphub/v1/app_hub_connection.h b/google/cloud/apphub/v1/app_hub_connection.h index 489c3fd7ad31c..7c8d508ba4601 100644 --- a/google/cloud/apphub/v1/app_hub_connection.h +++ b/google/cloud/apphub/v1/app_hub_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPHUB_V1_APP_HUB_CONNECTION_H #include "google/cloud/apphub/v1/app_hub_connection_idempotency_policy.h" +#include "google/cloud/apphub/v1/apphub_service.pb.h" #include "google/cloud/apphub/v1/internal/app_hub_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apphub/v1/app_hub_connection_idempotency_policy.h b/google/cloud/apphub/v1/app_hub_connection_idempotency_policy.h index 3d336bb2f2b3d..4e2e20f3419d3 100644 --- a/google/cloud/apphub/v1/app_hub_connection_idempotency_policy.h +++ b/google/cloud/apphub/v1/app_hub_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPHUB_V1_APP_HUB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPHUB_V1_APP_HUB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/apphub/v1/apphub_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apphub/v1/internal/app_hub_auth_decorator.cc b/google/cloud/apphub/v1/internal/app_hub_auth_decorator.cc index f89ae3524161a..d7ec85dfc3dd3 100644 --- a/google/cloud/apphub/v1/internal/app_hub_auth_decorator.cc +++ b/google/cloud/apphub/v1/internal/app_hub_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/apphub/v1/apphub_service.proto #include "google/cloud/apphub/v1/internal/app_hub_auth_decorator.h" -#include +#include "google/cloud/apphub/v1/apphub_service.grpc.pb.h" #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_auth_decorator.h b/google/cloud/apphub/v1/internal/app_hub_auth_decorator.h index 92f90eb7169b3..20c63b6ae566c 100644 --- a/google/cloud/apphub/v1/internal/app_hub_auth_decorator.h +++ b/google/cloud/apphub/v1/internal/app_hub_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apphub/v1/internal/app_hub_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_connection_impl.h b/google/cloud/apphub/v1/internal/app_hub_connection_impl.h index b8d2914b1835f..42facde00c007 100644 --- a/google/cloud/apphub/v1/internal/app_hub_connection_impl.h +++ b/google/cloud/apphub/v1/internal/app_hub_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/apphub/v1/internal/app_hub_logging_decorator.cc b/google/cloud/apphub/v1/internal/app_hub_logging_decorator.cc index 4e061a1aede07..446711c795c25 100644 --- a/google/cloud/apphub/v1/internal/app_hub_logging_decorator.cc +++ b/google/cloud/apphub/v1/internal/app_hub_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/apphub/v1/apphub_service.proto #include "google/cloud/apphub/v1/internal/app_hub_logging_decorator.h" +#include "google/cloud/apphub/v1/apphub_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_logging_decorator.h b/google/cloud/apphub/v1/internal/app_hub_logging_decorator.h index b5d2debd42155..2609342ab903f 100644 --- a/google/cloud/apphub/v1/internal/app_hub_logging_decorator.h +++ b/google/cloud/apphub/v1/internal/app_hub_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apphub/v1/internal/app_hub_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.cc b/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.cc index f397482b69e0f..4309dfd157066 100644 --- a/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.cc +++ b/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/apphub/v1/apphub_service.proto #include "google/cloud/apphub/v1/internal/app_hub_metadata_decorator.h" +#include "google/cloud/apphub/v1/apphub_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 #include #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.h b/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.h index 38c91580bd843..2828dc687cca5 100644 --- a/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.h +++ b/google/cloud/apphub/v1/internal/app_hub_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/apphub/v1/internal/app_hub_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_stub.cc b/google/cloud/apphub/v1/internal/app_hub_stub.cc index d8e5fcbfbcc84..686fd3a5974ad 100644 --- a/google/cloud/apphub/v1/internal/app_hub_stub.cc +++ b/google/cloud/apphub/v1/internal/app_hub_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/apphub/v1/apphub_service.proto #include "google/cloud/apphub/v1/internal/app_hub_stub.h" +#include "google/cloud/apphub/v1/apphub_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_stub.h b/google/cloud/apphub/v1/internal/app_hub_stub.h index ab5ee09d662cf..757feb475ae12 100644 --- a/google/cloud/apphub/v1/internal/app_hub_stub.h +++ b/google/cloud/apphub/v1/internal/app_hub_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPHUB_V1_INTERNAL_APP_HUB_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPHUB_V1_INTERNAL_APP_HUB_STUB_H +#include "google/cloud/apphub/v1/apphub_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc b/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc index b514ecadaa409..d39aec96b92cd 100644 --- a/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc +++ b/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/apphub/v1/apphub_service.proto #include "google/cloud/apphub/v1/internal/app_hub_stub_factory.h" +#include "google/cloud/apphub/v1/apphub_service.grpc.pb.h" #include "google/cloud/apphub/v1/internal/app_hub_auth_decorator.h" #include "google/cloud/apphub/v1/internal/app_hub_logging_decorator.h" #include "google/cloud/apphub/v1/internal/app_hub_metadata_decorator.h" #include "google/cloud/apphub/v1/internal/app_hub_stub.h" #include "google/cloud/apphub/v1/internal/app_hub_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/apphub/v1/internal/app_hub_tracing_connection.cc b/google/cloud/apphub/v1/internal/app_hub_tracing_connection.cc index e2e0c310b8dbe..03437e3257091 100644 --- a/google/cloud/apphub/v1/internal/app_hub_tracing_connection.cc +++ b/google/cloud/apphub/v1/internal/app_hub_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace apphub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppHubTracingConnection::AppHubTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -572,15 +570,11 @@ Status AppHubTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppHubTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/apphub/v1/internal/app_hub_tracing_connection.h b/google/cloud/apphub/v1/internal/app_hub_tracing_connection.h index 151167469297c..18359565d92a4 100644 --- a/google/cloud/apphub/v1/internal/app_hub_tracing_connection.h +++ b/google/cloud/apphub/v1/internal/app_hub_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace apphub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppHubTracingConnection : public apphub_v1::AppHubConnection { public: ~AppHubTracingConnection() override = default; @@ -260,8 +258,6 @@ class AppHubTracingConnection : public apphub_v1::AppHubConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/apphub/v1/internal/app_hub_tracing_stub.cc b/google/cloud/apphub/v1/internal/app_hub_tracing_stub.cc index 34b45ce686409..4d65e7c186ad3 100644 --- a/google/cloud/apphub/v1/internal/app_hub_tracing_stub.cc +++ b/google/cloud/apphub/v1/internal/app_hub_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace apphub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppHubTracingStub::AppHubTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -654,15 +652,9 @@ future AppHubTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppHubTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apphub/v1/internal/app_hub_tracing_stub.h b/google/cloud/apphub/v1/internal/app_hub_tracing_stub.h index 76147543c3b67..7a111b6161c76 100644 --- a/google/cloud/apphub/v1/internal/app_hub_tracing_stub.h +++ b/google/cloud/apphub/v1/internal/app_hub_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace apphub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppHubTracingStub : public AppHubStub { public: ~AppHubTracingStub() override = default; @@ -297,8 +295,6 @@ class AppHubTracingStub : public AppHubStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/artifactregistry/BUILD.bazel b/google/cloud/artifactregistry/BUILD.bazel index 9d4f9177dd000..696b410646e0d 100644 --- a/google/cloud/artifactregistry/BUILD.bazel +++ b/google/cloud/artifactregistry/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/artifactregistry/v1:artifactregistry_cc_grpc", + "@googleapis//google/devtools/artifactregistry/v1:artifactregistry_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/artifactregistry/quickstart/.bazelrc b/google/cloud/artifactregistry/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/artifactregistry/quickstart/.bazelrc +++ b/google/cloud/artifactregistry/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/artifactregistry/v1/artifact_registry_client.h b/google/cloud/artifactregistry/v1/artifact_registry_client.h index e6f979f85c60a..7d7245fc40f51 100644 --- a/google/cloud/artifactregistry/v1/artifact_registry_client.h +++ b/google/cloud/artifactregistry/v1/artifact_registry_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/artifactregistry/v1/artifact_registry_connection.h b/google/cloud/artifactregistry/v1/artifact_registry_connection.h index e52570702f305..16cb13bc4eb43 100644 --- a/google/cloud/artifactregistry/v1/artifact_registry_connection.h +++ b/google/cloud/artifactregistry/v1/artifact_registry_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/devtools/artifactregistry/v1/service.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/artifactregistry/v1/artifact_registry_connection_idempotency_policy.h b/google/cloud/artifactregistry/v1/artifact_registry_connection_idempotency_policy.h index ac52cc868894f..dcf1306ffaaa5 100644 --- a/google/cloud/artifactregistry/v1/artifact_registry_connection_idempotency_policy.h +++ b/google/cloud/artifactregistry/v1/artifact_registry_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_V1_ARTIFACT_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_V1_ARTIFACT_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.cc index bd6a1a5604a60..394f67532015c 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/artifactregistry/v1/service.proto #include "google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.h" -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.h index 3c33874c115c4..20d7b0bf3f7a9 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_connection_impl.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_connection_impl.h index d6a92b605b6c2..cd6d8c20db250 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_connection_impl.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.cc index 82b32dc7e282f..6de5ecbcd94d9 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" #include #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.h index 92eb7533b044e..0c9afa56b9312 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.cc index e1ee2b3576f01..ba001395034cf 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" #include #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.h index c64bb2e855a29..c22d9ce1f7661 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc index faad75521e9c4..94269dfe390e9 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h index a72d6812b0a15..0878bb108c393 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_V1_INTERNAL_ARTIFACT_REGISTRY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_V1_INTERNAL_ARTIFACT_REGISTRY_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc index 269be927b3334..f665554764eec 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/artifactregistry/v1/internal/artifact_registry_metadata_decorator.h" #include "google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h" #include "google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/devtools/artifactregistry/v1/service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc index a7fcd6ee45ee5..a98fa88d64c2f 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace artifactregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ArtifactRegistryTracingConnection::ArtifactRegistryTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -809,16 +807,12 @@ ArtifactRegistryTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeArtifactRegistryTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.h index a0b48173097c8..63426066ce15a 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace artifactregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ArtifactRegistryTracingConnection : public artifactregistry_v1::ArtifactRegistryConnection { public: @@ -364,8 +362,6 @@ class ArtifactRegistryTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc index 5cd23bf79be88..329f1556c0bfe 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace artifactregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ArtifactRegistryTracingStub::ArtifactRegistryTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -922,15 +920,9 @@ future ArtifactRegistryTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeArtifactRegistryTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.h index 79b07c367990b..b6d8fa60414c4 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace artifactregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ArtifactRegistryTracingStub : public ArtifactRegistryStub { public: ~ArtifactRegistryTracingStub() override = default; @@ -406,8 +404,6 @@ class ArtifactRegistryTracingStub : public ArtifactRegistryStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/asset/BUILD.bazel b/google/cloud/asset/BUILD.bazel index ac20e571b2aea..8f9655e33739c 100644 --- a/google/cloud/asset/BUILD.bazel +++ b/google/cloud/asset/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/asset/v1:asset_cc_grpc", + "@googleapis//google/cloud/asset/v1:asset_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/asset/quickstart/.bazelrc b/google/cloud/asset/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/asset/quickstart/.bazelrc +++ b/google/cloud/asset/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/asset/v1/asset_client.h b/google/cloud/asset/v1/asset_client.h index f57bfa95d5797..f47a0cf08ddeb 100644 --- a/google/cloud/asset/v1/asset_client.h +++ b/google/cloud/asset/v1/asset_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/asset/v1/asset_connection.h b/google/cloud/asset/v1/asset_connection.h index 0c6a555f28505..1904b68bded77 100644 --- a/google/cloud/asset/v1/asset_connection.h +++ b/google/cloud/asset/v1/asset_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_V1_ASSET_CONNECTION_H #include "google/cloud/asset/v1/asset_connection_idempotency_policy.h" +#include "google/cloud/asset/v1/asset_service.pb.h" #include "google/cloud/asset/v1/internal/asset_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/asset/v1/asset_connection_idempotency_policy.h b/google/cloud/asset/v1/asset_connection_idempotency_policy.h index 9bbf0da4f4d49..e10055a36fe01 100644 --- a/google/cloud/asset/v1/asset_connection_idempotency_policy.h +++ b/google/cloud/asset/v1/asset_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_V1_ASSET_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_V1_ASSET_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/asset/v1/asset_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/asset/v1/internal/asset_auth_decorator.cc b/google/cloud/asset/v1/internal/asset_auth_decorator.cc index 4bd1e5e57da91..f6c6c64dfc105 100644 --- a/google/cloud/asset/v1/internal/asset_auth_decorator.cc +++ b/google/cloud/asset/v1/internal/asset_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/asset/v1/asset_service.proto #include "google/cloud/asset/v1/internal/asset_auth_decorator.h" -#include +#include "google/cloud/asset/v1/asset_service.grpc.pb.h" #include #include diff --git a/google/cloud/asset/v1/internal/asset_auth_decorator.h b/google/cloud/asset/v1/internal/asset_auth_decorator.h index 2a6420080f586..e903fbaf7ace3 100644 --- a/google/cloud/asset/v1/internal/asset_auth_decorator.h +++ b/google/cloud/asset/v1/internal/asset_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/asset/v1/internal/asset_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/asset/v1/internal/asset_connection_impl.h b/google/cloud/asset/v1/internal/asset_connection_impl.h index 952f6e78b9270..b1b9a367279ef 100644 --- a/google/cloud/asset/v1/internal/asset_connection_impl.h +++ b/google/cloud/asset/v1/internal/asset_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/asset/v1/internal/asset_logging_decorator.cc b/google/cloud/asset/v1/internal/asset_logging_decorator.cc index a4aca53587acf..42295d8349f60 100644 --- a/google/cloud/asset/v1/internal/asset_logging_decorator.cc +++ b/google/cloud/asset/v1/internal/asset_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/asset/v1/asset_service.proto #include "google/cloud/asset/v1/internal/asset_logging_decorator.h" +#include "google/cloud/asset/v1/asset_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/asset/v1/internal/asset_logging_decorator.h b/google/cloud/asset/v1/internal/asset_logging_decorator.h index f84bd68791412..112acd76fa946 100644 --- a/google/cloud/asset/v1/internal/asset_logging_decorator.h +++ b/google/cloud/asset/v1/internal/asset_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/asset/v1/internal/asset_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/asset/v1/internal/asset_metadata_decorator.cc b/google/cloud/asset/v1/internal/asset_metadata_decorator.cc index 90503e18cbeef..f7c2cf9b25d03 100644 --- a/google/cloud/asset/v1/internal/asset_metadata_decorator.cc +++ b/google/cloud/asset/v1/internal/asset_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/asset/v1/asset_service.proto #include "google/cloud/asset/v1/internal/asset_metadata_decorator.h" +#include "google/cloud/asset/v1/asset_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 #include #include #include diff --git a/google/cloud/asset/v1/internal/asset_metadata_decorator.h b/google/cloud/asset/v1/internal/asset_metadata_decorator.h index 0ca1f7b156daa..45a7f0719696e 100644 --- a/google/cloud/asset/v1/internal/asset_metadata_decorator.h +++ b/google/cloud/asset/v1/internal/asset_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/asset/v1/internal/asset_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/asset/v1/internal/asset_stub.cc b/google/cloud/asset/v1/internal/asset_stub.cc index def5c641f166a..01a68145e04e6 100644 --- a/google/cloud/asset/v1/internal/asset_stub.cc +++ b/google/cloud/asset/v1/internal/asset_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/asset/v1/asset_service.proto #include "google/cloud/asset/v1/internal/asset_stub.h" +#include "google/cloud/asset/v1/asset_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/asset/v1/internal/asset_stub.h b/google/cloud/asset/v1/internal/asset_stub.h index e692c365bb676..045d608cc7238 100644 --- a/google/cloud/asset/v1/internal/asset_stub.h +++ b/google/cloud/asset/v1/internal/asset_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_V1_INTERNAL_ASSET_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_V1_INTERNAL_ASSET_STUB_H +#include "google/cloud/asset/v1/asset_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/asset/v1/internal/asset_stub_factory.cc b/google/cloud/asset/v1/internal/asset_stub_factory.cc index c4b68909f7769..bd7edf624c626 100644 --- a/google/cloud/asset/v1/internal/asset_stub_factory.cc +++ b/google/cloud/asset/v1/internal/asset_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/asset/v1/asset_service.proto #include "google/cloud/asset/v1/internal/asset_stub_factory.h" +#include "google/cloud/asset/v1/asset_service.grpc.pb.h" #include "google/cloud/asset/v1/internal/asset_auth_decorator.h" #include "google/cloud/asset/v1/internal/asset_logging_decorator.h" #include "google/cloud/asset/v1/internal/asset_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/asset/v1/internal/asset_tracing_connection.cc b/google/cloud/asset/v1/internal/asset_tracing_connection.cc index 845b455cc0064..7fa1aa769298f 100644 --- a/google/cloud/asset/v1/internal/asset_tracing_connection.cc +++ b/google/cloud/asset/v1/internal/asset_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace asset_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AssetServiceTracingConnection::AssetServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -311,16 +309,12 @@ AssetServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAssetServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/asset/v1/internal/asset_tracing_connection.h b/google/cloud/asset/v1/internal/asset_tracing_connection.h index 9c530c2cf0598..27b5ed39e10d8 100644 --- a/google/cloud/asset/v1/internal/asset_tracing_connection.h +++ b/google/cloud/asset/v1/internal/asset_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace asset_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AssetServiceTracingConnection : public asset_v1::AssetServiceConnection { public: ~AssetServiceTracingConnection() override = default; @@ -153,8 +151,6 @@ class AssetServiceTracingConnection : public asset_v1::AssetServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/asset/v1/internal/asset_tracing_stub.cc b/google/cloud/asset/v1/internal/asset_tracing_stub.cc index 1eacf06144070..9906472381a47 100644 --- a/google/cloud/asset/v1/internal/asset_tracing_stub.cc +++ b/google/cloud/asset/v1/internal/asset_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace asset_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AssetServiceTracingStub::AssetServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -379,15 +377,9 @@ future AssetServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAssetServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/asset/v1/internal/asset_tracing_stub.h b/google/cloud/asset/v1/internal/asset_tracing_stub.h index 8c7a9e4e93cac..0b54839199a58 100644 --- a/google/cloud/asset/v1/internal/asset_tracing_stub.h +++ b/google/cloud/asset/v1/internal/asset_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace asset_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AssetServiceTracingStub : public AssetServiceStub { public: ~AssetServiceTracingStub() override = default; @@ -184,8 +182,6 @@ class AssetServiceTracingStub : public AssetServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/assuredworkloads/BUILD.bazel b/google/cloud/assuredworkloads/BUILD.bazel index c37769d131870..e999e230a4aee 100644 --- a/google/cloud/assuredworkloads/BUILD.bazel +++ b/google/cloud/assuredworkloads/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc", + "@googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/assuredworkloads/quickstart/.bazelrc b/google/cloud/assuredworkloads/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/assuredworkloads/quickstart/.bazelrc +++ b/google/cloud/assuredworkloads/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/assuredworkloads/v1/assured_workloads_client.h b/google/cloud/assuredworkloads/v1/assured_workloads_client.h index 17ebe1cc01650..dcfcb49044b0e 100644 --- a/google/cloud/assuredworkloads/v1/assured_workloads_client.h +++ b/google/cloud/assuredworkloads/v1/assured_workloads_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/assuredworkloads/v1/assured_workloads_connection.h b/google/cloud/assuredworkloads/v1/assured_workloads_connection.h index d8cdc5787f047..4d0e8aa2d42fd 100644 --- a/google/cloud/assuredworkloads/v1/assured_workloads_connection.h +++ b/google/cloud/assuredworkloads/v1/assured_workloads_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_V1_ASSURED_WORKLOADS_CONNECTION_H #include "google/cloud/assuredworkloads/v1/assured_workloads_connection_idempotency_policy.h" +#include "google/cloud/assuredworkloads/v1/assuredworkloads.pb.h" #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/assuredworkloads/v1/assured_workloads_connection_idempotency_policy.h b/google/cloud/assuredworkloads/v1/assured_workloads_connection_idempotency_policy.h index 291a560655c7e..2ebe27ecf146a 100644 --- a/google/cloud/assuredworkloads/v1/assured_workloads_connection_idempotency_policy.h +++ b/google/cloud/assuredworkloads/v1/assured_workloads_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_V1_ASSURED_WORKLOADS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_V1_ASSURED_WORKLOADS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/assuredworkloads/v1/assuredworkloads.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.cc index 643f48be0ecee..5e62300037b00 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/assuredworkloads/v1/assuredworkloads.proto #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.h" -#include +#include "google/cloud/assuredworkloads/v1/assuredworkloads.grpc.pb.h" #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.h index b45484afd1d98..33a11e7443214 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_connection_impl.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_connection_impl.h index bf8d205a3df82..772759a6a371d 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_connection_impl.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.cc index 139602cf7027d..ffdbacec87d39 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/assuredworkloads/v1/assuredworkloads.proto #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.h" +#include "google/cloud/assuredworkloads/v1/assuredworkloads.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.h index 300fde6d1702c..67ad44837908f 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.cc index 1312347835a8e..c450bf51780e2 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/assuredworkloads/v1/assuredworkloads.proto #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.h" +#include "google/cloud/assuredworkloads/v1/assuredworkloads.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 #include #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.h index d849d8f8cfbb9..d1cee9da133e8 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc index ef6ad1c12f0b6..83d9f67624781 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/assuredworkloads/v1/assuredworkloads.proto #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h" +#include "google/cloud/assuredworkloads/v1/assuredworkloads.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h index ec7b3e9897b3b..65caa962344db 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_V1_INTERNAL_ASSURED_WORKLOADS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_V1_INTERNAL_ASSURED_WORKLOADS_STUB_H +#include "google/cloud/assuredworkloads/v1/assuredworkloads.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc index 42a8f6d9b788a..189dfb806208a 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/assuredworkloads/v1/assuredworkloads.proto #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.h" +#include "google/cloud/assuredworkloads/v1/assuredworkloads.grpc.pb.h" #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_auth_decorator.h" #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_logging_decorator.h" #include "google/cloud/assuredworkloads/v1/internal/assured_workloads_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc index c761ea543cb04..9071dbaac9a78 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace assuredworkloads_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AssuredWorkloadsServiceTracingConnection:: AssuredWorkloadsServiceTracingConnection( std::shared_ptr @@ -165,18 +163,14 @@ AssuredWorkloadsServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAssuredWorkloadsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.h index be933bd9dce06..b4f082c039750 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace assuredworkloads_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AssuredWorkloadsServiceTracingConnection : public assuredworkloads_v1::AssuredWorkloadsServiceConnection { public: @@ -100,8 +98,6 @@ class AssuredWorkloadsServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc index f61ace61860f9..0c20d09035536 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace assuredworkloads_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AssuredWorkloadsServiceTracingStub::AssuredWorkloadsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -221,16 +219,10 @@ future AssuredWorkloadsServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAssuredWorkloadsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.h index 2a7e2fb2ad12e..6ab2cb126ddde 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace assuredworkloads_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AssuredWorkloadsServiceTracingStub : public AssuredWorkloadsServiceStub { public: ~AssuredWorkloadsServiceTracingStub() override = default; @@ -121,8 +119,6 @@ class AssuredWorkloadsServiceTracingStub : public AssuredWorkloadsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/automl/BUILD.bazel b/google/cloud/automl/BUILD.bazel index 6572061302753..49ee509b3940d 100644 --- a/google/cloud/automl/BUILD.bazel +++ b/google/cloud/automl/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/automl/v1:automl_cc_grpc", + "@googleapis//google/cloud/automl/v1:automl_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/automl/quickstart/.bazelrc b/google/cloud/automl/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/automl/quickstart/.bazelrc +++ b/google/cloud/automl/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/automl/v1/auto_ml_client.h b/google/cloud/automl/v1/auto_ml_client.h index f281fc2249ceb..8e6ebd5c0de89 100644 --- a/google/cloud/automl/v1/auto_ml_client.h +++ b/google/cloud/automl/v1/auto_ml_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/auto_ml_connection.h b/google/cloud/automl/v1/auto_ml_connection.h index c60c26cff3f95..6e866fdaa9f46 100644 --- a/google/cloud/automl/v1/auto_ml_connection.h +++ b/google/cloud/automl/v1/auto_ml_connection.h @@ -21,6 +21,8 @@ #include "google/cloud/automl/v1/auto_ml_connection_idempotency_policy.h" #include "google/cloud/automl/v1/internal/auto_ml_retry_traits.h" +#include "google/cloud/automl/v1/operations.pb.h" +#include "google/cloud/automl/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/automl/v1/auto_ml_connection_idempotency_policy.h b/google/cloud/automl/v1/auto_ml_connection_idempotency_policy.h index ef1d689d03a1d..86f76836dbf00 100644 --- a/google/cloud/automl/v1/auto_ml_connection_idempotency_policy.h +++ b/google/cloud/automl/v1/auto_ml_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_AUTO_ML_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_AUTO_ML_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/automl/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/automl/v1/internal/auto_ml_auth_decorator.cc b/google/cloud/automl/v1/internal/auto_ml_auth_decorator.cc index 36402ef6436bc..10cc89be174d3 100644 --- a/google/cloud/automl/v1/internal/auto_ml_auth_decorator.cc +++ b/google/cloud/automl/v1/internal/auto_ml_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/automl/v1/service.proto #include "google/cloud/automl/v1/internal/auto_ml_auth_decorator.h" -#include +#include "google/cloud/automl/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_auth_decorator.h b/google/cloud/automl/v1/internal/auto_ml_auth_decorator.h index 0aaab45338c19..a18876597e598 100644 --- a/google/cloud/automl/v1/internal/auto_ml_auth_decorator.h +++ b/google/cloud/automl/v1/internal/auto_ml_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/automl/v1/internal/auto_ml_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_connection_impl.h b/google/cloud/automl/v1/internal/auto_ml_connection_impl.h index e005d91af56a2..35ad118282396 100644 --- a/google/cloud/automl/v1/internal/auto_ml_connection_impl.h +++ b/google/cloud/automl/v1/internal/auto_ml_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/automl/v1/internal/auto_ml_logging_decorator.cc b/google/cloud/automl/v1/internal/auto_ml_logging_decorator.cc index c52e99d512cd9..b8269ffdcd597 100644 --- a/google/cloud/automl/v1/internal/auto_ml_logging_decorator.cc +++ b/google/cloud/automl/v1/internal/auto_ml_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/automl/v1/service.proto #include "google/cloud/automl/v1/internal/auto_ml_logging_decorator.h" +#include "google/cloud/automl/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_logging_decorator.h b/google/cloud/automl/v1/internal/auto_ml_logging_decorator.h index ea25ed6a22681..377204e8e1162 100644 --- a/google/cloud/automl/v1/internal/auto_ml_logging_decorator.h +++ b/google/cloud/automl/v1/internal/auto_ml_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/automl/v1/internal/auto_ml_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.cc b/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.cc index a50ef4ae42991..6256e46092acc 100644 --- a/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.cc +++ b/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/automl/v1/service.proto #include "google/cloud/automl/v1/internal/auto_ml_metadata_decorator.h" +#include "google/cloud/automl/v1/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 #include #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.h b/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.h index 892dfafb9ad52..d43ef85f728fe 100644 --- a/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.h +++ b/google/cloud/automl/v1/internal/auto_ml_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/automl/v1/internal/auto_ml_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_stub.cc b/google/cloud/automl/v1/internal/auto_ml_stub.cc index 4ece2a2bc4141..fbadb627d1aa0 100644 --- a/google/cloud/automl/v1/internal/auto_ml_stub.cc +++ b/google/cloud/automl/v1/internal/auto_ml_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/automl/v1/service.proto #include "google/cloud/automl/v1/internal/auto_ml_stub.h" +#include "google/cloud/automl/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_stub.h b/google/cloud/automl/v1/internal/auto_ml_stub.h index d2d9a872271d5..d19a047330f44 100644 --- a/google/cloud/automl/v1/internal/auto_ml_stub.h +++ b/google/cloud/automl/v1/internal/auto_ml_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_INTERNAL_AUTO_ML_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_INTERNAL_AUTO_ML_STUB_H +#include "google/cloud/automl/v1/operations.pb.h" +#include "google/cloud/automl/v1/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_stub_factory.cc b/google/cloud/automl/v1/internal/auto_ml_stub_factory.cc index c836df0f52d4f..da9cc5652e1dd 100644 --- a/google/cloud/automl/v1/internal/auto_ml_stub_factory.cc +++ b/google/cloud/automl/v1/internal/auto_ml_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/automl/v1/internal/auto_ml_metadata_decorator.h" #include "google/cloud/automl/v1/internal/auto_ml_stub.h" #include "google/cloud/automl/v1/internal/auto_ml_tracing_stub.h" +#include "google/cloud/automl/v1/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 #include #include diff --git a/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc b/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc index c15b77304666b..89e0220a4c783 100644 --- a/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc +++ b/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutoMlTracingConnection::AutoMlTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -323,15 +321,11 @@ AutoMlTracingConnection::ListModelEvaluations( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutoMlTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/automl/v1/internal/auto_ml_tracing_connection.h b/google/cloud/automl/v1/internal/auto_ml_tracing_connection.h index 76bbd6b70665e..285eb2ce0b8b6 100644 --- a/google/cloud/automl/v1/internal/auto_ml_tracing_connection.h +++ b/google/cloud/automl/v1/internal/auto_ml_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutoMlTracingConnection : public automl_v1::AutoMlConnection { public: ~AutoMlTracingConnection() override = default; @@ -162,8 +160,6 @@ class AutoMlTracingConnection : public automl_v1::AutoMlConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc b/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc index e44dfab750e9d..b16cce0e4df00 100644 --- a/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc +++ b/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutoMlTracingStub::AutoMlTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -388,15 +386,9 @@ future AutoMlTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutoMlTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/automl/v1/internal/auto_ml_tracing_stub.h b/google/cloud/automl/v1/internal/auto_ml_tracing_stub.h index ee26bbdcc252e..d31bfbefe2fef 100644 --- a/google/cloud/automl/v1/internal/auto_ml_tracing_stub.h +++ b/google/cloud/automl/v1/internal/auto_ml_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutoMlTracingStub : public AutoMlStub { public: ~AutoMlTracingStub() override = default; @@ -186,8 +184,6 @@ class AutoMlTracingStub : public AutoMlStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/automl/v1/internal/prediction_auth_decorator.cc b/google/cloud/automl/v1/internal/prediction_auth_decorator.cc index e1a60c5475163..da323695e46da 100644 --- a/google/cloud/automl/v1/internal/prediction_auth_decorator.cc +++ b/google/cloud/automl/v1/internal/prediction_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/automl/v1/prediction_service.proto #include "google/cloud/automl/v1/internal/prediction_auth_decorator.h" -#include +#include "google/cloud/automl/v1/prediction_service.grpc.pb.h" #include #include diff --git a/google/cloud/automl/v1/internal/prediction_auth_decorator.h b/google/cloud/automl/v1/internal/prediction_auth_decorator.h index 619ab0b3ea7b6..12b6b8dfd5673 100644 --- a/google/cloud/automl/v1/internal/prediction_auth_decorator.h +++ b/google/cloud/automl/v1/internal/prediction_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/automl/v1/internal/prediction_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/internal/prediction_connection_impl.h b/google/cloud/automl/v1/internal/prediction_connection_impl.h index d9603732ff669..7754af79ff1ee 100644 --- a/google/cloud/automl/v1/internal/prediction_connection_impl.h +++ b/google/cloud/automl/v1/internal/prediction_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/automl/v1/internal/prediction_logging_decorator.cc b/google/cloud/automl/v1/internal/prediction_logging_decorator.cc index 9be66f2c27306..a9f7459e1d2bc 100644 --- a/google/cloud/automl/v1/internal/prediction_logging_decorator.cc +++ b/google/cloud/automl/v1/internal/prediction_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/automl/v1/prediction_service.proto #include "google/cloud/automl/v1/internal/prediction_logging_decorator.h" +#include "google/cloud/automl/v1/prediction_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/automl/v1/internal/prediction_logging_decorator.h b/google/cloud/automl/v1/internal/prediction_logging_decorator.h index 3bb4f53388c47..80e6c810806c6 100644 --- a/google/cloud/automl/v1/internal/prediction_logging_decorator.h +++ b/google/cloud/automl/v1/internal/prediction_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/automl/v1/internal/prediction_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/internal/prediction_metadata_decorator.cc b/google/cloud/automl/v1/internal/prediction_metadata_decorator.cc index 28155dbce58d5..b0bb41013201e 100644 --- a/google/cloud/automl/v1/internal/prediction_metadata_decorator.cc +++ b/google/cloud/automl/v1/internal/prediction_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/automl/v1/prediction_service.proto #include "google/cloud/automl/v1/internal/prediction_metadata_decorator.h" +#include "google/cloud/automl/v1/prediction_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 #include #include #include diff --git a/google/cloud/automl/v1/internal/prediction_metadata_decorator.h b/google/cloud/automl/v1/internal/prediction_metadata_decorator.h index 86b9fdf689b24..ae5383ad6b99d 100644 --- a/google/cloud/automl/v1/internal/prediction_metadata_decorator.h +++ b/google/cloud/automl/v1/internal/prediction_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/automl/v1/internal/prediction_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/internal/prediction_stub.cc b/google/cloud/automl/v1/internal/prediction_stub.cc index 3baca91123a65..a96a6c133b573 100644 --- a/google/cloud/automl/v1/internal/prediction_stub.cc +++ b/google/cloud/automl/v1/internal/prediction_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/automl/v1/prediction_service.proto #include "google/cloud/automl/v1/internal/prediction_stub.h" +#include "google/cloud/automl/v1/prediction_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/automl/v1/internal/prediction_stub.h b/google/cloud/automl/v1/internal/prediction_stub.h index d7405d242a2d0..2f4a8a3b94e7d 100644 --- a/google/cloud/automl/v1/internal/prediction_stub.h +++ b/google/cloud/automl/v1/internal/prediction_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_INTERNAL_PREDICTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_INTERNAL_PREDICTION_STUB_H +#include "google/cloud/automl/v1/operations.pb.h" +#include "google/cloud/automl/v1/prediction_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/automl/v1/internal/prediction_stub_factory.cc b/google/cloud/automl/v1/internal/prediction_stub_factory.cc index 8d8b371df2eeb..99636e7795f03 100644 --- a/google/cloud/automl/v1/internal/prediction_stub_factory.cc +++ b/google/cloud/automl/v1/internal/prediction_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/automl/v1/internal/prediction_metadata_decorator.h" #include "google/cloud/automl/v1/internal/prediction_stub.h" #include "google/cloud/automl/v1/internal/prediction_tracing_stub.h" +#include "google/cloud/automl/v1/prediction_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 #include #include diff --git a/google/cloud/automl/v1/internal/prediction_tracing_connection.cc b/google/cloud/automl/v1/internal/prediction_tracing_connection.cc index a4fd5f8671e28..59071f8a15dde 100644 --- a/google/cloud/automl/v1/internal/prediction_tracing_connection.cc +++ b/google/cloud/automl/v1/internal/prediction_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PredictionServiceTracingConnection::PredictionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -68,17 +66,13 @@ PredictionServiceTracingConnection::BatchPredict( return internal::EndSpan(std::move(span), child_->BatchPredict(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePredictionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/automl/v1/internal/prediction_tracing_connection.h b/google/cloud/automl/v1/internal/prediction_tracing_connection.h index 899eedff39fbd..0814f9fa10ad0 100644 --- a/google/cloud/automl/v1/internal/prediction_tracing_connection.h +++ b/google/cloud/automl/v1/internal/prediction_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PredictionServiceTracingConnection : public automl_v1::PredictionServiceConnection { public: @@ -57,8 +55,6 @@ class PredictionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/automl/v1/internal/prediction_tracing_stub.cc b/google/cloud/automl/v1/internal/prediction_tracing_stub.cc index da96a0638ab65..d31409df1b938 100644 --- a/google/cloud/automl/v1/internal/prediction_tracing_stub.cc +++ b/google/cloud/automl/v1/internal/prediction_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PredictionServiceTracingStub::PredictionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -98,15 +96,9 @@ future PredictionServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePredictionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/automl/v1/internal/prediction_tracing_stub.h b/google/cloud/automl/v1/internal/prediction_tracing_stub.h index 3e998964a3e1b..4118fa529c374 100644 --- a/google/cloud/automl/v1/internal/prediction_tracing_stub.h +++ b/google/cloud/automl/v1/internal/prediction_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace automl_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PredictionServiceTracingStub : public PredictionServiceStub { public: ~PredictionServiceTracingStub() override = default; @@ -71,8 +69,6 @@ class PredictionServiceTracingStub : public PredictionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/automl/v1/prediction_client.h b/google/cloud/automl/v1/prediction_client.h index 161a3e83ca66a..d65dd41f85c17 100644 --- a/google/cloud/automl/v1/prediction_client.h +++ b/google/cloud/automl/v1/prediction_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/automl/v1/prediction_connection.h b/google/cloud/automl/v1/prediction_connection.h index a17adc590b1a1..5ed238daf79d3 100644 --- a/google/cloud/automl/v1/prediction_connection.h +++ b/google/cloud/automl/v1/prediction_connection.h @@ -20,7 +20,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_PREDICTION_CONNECTION_H #include "google/cloud/automl/v1/internal/prediction_retry_traits.h" +#include "google/cloud/automl/v1/operations.pb.h" #include "google/cloud/automl/v1/prediction_connection_idempotency_policy.h" +#include "google/cloud/automl/v1/prediction_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -29,9 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/automl/v1/prediction_connection_idempotency_policy.h b/google/cloud/automl/v1/prediction_connection_idempotency_policy.h index 2fbfed25ee4f6..2154f5c579054 100644 --- a/google/cloud/automl/v1/prediction_connection_idempotency_policy.h +++ b/google/cloud/automl/v1/prediction_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_V1_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/automl/v1/prediction_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/backupdr/BUILD.bazel b/google/cloud/backupdr/BUILD.bazel index 3376b9ace5870..0e6b09e36b3af 100644 --- a/google/cloud/backupdr/BUILD.bazel +++ b/google/cloud/backupdr/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/backupdr/v1:backupdr_cc_grpc", + "@googleapis//google/cloud/backupdr/v1:backupdr_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/backupdr/quickstart/.bazelrc b/google/cloud/backupdr/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/backupdr/quickstart/.bazelrc +++ b/google/cloud/backupdr/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/backupdr/v1/backup_dr_client.h b/google/cloud/backupdr/v1/backup_dr_client.h index 8d440ed6f5156..ac741e7d71747 100644 --- a/google/cloud/backupdr/v1/backup_dr_client.h +++ b/google/cloud/backupdr/v1/backup_dr_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/backupdr/v1/backup_dr_connection.h b/google/cloud/backupdr/v1/backup_dr_connection.h index 8020d4c359819..7f984ed961bd6 100644 --- a/google/cloud/backupdr/v1/backup_dr_connection.h +++ b/google/cloud/backupdr/v1/backup_dr_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BACKUPDR_V1_BACKUP_DR_CONNECTION_H #include "google/cloud/backupdr/v1/backup_dr_connection_idempotency_policy.h" +#include "google/cloud/backupdr/v1/backupdr.pb.h" #include "google/cloud/backupdr/v1/internal/backup_dr_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/backupdr/v1/backup_dr_connection_idempotency_policy.h b/google/cloud/backupdr/v1/backup_dr_connection_idempotency_policy.h index c37bcd85d7417..27439ee252e7a 100644 --- a/google/cloud/backupdr/v1/backup_dr_connection_idempotency_policy.h +++ b/google/cloud/backupdr/v1/backup_dr_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BACKUPDR_V1_BACKUP_DR_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BACKUPDR_V1_BACKUP_DR_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/backupdr/v1/backupdr.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.cc b/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.cc index bd1eb022073b9..6b11da26ee71c 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/backupdr/v1/backupdr.proto #include "google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.h" -#include +#include "google/cloud/backupdr/v1/backupdr.grpc.pb.h" #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.h b/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.h index b666398d7c113..19c47d8e400f6 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/backupdr/v1/internal/backup_dr_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_connection_impl.h b/google/cloud/backupdr/v1/internal/backup_dr_connection_impl.h index 5fcc2e03b386f..c07a4f4aac040 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_connection_impl.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.cc b/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.cc index 0dd4002e1b93b..177c1b72229c7 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/backupdr/v1/backupdr.proto #include "google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.h" +#include "google/cloud/backupdr/v1/backupdr.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.h b/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.h index b7798f44fdc9f..32027153e83fd 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/backupdr/v1/internal/backup_dr_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.cc b/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.cc index daca16070bfb4..f8355948f5907 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/backupdr/v1/backupdr.proto #include "google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.h" +#include "google/cloud/backupdr/v1/backupdr.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 #include #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.h b/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.h index df1c76d809c66..34939cb844ea0 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/backupdr/v1/internal/backup_dr_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_stub.cc b/google/cloud/backupdr/v1/internal/backup_dr_stub.cc index 5c9e9b0377c38..fc843816f9503 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_stub.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/backupdr/v1/backupdr.proto #include "google/cloud/backupdr/v1/internal/backup_dr_stub.h" +#include "google/cloud/backupdr/v1/backupdr.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_stub.h b/google/cloud/backupdr/v1/internal/backup_dr_stub.h index 4ca1ba56a99fb..7aa4234b41ad0 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_stub.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BACKUPDR_V1_INTERNAL_BACKUP_DR_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BACKUPDR_V1_INTERNAL_BACKUP_DR_STUB_H +#include "google/cloud/backupdr/v1/backupdr.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc b/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc index ea806afe2edc9..747e2c4ddef5a 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/backupdr/v1/backupdr.proto #include "google/cloud/backupdr/v1/internal/backup_dr_stub_factory.h" +#include "google/cloud/backupdr/v1/backupdr.grpc.pb.h" #include "google/cloud/backupdr/v1/internal/backup_dr_auth_decorator.h" #include "google/cloud/backupdr/v1/internal/backup_dr_logging_decorator.h" #include "google/cloud/backupdr/v1/internal/backup_dr_metadata_decorator.h" #include "google/cloud/backupdr/v1/internal/backup_dr_stub.h" #include "google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.cc b/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.cc index 4de739cc92619..26e6a3ea5179c 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace backupdr_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BackupDRTracingConnection::BackupDRTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -843,15 +841,11 @@ Status BackupDRTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBackupDRTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.h b/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.h index bcb8b68dbb137..872bbe8b2b414 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace backupdr_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BackupDRTracingConnection : public backupdr_v1::BackupDRConnection { public: ~BackupDRTracingConnection() override = default; @@ -364,8 +362,6 @@ class BackupDRTracingConnection : public backupdr_v1::BackupDRConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.cc b/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.cc index 6cf2a60df74ca..ddaba1bf909fd 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace backupdr_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BackupDRTracingStub::BackupDRTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -875,15 +873,9 @@ future BackupDRTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBackupDRTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.h b/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.h index bf238c46d2771..7c899019b17a4 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace backupdr_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BackupDRTracingStub : public BackupDRStub { public: ~BackupDRTracingStub() override = default; @@ -408,8 +406,6 @@ class BackupDRTracingStub : public BackupDRStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/baremetalsolution/BUILD.bazel b/google/cloud/baremetalsolution/BUILD.bazel index d716d05083e07..fadae5a55dd74 100644 --- a/google/cloud/baremetalsolution/BUILD.bazel +++ b/google/cloud/baremetalsolution/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc", + "@googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/baremetalsolution/quickstart/.bazelrc b/google/cloud/baremetalsolution/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/baremetalsolution/quickstart/.bazelrc +++ b/google/cloud/baremetalsolution/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/baremetalsolution/v2/bare_metal_solution_client.h b/google/cloud/baremetalsolution/v2/bare_metal_solution_client.h index 39b35d15feee9..8659c95296454 100644 --- a/google/cloud/baremetalsolution/v2/bare_metal_solution_client.h +++ b/google/cloud/baremetalsolution/v2/bare_metal_solution_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/baremetalsolution/v2/bare_metal_solution_connection.h b/google/cloud/baremetalsolution/v2/bare_metal_solution_connection.h index acb287cbe863c..9bfeb8ac9136c 100644 --- a/google/cloud/baremetalsolution/v2/bare_metal_solution_connection.h +++ b/google/cloud/baremetalsolution/v2/bare_metal_solution_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_V2_BARE_METAL_SOLUTION_CONNECTION_H #include "google/cloud/baremetalsolution/v2/bare_metal_solution_connection_idempotency_policy.h" +#include "google/cloud/baremetalsolution/v2/baremetalsolution.pb.h" #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/baremetalsolution/v2/bare_metal_solution_connection_idempotency_policy.h b/google/cloud/baremetalsolution/v2/bare_metal_solution_connection_idempotency_policy.h index acbb0d4e5581d..494a34954397a 100644 --- a/google/cloud/baremetalsolution/v2/bare_metal_solution_connection_idempotency_policy.h +++ b/google/cloud/baremetalsolution/v2/bare_metal_solution_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_V2_BARE_METAL_SOLUTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_V2_BARE_METAL_SOLUTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/baremetalsolution/v2/baremetalsolution.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.cc index 939b5d383e175..ba9a72d3cbbd5 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/baremetalsolution/v2/baremetalsolution.proto #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.h" -#include +#include "google/cloud/baremetalsolution/v2/baremetalsolution.grpc.pb.h" #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.h index 6588653dd4740..6c9263f08c836 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_connection_impl.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_connection_impl.h index 8ef115e2a414f..d8f2ecd9ffdab 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_connection_impl.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.cc index 6907cf41d8522..d3360311950ba 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/baremetalsolution/v2/baremetalsolution.proto #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.h" +#include "google/cloud/baremetalsolution/v2/baremetalsolution.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.h index 598d103e6eaa4..b0230ef951f6d 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.cc index 1c83cad6e1500..0d9ee82635118 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/baremetalsolution/v2/baremetalsolution.proto #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.h" +#include "google/cloud/baremetalsolution/v2/baremetalsolution.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 #include #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.h index 981c882851e8d..1e5b03fa5ddab 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc index cc0bd2a5a49fd..6842703d6676a 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/baremetalsolution/v2/baremetalsolution.proto #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h" +#include "google/cloud/baremetalsolution/v2/baremetalsolution.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h index 41c3590b354e8..aad53e54fcb73 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_V2_INTERNAL_BARE_METAL_SOLUTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_V2_INTERNAL_BARE_METAL_SOLUTION_STUB_H +#include "google/cloud/baremetalsolution/v2/baremetalsolution.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub_factory.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub_factory.cc index 5154b14bf2ae9..2343d0900071a 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub_factory.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub_factory.cc @@ -17,19 +17,19 @@ // source: google/cloud/baremetalsolution/v2/baremetalsolution.proto #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub_factory.h" +#include "google/cloud/baremetalsolution/v2/baremetalsolution.grpc.pb.h" #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_auth_decorator.h" #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_logging_decorator.h" #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_metadata_decorator.h" #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h" #include "google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include #include #include diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc index 76f390f6fb1f3..3df7023fc7db5 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace baremetalsolution_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BareMetalSolutionTracingConnection::BareMetalSolutionTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -834,17 +832,13 @@ BareMetalSolutionTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBareMetalSolutionTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.h index f65c5fb6482db..14bd6703d766f 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace baremetalsolution_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BareMetalSolutionTracingConnection : public baremetalsolution_v2::BareMetalSolutionConnection { public: @@ -379,8 +377,6 @@ class BareMetalSolutionTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc index ef74fcc5602a1..d9f6680e75033 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace baremetalsolution_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BareMetalSolutionTracingStub::BareMetalSolutionTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -888,15 +886,9 @@ future BareMetalSolutionTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBareMetalSolutionTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.h index 8bd6f4ddbbd6a..e3eab5f195a72 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace baremetalsolution_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BareMetalSolutionTracingStub : public BareMetalSolutionStub { public: ~BareMetalSolutionTracingStub() override = default; @@ -411,8 +409,6 @@ class BareMetalSolutionTracingStub : public BareMetalSolutionStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/batch/BUILD.bazel b/google/cloud/batch/BUILD.bazel index 9592453d25621..691baa13daf72 100644 --- a/google/cloud/batch/BUILD.bazel +++ b/google/cloud/batch/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/batch/v1:batch_cc_grpc", + "@googleapis//google/cloud/batch/v1:batch_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/batch/quickstart/.bazelrc b/google/cloud/batch/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/batch/quickstart/.bazelrc +++ b/google/cloud/batch/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/batch/v1/batch_client.h b/google/cloud/batch/v1/batch_client.h index c75133defc921..e0d673a6cbe3b 100644 --- a/google/cloud/batch/v1/batch_client.h +++ b/google/cloud/batch/v1/batch_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/batch/v1/batch_connection.h b/google/cloud/batch/v1/batch_connection.h index ae2cbf28f8700..1d5a53807fed7 100644 --- a/google/cloud/batch/v1/batch_connection.h +++ b/google/cloud/batch/v1/batch_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_V1_BATCH_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_V1_BATCH_CONNECTION_H +#include "google/cloud/batch/v1/batch.pb.h" #include "google/cloud/batch/v1/batch_connection_idempotency_policy.h" #include "google/cloud/batch/v1/internal/batch_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/batch/v1/batch_connection_idempotency_policy.h b/google/cloud/batch/v1/batch_connection_idempotency_policy.h index 60846fc67a053..f5ef04434ceb5 100644 --- a/google/cloud/batch/v1/batch_connection_idempotency_policy.h +++ b/google/cloud/batch/v1/batch_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_V1_BATCH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_V1_BATCH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/batch/v1/batch.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/batch/v1/internal/batch_auth_decorator.cc b/google/cloud/batch/v1/internal/batch_auth_decorator.cc index b56288568880f..4bf02e58bea86 100644 --- a/google/cloud/batch/v1/internal/batch_auth_decorator.cc +++ b/google/cloud/batch/v1/internal/batch_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/batch/v1/batch.proto #include "google/cloud/batch/v1/internal/batch_auth_decorator.h" -#include +#include "google/cloud/batch/v1/batch.grpc.pb.h" #include #include diff --git a/google/cloud/batch/v1/internal/batch_auth_decorator.h b/google/cloud/batch/v1/internal/batch_auth_decorator.h index 5c552dce22990..f17b00c9f888b 100644 --- a/google/cloud/batch/v1/internal/batch_auth_decorator.h +++ b/google/cloud/batch/v1/internal/batch_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/batch/v1/internal/batch_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/batch/v1/internal/batch_connection_impl.h b/google/cloud/batch/v1/internal/batch_connection_impl.h index d6129c89029a0..123debd9f979e 100644 --- a/google/cloud/batch/v1/internal/batch_connection_impl.h +++ b/google/cloud/batch/v1/internal/batch_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/batch/v1/internal/batch_logging_decorator.cc b/google/cloud/batch/v1/internal/batch_logging_decorator.cc index dc2ebe7d94fa1..149edfbce38e5 100644 --- a/google/cloud/batch/v1/internal/batch_logging_decorator.cc +++ b/google/cloud/batch/v1/internal/batch_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/batch/v1/batch.proto #include "google/cloud/batch/v1/internal/batch_logging_decorator.h" +#include "google/cloud/batch/v1/batch.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/batch/v1/internal/batch_logging_decorator.h b/google/cloud/batch/v1/internal/batch_logging_decorator.h index 301e343f39153..4317bec1c7598 100644 --- a/google/cloud/batch/v1/internal/batch_logging_decorator.h +++ b/google/cloud/batch/v1/internal/batch_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/batch/v1/internal/batch_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/batch/v1/internal/batch_metadata_decorator.cc b/google/cloud/batch/v1/internal/batch_metadata_decorator.cc index c6b7241f34926..24a763e1a6f6f 100644 --- a/google/cloud/batch/v1/internal/batch_metadata_decorator.cc +++ b/google/cloud/batch/v1/internal/batch_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/batch/v1/batch.proto #include "google/cloud/batch/v1/internal/batch_metadata_decorator.h" +#include "google/cloud/batch/v1/batch.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 #include #include #include diff --git a/google/cloud/batch/v1/internal/batch_metadata_decorator.h b/google/cloud/batch/v1/internal/batch_metadata_decorator.h index c3e436c718910..54c4555c42238 100644 --- a/google/cloud/batch/v1/internal/batch_metadata_decorator.h +++ b/google/cloud/batch/v1/internal/batch_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/batch/v1/internal/batch_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/batch/v1/internal/batch_stub.cc b/google/cloud/batch/v1/internal/batch_stub.cc index fd146dfe18ddf..1412dc090815f 100644 --- a/google/cloud/batch/v1/internal/batch_stub.cc +++ b/google/cloud/batch/v1/internal/batch_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/batch/v1/batch.proto #include "google/cloud/batch/v1/internal/batch_stub.h" +#include "google/cloud/batch/v1/batch.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/batch/v1/internal/batch_stub.h b/google/cloud/batch/v1/internal/batch_stub.h index b8d25b57dc5fd..2aa7645ae96a9 100644 --- a/google/cloud/batch/v1/internal/batch_stub.h +++ b/google/cloud/batch/v1/internal/batch_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_V1_INTERNAL_BATCH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_V1_INTERNAL_BATCH_STUB_H +#include "google/cloud/batch/v1/batch.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/batch/v1/internal/batch_stub_factory.cc b/google/cloud/batch/v1/internal/batch_stub_factory.cc index 2c17f0b50aed0..40926dfdaca25 100644 --- a/google/cloud/batch/v1/internal/batch_stub_factory.cc +++ b/google/cloud/batch/v1/internal/batch_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/batch/v1/batch.proto #include "google/cloud/batch/v1/internal/batch_stub_factory.h" +#include "google/cloud/batch/v1/batch.grpc.pb.h" #include "google/cloud/batch/v1/internal/batch_auth_decorator.h" #include "google/cloud/batch/v1/internal/batch_logging_decorator.h" #include "google/cloud/batch/v1/internal/batch_metadata_decorator.h" #include "google/cloud/batch/v1/internal/batch_stub.h" #include "google/cloud/batch/v1/internal/batch_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/batch/v1/internal/batch_tracing_connection.cc b/google/cloud/batch/v1/internal/batch_tracing_connection.cc index e784bc29b9aad..8454e9ac1206c 100644 --- a/google/cloud/batch/v1/internal/batch_tracing_connection.cc +++ b/google/cloud/batch/v1/internal/batch_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace batch_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BatchServiceTracingConnection::BatchServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -179,16 +177,12 @@ Status BatchServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBatchServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/batch/v1/internal/batch_tracing_connection.h b/google/cloud/batch/v1/internal/batch_tracing_connection.h index f38107579da47..9852b70e08582 100644 --- a/google/cloud/batch/v1/internal/batch_tracing_connection.h +++ b/google/cloud/batch/v1/internal/batch_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace batch_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BatchServiceTracingConnection : public batch_v1::BatchServiceConnection { public: ~BatchServiceTracingConnection() override = default; @@ -96,8 +94,6 @@ class BatchServiceTracingConnection : public batch_v1::BatchServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/batch/v1/internal/batch_tracing_stub.cc b/google/cloud/batch/v1/internal/batch_tracing_stub.cc index 2691b27faf073..807695e9f4e0d 100644 --- a/google/cloud/batch/v1/internal/batch_tracing_stub.cc +++ b/google/cloud/batch/v1/internal/batch_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace batch_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BatchServiceTracingStub::BatchServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -236,15 +234,9 @@ future BatchServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBatchServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/batch/v1/internal/batch_tracing_stub.h b/google/cloud/batch/v1/internal/batch_tracing_stub.h index d61667b2cc87b..2731f3f0d4919 100644 --- a/google/cloud/batch/v1/internal/batch_tracing_stub.h +++ b/google/cloud/batch/v1/internal/batch_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace batch_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BatchServiceTracingStub : public BatchServiceStub { public: ~BatchServiceTracingStub() override = default; @@ -120,8 +118,6 @@ class BatchServiceTracingStub : public BatchServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/beyondcorp/BUILD.bazel b/google/cloud/beyondcorp/BUILD.bazel index 46b948e8bd841..89621433e4780 100644 --- a/google/cloud/beyondcorp/BUILD.bazel +++ b/google/cloud/beyondcorp/BUILD.bazel @@ -26,9 +26,9 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/beyondcorp/appconnections/v1:appconnections_cc_grpc", - "@com_google_googleapis//google/cloud/beyondcorp/appconnectors/v1:appconnectors_cc_grpc", - "@com_google_googleapis//google/cloud/beyondcorp/appgateways/v1:appgateways_cc_grpc", + "@googleapis//google/cloud/beyondcorp/appconnections/v1:appconnections_cc_grpc", + "@googleapis//google/cloud/beyondcorp/appconnectors/v1:appconnectors_cc_grpc", + "@googleapis//google/cloud/beyondcorp/appgateways/v1:appgateways_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/beyondcorp/appconnections/v1/app_connections_client.h b/google/cloud/beyondcorp/appconnections/v1/app_connections_client.h index 787f3d0dd2664..13b38fe88d535 100644 --- a/google/cloud/beyondcorp/appconnections/v1/app_connections_client.h +++ b/google/cloud/beyondcorp/appconnections/v1/app_connections_client.h @@ -27,7 +27,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/app_connections_connection.h b/google/cloud/beyondcorp/appconnections/v1/app_connections_connection.h index b1add147978b6..2d919f0b6a8dc 100644 --- a/google/cloud/beyondcorp/appconnections/v1/app_connections_connection.h +++ b/google/cloud/beyondcorp/appconnections/v1/app_connections_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTIONS_V1_APP_CONNECTIONS_CONNECTION_H #include "google/cloud/beyondcorp/appconnections/v1/app_connections_connection_idempotency_policy.h" +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.pb.h" #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,8 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appconnections/v1/app_connections_connection_idempotency_policy.h b/google/cloud/beyondcorp/appconnections/v1/app_connections_connection_idempotency_policy.h index a7add5df1e169..26c76c014170e 100644 --- a/google/cloud/beyondcorp/appconnections/v1/app_connections_connection_idempotency_policy.h +++ b/google/cloud/beyondcorp/appconnections/v1/app_connections_connection_idempotency_policy.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTIONS_V1_APP_CONNECTIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTIONS_V1_APP_CONNECTIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.cc index 7c1540d34acc6..883d8785ceabf 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.cc @@ -18,7 +18,7 @@ // google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.h" -#include +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.h index ae72d2fd8dd87..6c75afa89b6a3 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_connection_impl.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_connection_impl.h index ea82e4d0edc53..226f749aa852c 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_connection_impl.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.cc index 7a715d52ec2f4..827e29217d498 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.cc @@ -18,9 +18,9 @@ // google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.h" +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.h index 8d838adec5920..b3c92de099ff8 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.cc index 63a7a46960df4..a92e55577ccbd 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.cc @@ -18,12 +18,12 @@ // google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.h" +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_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 #include #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.h index c0aeaa36c2f98..87daed258b5ee 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc index 15a0193938e31..508f633cd9063 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc @@ -18,10 +18,10 @@ // google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h" +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h index b8d334e0e9059..dee9c0234235e 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h @@ -20,15 +20,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTIONS_V1_INTERNAL_APP_CONNECTIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTIONS_V1_INTERNAL_APP_CONNECTIONS_STUB_H +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc index e70e8a2881d89..4669e4d07959b 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc @@ -18,21 +18,21 @@ // google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.h" +#include "google/cloud/beyondcorp/appconnections/v1/app_connections_service.grpc.pb.h" #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_auth_decorator.h" #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_logging_decorator.h" #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_metadata_decorator.h" #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h" #include "google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc index 5150845c034e2..e3b40d2a29f20 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace beyondcorp_appconnections_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppConnectionsServiceTracingConnection::AppConnectionsServiceTracingConnection( std::shared_ptr< beyondcorp_appconnections_v1::AppConnectionsServiceConnection> @@ -276,19 +274,15 @@ Status AppConnectionsServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppConnectionsServiceTracingConnection( std::shared_ptr< beyondcorp_appconnections_v1::AppConnectionsServiceConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.h index fb7ef92fc956d..68e2ffda60a86 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace beyondcorp_appconnections_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppConnectionsServiceTracingConnection : public beyondcorp_appconnections_v1::AppConnectionsServiceConnection { public: @@ -124,8 +122,6 @@ class AppConnectionsServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc index a8a1cd0049cec..c56d87954fad8 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace beyondcorp_appconnections_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppConnectionsServiceTracingStub::AppConnectionsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -313,15 +311,9 @@ future AppConnectionsServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppConnectionsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.h index 4dbc1b436118a..0b82b7f333478 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.h @@ -31,8 +31,6 @@ namespace cloud { namespace beyondcorp_appconnections_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppConnectionsServiceTracingStub : public AppConnectionsServiceStub { public: ~AppConnectionsServiceTracingStub() override = default; @@ -148,8 +146,6 @@ class AppConnectionsServiceTracingStub : public AppConnectionsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/beyondcorp/appconnectors/v1/app_connectors_client.h b/google/cloud/beyondcorp/appconnectors/v1/app_connectors_client.h index 0fe3e1a7ce4ff..566b6476d2783 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/app_connectors_client.h +++ b/google/cloud/beyondcorp/appconnectors/v1/app_connectors_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection.h b/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection.h index d199e5ad2d98f..7dc7cbfecf54e 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection.h +++ b/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTORS_V1_APP_CONNECTORS_CONNECTION_H #include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection_idempotency_policy.h" +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.pb.h" #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection_idempotency_policy.h b/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection_idempotency_policy.h index 7e4add7a2232d..a71570a5e95c7 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection_idempotency_policy.h +++ b/google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTORS_V1_APP_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTORS_V1_APP_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.cc index 83a979d3b7a39..801eb8db8469b 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.h" -#include +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.h index 097c69337a3a8..430692b6395f2 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_connection_impl.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_connection_impl.h index bcd96cfcce674..352aefea9fa90 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_connection_impl.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.cc index d015c1cb93615..2c19dc7b2eb6c 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.h" +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.h index edf5080582e16..2397a4fbe0876 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.cc index 03ea4907257b3..32d8339f80e7d 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.h" +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_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 #include #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.h index d8618f1049f5b..8954905dcceee 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc index 485c342489feb..2c1abdab19ee1 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h" +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h index 47a578a0ba116..47c825644baf4 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTORS_V1_INTERNAL_APP_CONNECTORS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPCONNECTORS_V1_INTERNAL_APP_CONNECTORS_STUB_H +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc index ad05d1ab7cfcd..93c7266bf3a1e 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.h" +#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.grpc.pb.h" #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_auth_decorator.h" #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_logging_decorator.h" #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_metadata_decorator.h" #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h" #include "google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc index b34f9df2ffdb2..e0a559687daae 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace beyondcorp_appconnectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppConnectorsServiceTracingConnection::AppConnectorsServiceTracingConnection( std::shared_ptr child) @@ -291,18 +289,14 @@ Status AppConnectorsServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppConnectorsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.h index f7821a55eef54..f82d67d83e54f 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace beyondcorp_appconnectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppConnectorsServiceTracingConnection : public beyondcorp_appconnectors_v1::AppConnectorsServiceConnection { public: @@ -131,8 +129,6 @@ class AppConnectorsServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc index 87aa44ec1acc0..a100a527364d4 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace beyondcorp_appconnectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppConnectorsServiceTracingStub::AppConnectorsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -325,15 +323,9 @@ future AppConnectorsServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppConnectorsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.h index 12faa23f05eec..2df0f2aace836 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace beyondcorp_appconnectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppConnectorsServiceTracingStub : public AppConnectorsServiceStub { public: ~AppConnectorsServiceTracingStub() override = default; @@ -152,8 +150,6 @@ class AppConnectorsServiceTracingStub : public AppConnectorsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/beyondcorp/appgateways/v1/app_gateways_client.h b/google/cloud/beyondcorp/appgateways/v1/app_gateways_client.h index a4546e818a095..b317410b2be2d 100644 --- a/google/cloud/beyondcorp/appgateways/v1/app_gateways_client.h +++ b/google/cloud/beyondcorp/appgateways/v1/app_gateways_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection.h b/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection.h index 5be7808362b26..fd3aa704dbbb6 100644 --- a/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection.h +++ b/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPGATEWAYS_V1_APP_GATEWAYS_CONNECTION_H #include "google/cloud/beyondcorp/appgateways/v1/app_gateways_connection_idempotency_policy.h" +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.pb.h" #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection_idempotency_policy.h b/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection_idempotency_policy.h index 413008cb33a4c..639d2ce9e13b0 100644 --- a/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection_idempotency_policy.h +++ b/google/cloud/beyondcorp/appgateways/v1/app_gateways_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPGATEWAYS_V1_APP_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPGATEWAYS_V1_APP_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.cc index bce20174bbbf3..e92f0d7ca8122 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.h" -#include +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.h index 1817a6e3e65d0..21a4603910fdc 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_connection_impl.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_connection_impl.h index d83207209b50c..40ca52a49e8f4 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_connection_impl.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.cc index 334a70137cca1..e2562f4caa82d 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.h" +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.h index 2bb57552f98b7..3e4426d52ba51 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.cc index 240458625edbe..0e81f7fd4d980 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.h" +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_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 #include #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.h index 7b1b60c901def..059fdb53ffca5 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc index f940a29c0ea84..9c7442e359301 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h" +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h index 788d012b0b0be..11eedd9b9680e 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPGATEWAYS_V1_INTERNAL_APP_GATEWAYS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APPGATEWAYS_V1_INTERNAL_APP_GATEWAYS_STUB_H +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc index ae7a851730fa4..41612963d3e0f 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.h" +#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.grpc.pb.h" #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_auth_decorator.h" #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_logging_decorator.h" #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_metadata_decorator.h" #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h" #include "google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc index c349cf6cf3e3a..94c12965cfed6 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace beyondcorp_appgateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppGatewaysServiceTracingConnection::AppGatewaysServiceTracingConnection( std::shared_ptr child) @@ -217,18 +215,14 @@ Status AppGatewaysServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppGatewaysServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.h index d9ac514a90782..e4692ebf654a2 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace beyondcorp_appgateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppGatewaysServiceTracingConnection : public beyondcorp_appgateways_v1::AppGatewaysServiceConnection { public: @@ -111,8 +109,6 @@ class AppGatewaysServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc index d476254114146..ac9e5d9a3810b 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace beyondcorp_appgateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AppGatewaysServiceTracingStub::AppGatewaysServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -263,15 +261,9 @@ future AppGatewaysServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAppGatewaysServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.h index b5fac507432e1..61ca770d2006f 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace beyondcorp_appgateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AppGatewaysServiceTracingStub : public AppGatewaysServiceStub { public: ~AppGatewaysServiceTracingStub() override = default; @@ -129,8 +127,6 @@ class AppGatewaysServiceTracingStub : public AppGatewaysServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/beyondcorp/quickstart/.bazelrc b/google/cloud/beyondcorp/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/beyondcorp/quickstart/.bazelrc +++ b/google/cloud/beyondcorp/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/bigquery/BUILD.bazel b/google/cloud/bigquery/BUILD.bazel index fa8bc6047c540..6ecb7ee049842 100644 --- a/google/cloud/bigquery/BUILD.bazel +++ b/google/cloud/bigquery/BUILD.bazel @@ -38,16 +38,16 @@ service_dirs = [ src_dirs = service_dirs + [d + "internal/" for d in service_dirs] googleapis_deps = [ - "@com_google_googleapis//google/cloud/bigquery/analyticshub/v1:analyticshub_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/biglake/v1:biglake_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/connection/v1:connection_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/datapolicies/v1:datapolicies_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/datapolicies/v2:datapolicies_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/datatransfer/v1:datatransfer_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/logging/v1:logging_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/migration/v2:migration_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/reservation/v1:reservation_cc_grpc", - "@com_google_googleapis//google/cloud/bigquery/storage/v1:storage_cc_grpc", + "@googleapis//google/cloud/bigquery/analyticshub/v1:analyticshub_cc_grpc", + "@googleapis//google/cloud/bigquery/biglake/v1:biglake_cc_grpc", + "@googleapis//google/cloud/bigquery/connection/v1:connection_cc_grpc", + "@googleapis//google/cloud/bigquery/datapolicies/v1:datapolicies_cc_grpc", + "@googleapis//google/cloud/bigquery/datapolicies/v2:datapolicies_cc_grpc", + "@googleapis//google/cloud/bigquery/datatransfer/v1:datatransfer_cc_grpc", + "@googleapis//google/cloud/bigquery/logging/v1:logging_cc_grpc", + "@googleapis//google/cloud/bigquery/migration/v2:migration_cc_grpc", + "@googleapis//google/cloud/bigquery/reservation/v1:reservation_cc_grpc", + "@googleapis//google/cloud/bigquery/storage/v1:storage_cc_grpc", ] cc_gapic_library( @@ -85,7 +85,7 @@ cc_library( visibility = ["//:__subpackages__"], deps = [ ":google_cloud_cpp_bigquery_rest", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -100,7 +100,7 @@ cc_library( ":google_cloud_cpp_bigquery_rest_mocks", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -114,6 +114,6 @@ cc_library( "//google/cloud:google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) for test in bigquery_rest_unit_tests] diff --git a/google/cloud/bigquery/analyticshub/v1/analytics_hub_client.h b/google/cloud/bigquery/analyticshub/v1/analytics_hub_client.h index ab56fa6c65f12..9c9db6346b4b7 100644 --- a/google/cloud/bigquery/analyticshub/v1/analytics_hub_client.h +++ b/google/cloud/bigquery/analyticshub/v1/analytics_hub_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection.h b/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection.h index 5ff4adc99c788..f9b74258d06b1 100644 --- a/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection.h +++ b/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICSHUB_V1_ANALYTICS_HUB_CONNECTION_H #include "google/cloud/bigquery/analyticshub/v1/analytics_hub_connection_idempotency_policy.h" +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.pb.h" #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection_idempotency_policy.h b/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection_idempotency_policy.h index 11f883ab91bdc..0b5bdeb74d6ad 100644 --- a/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection_idempotency_policy.h +++ b/google/cloud/bigquery/analyticshub/v1/analytics_hub_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICSHUB_V1_ANALYTICS_HUB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICSHUB_V1_ANALYTICS_HUB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.cc index c10c52da05983..191091e448cea 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.h" -#include +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.h index 28040cd3fe87f..14ec91b60073c 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_connection_impl.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_connection_impl.h index f6649c7eccc0b..a0060132752c2 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_connection_impl.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.cc index c71db34cb5a23..726e7e9c25e1c 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.h" +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.h index 7c27d2cc2518e..41307ea137e87 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.cc index 00c50a400954f..a1e5186695ec6 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.h" +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.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 #include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.h index 494d8b2c29306..c7fc40b1ee3be 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc index 0f2e671046b5c..bc0184d9623d4 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h" +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h index c77da72a36266..30b5ae4db3645 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICSHUB_V1_INTERNAL_ANALYTICS_HUB_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICSHUB_V1_INTERNAL_ANALYTICS_HUB_STUB_H +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub_factory.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub_factory.cc index a51b6b0a8ece6..259f611d409d0 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub_factory.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub_factory.h" +#include "google/cloud/bigquery/analyticshub/v1/analyticshub.grpc.pb.h" #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_auth_decorator.h" #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_logging_decorator.h" #include "google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc index b9c7defede782..90073cfe991bb 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_analyticshub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AnalyticsHubServiceTracingConnection::AnalyticsHubServiceTracingConnection( std::shared_ptr child) @@ -435,18 +433,14 @@ AnalyticsHubServiceTracingConnection::ApproveQueryTemplate( return internal::EndSpan(*span, child_->ApproveQueryTemplate(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAnalyticsHubServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.h index 0a88db7b76706..019bfcf07147d 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_analyticshub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AnalyticsHubServiceTracingConnection : public bigquery_analyticshub_v1::AnalyticsHubServiceConnection { public: @@ -196,8 +194,6 @@ class AnalyticsHubServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc index 50ffa4fc889c0..8c24a87c6d781 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_analyticshub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AnalyticsHubServiceTracingStub::AnalyticsHubServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -512,15 +510,9 @@ future AnalyticsHubServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAnalyticsHubServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.h index d197183eeff11..0fc986a23386f 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_analyticshub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AnalyticsHubServiceTracingStub : public AnalyticsHubServiceStub { public: ~AnalyticsHubServiceTracingStub() override = default; @@ -232,8 +230,6 @@ class AnalyticsHubServiceTracingStub : public AnalyticsHubServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_auth_decorator.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_auth_decorator.cc index 6766f9444a4f0..c074efa91ecef 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_auth_decorator.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/biglake/v1/metastore.proto #include "google/cloud/bigquery/biglake/v1/internal/metastore_auth_decorator.h" -#include +#include "google/cloud/bigquery/biglake/v1/metastore.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_logging_decorator.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_logging_decorator.cc index 2261f80e6c736..4dec3f8c2bf48 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_logging_decorator.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/biglake/v1/metastore.proto #include "google/cloud/bigquery/biglake/v1/internal/metastore_logging_decorator.h" +#include "google/cloud/bigquery/biglake/v1/metastore.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_metadata_decorator.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_metadata_decorator.cc index 3464c99390b47..79ed08bdd68cc 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_metadata_decorator.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/biglake/v1/metastore.proto #include "google/cloud/bigquery/biglake/v1/internal/metastore_metadata_decorator.h" +#include "google/cloud/bigquery/biglake/v1/metastore.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 #include #include #include diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_stub.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_stub.cc index 07f81506dd82b..509b637c2cf11 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_stub.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/biglake/v1/metastore.proto #include "google/cloud/bigquery/biglake/v1/internal/metastore_stub.h" +#include "google/cloud/bigquery/biglake/v1/metastore.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_stub.h b/google/cloud/bigquery/biglake/v1/internal/metastore_stub.h index 5814b1b7a0513..ac992360b527d 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_stub.h +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGLAKE_V1_INTERNAL_METASTORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGLAKE_V1_INTERNAL_METASTORE_STUB_H +#include "google/cloud/bigquery/biglake/v1/metastore.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_stub_factory.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_stub_factory.cc index 49c09175ac5cc..f29aef996ad5f 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_stub_factory.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/bigquery/biglake/v1/internal/metastore_metadata_decorator.h" #include "google/cloud/bigquery/biglake/v1/internal/metastore_stub.h" #include "google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.h" +#include "google/cloud/bigquery/biglake/v1/metastore.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 #include #include diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc index cbd27bd3de629..489eab0fcac8d 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_biglake_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetastoreServiceTracingConnection::MetastoreServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -180,16 +178,12 @@ MetastoreServiceTracingConnection::ListTables( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetastoreServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.h b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.h index bba0c07a2a350..60c1b478f06ec 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.h +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_biglake_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetastoreServiceTracingConnection : public bigquery_biglake_v1::MetastoreServiceConnection { public: @@ -103,8 +101,6 @@ class MetastoreServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.cc index cd6918c3b4adf..ccfe4fffd5da7 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_biglake_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetastoreServiceTracingStub::MetastoreServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -215,15 +213,9 @@ MetastoreServiceTracingStub::ListTables( child_->ListTables(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetastoreServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.h b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.h index fa7cc6db3ad74..300b9f2f68943 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.h +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_biglake_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetastoreServiceTracingStub : public MetastoreServiceStub { public: ~MetastoreServiceTracingStub() override = default; @@ -121,8 +119,6 @@ class MetastoreServiceTracingStub : public MetastoreServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/biglake/v1/metastore_connection.h b/google/cloud/bigquery/biglake/v1/metastore_connection.h index acf97201beea7..d3b2b2fb07547 100644 --- a/google/cloud/bigquery/biglake/v1/metastore_connection.h +++ b/google/cloud/bigquery/biglake/v1/metastore_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGLAKE_V1_METASTORE_CONNECTION_H #include "google/cloud/bigquery/biglake/v1/internal/metastore_retry_traits.h" +#include "google/cloud/bigquery/biglake/v1/metastore.pb.h" #include "google/cloud/bigquery/biglake/v1/metastore_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/biglake/v1/metastore_connection_idempotency_policy.h b/google/cloud/bigquery/biglake/v1/metastore_connection_idempotency_policy.h index 07a3e2484e814..7845dfca91250 100644 --- a/google/cloud/bigquery/biglake/v1/metastore_connection_idempotency_policy.h +++ b/google/cloud/bigquery/biglake/v1/metastore_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGLAKE_V1_METASTORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGLAKE_V1_METASTORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/biglake/v1/metastore.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/connection/v1/connection_connection.h b/google/cloud/bigquery/connection/v1/connection_connection.h index cacdee9d8391c..aec88ed03c5f1 100644 --- a/google/cloud/bigquery/connection/v1/connection_connection.h +++ b/google/cloud/bigquery/connection/v1/connection_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_V1_CONNECTION_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_V1_CONNECTION_CONNECTION_H +#include "google/cloud/bigquery/connection/v1/connection.pb.h" #include "google/cloud/bigquery/connection/v1/connection_connection_idempotency_policy.h" #include "google/cloud/bigquery/connection/v1/internal/connection_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/connection/v1/connection_connection_idempotency_policy.h b/google/cloud/bigquery/connection/v1/connection_connection_idempotency_policy.h index b540df89661eb..2fc00302485a6 100644 --- a/google/cloud/bigquery/connection/v1/connection_connection_idempotency_policy.h +++ b/google/cloud/bigquery/connection/v1/connection_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_V1_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_V1_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/connection/v1/connection.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/connection/v1/internal/connection_auth_decorator.cc b/google/cloud/bigquery/connection/v1/internal/connection_auth_decorator.cc index c1bcdf88a1a33..4d5fc24bbf969 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_auth_decorator.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/connection/v1/connection.proto #include "google/cloud/bigquery/connection/v1/internal/connection_auth_decorator.h" -#include +#include "google/cloud/bigquery/connection/v1/connection.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/connection/v1/internal/connection_logging_decorator.cc b/google/cloud/bigquery/connection/v1/internal/connection_logging_decorator.cc index 5f2fe324473d5..24a6c8f2022be 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_logging_decorator.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/connection/v1/connection.proto #include "google/cloud/bigquery/connection/v1/internal/connection_logging_decorator.h" +#include "google/cloud/bigquery/connection/v1/connection.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/connection/v1/internal/connection_metadata_decorator.cc b/google/cloud/bigquery/connection/v1/internal/connection_metadata_decorator.cc index 0e4fe466fe728..c43f920c03c72 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_metadata_decorator.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/connection/v1/connection.proto #include "google/cloud/bigquery/connection/v1/internal/connection_metadata_decorator.h" +#include "google/cloud/bigquery/connection/v1/connection.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 #include #include #include diff --git a/google/cloud/bigquery/connection/v1/internal/connection_stub.cc b/google/cloud/bigquery/connection/v1/internal/connection_stub.cc index be06b6cade127..b047bed58f4d4 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_stub.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/connection/v1/connection.proto #include "google/cloud/bigquery/connection/v1/internal/connection_stub.h" +#include "google/cloud/bigquery/connection/v1/connection.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/connection/v1/internal/connection_stub.h b/google/cloud/bigquery/connection/v1/internal/connection_stub.h index 75f9c02c1dcd3..4fe94b60224a3 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_stub.h +++ b/google/cloud/bigquery/connection/v1/internal/connection_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_V1_INTERNAL_CONNECTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_V1_INTERNAL_CONNECTION_STUB_H +#include "google/cloud/bigquery/connection/v1/connection.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/connection/v1/internal/connection_stub_factory.cc b/google/cloud/bigquery/connection/v1/internal/connection_stub_factory.cc index bc6b52f89f079..c7cb9c96ff9a3 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_stub_factory.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/bigquery/connection/v1/connection.proto #include "google/cloud/bigquery/connection/v1/internal/connection_stub_factory.h" +#include "google/cloud/bigquery/connection/v1/connection.grpc.pb.h" #include "google/cloud/bigquery/connection/v1/internal/connection_auth_decorator.h" #include "google/cloud/bigquery/connection/v1/internal/connection_logging_decorator.h" #include "google/cloud/bigquery/connection/v1/internal/connection_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc b/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc index 965a68ca8e48b..acce93c68805d 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_connection_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConnectionServiceTracingConnection::ConnectionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -112,17 +110,13 @@ ConnectionServiceTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConnectionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.h b/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.h index 98501492107d4..1a747a000ebcc 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.h +++ b/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_connection_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConnectionServiceTracingConnection : public bigquery_connection_v1::ConnectionServiceConnection { public: @@ -77,8 +75,6 @@ class ConnectionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.cc b/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.cc index 3534c059d3e29..0a7cb83af6207 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_connection_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConnectionServiceTracingStub::ConnectionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -135,15 +133,9 @@ ConnectionServiceTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConnectionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.h b/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.h index 79215354bf4fb..74ea677121aa4 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.h +++ b/google/cloud/bigquery/connection/v1/internal/connection_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_connection_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConnectionServiceTracingStub : public ConnectionServiceStub { public: ~ConnectionServiceTracingStub() override = default; @@ -85,8 +83,6 @@ class ConnectionServiceTracingStub : public ConnectionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/datapolicies/v1/data_policy_connection.h b/google/cloud/bigquery/datapolicies/v1/data_policy_connection.h index 8adcf71c164fc..80df8989be529 100644 --- a/google/cloud/bigquery/datapolicies/v1/data_policy_connection.h +++ b/google/cloud/bigquery/datapolicies/v1/data_policy_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V1_DATA_POLICY_CONNECTION_H #include "google/cloud/bigquery/datapolicies/v1/data_policy_connection_idempotency_policy.h" +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.pb.h" #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/datapolicies/v1/data_policy_connection_idempotency_policy.h b/google/cloud/bigquery/datapolicies/v1/data_policy_connection_idempotency_policy.h index a6fbcd5d8265e..56ebe43a63d41 100644 --- a/google/cloud/bigquery/datapolicies/v1/data_policy_connection_idempotency_policy.h +++ b/google/cloud/bigquery/datapolicies/v1/data_policy_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V1_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V1_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_auth_decorator.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_auth_decorator.cc index 50dc6ba1f08c1..90362862e9288 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_auth_decorator.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_auth_decorator.h" -#include +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_logging_decorator.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_logging_decorator.cc index 6e5138ae2e73d..7262ea4841d3b 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_logging_decorator.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_logging_decorator.h" +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_metadata_decorator.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_metadata_decorator.cc index 4d1e06b35dfc0..799d10d2bf4e7 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_metadata_decorator.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_metadata_decorator.h" +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.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 #include #include #include diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.cc index 32358b412489a..f5b20180b66cf 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.h" +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.h b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.h index 63b9ac3e16d86..296fa353206a4 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.h +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V1_INTERNAL_DATA_POLICY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V1_INTERNAL_DATA_POLICY_STUB_H +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub_factory.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub_factory.cc index 764d3db6c5a99..d82c813d1ee54 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub_factory.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_stub_factory.h" +#include "google/cloud/bigquery/datapolicies/v1/datapolicy.grpc.pb.h" #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_auth_decorator.h" #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_logging_decorator.h" #include "google/cloud/bigquery/datapolicies/v1/internal/data_policy_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc index ad8523acd87af..948698e1755c7 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_datapolicies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataPolicyServiceTracingConnection::DataPolicyServiceTracingConnection( std::shared_ptr child) @@ -129,18 +127,14 @@ DataPolicyServiceTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataPolicyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.h b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.h index a1cdb888235ba..f1ae5cbd48950 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.h +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_datapolicies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataPolicyServiceTracingConnection : public bigquery_datapolicies_v1::DataPolicyServiceConnection { public: @@ -82,8 +80,6 @@ class DataPolicyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.cc index 1e22d096d825d..4376009096ef5 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_datapolicies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataPolicyServiceTracingStub::DataPolicyServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -152,15 +150,9 @@ DataPolicyServiceTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataPolicyServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.h b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.h index 51420c60caa2f..8185ee046cc5f 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.h +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_datapolicies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataPolicyServiceTracingStub : public DataPolicyServiceStub { public: ~DataPolicyServiceTracingStub() override = default; @@ -91,8 +89,6 @@ class DataPolicyServiceTracingStub : public DataPolicyServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/datapolicies/v2/data_policy_connection.h b/google/cloud/bigquery/datapolicies/v2/data_policy_connection.h index 36c84f6c985df..8bb8278a072d5 100644 --- a/google/cloud/bigquery/datapolicies/v2/data_policy_connection.h +++ b/google/cloud/bigquery/datapolicies/v2/data_policy_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V2_DATA_POLICY_CONNECTION_H #include "google/cloud/bigquery/datapolicies/v2/data_policy_connection_idempotency_policy.h" +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.pb.h" #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/datapolicies/v2/data_policy_connection_idempotency_policy.h b/google/cloud/bigquery/datapolicies/v2/data_policy_connection_idempotency_policy.h index 9e648dd3d5a6e..395993851ef5e 100644 --- a/google/cloud/bigquery/datapolicies/v2/data_policy_connection_idempotency_policy.h +++ b/google/cloud/bigquery/datapolicies/v2/data_policy_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V2_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V2_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_auth_decorator.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_auth_decorator.cc index 33a250804a110..6de71ed0e61be 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_auth_decorator.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/datapolicies/v2/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_auth_decorator.h" -#include +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_logging_decorator.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_logging_decorator.cc index f5129338a6d57..cfec024bd42ec 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_logging_decorator.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/datapolicies/v2/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_logging_decorator.h" +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_metadata_decorator.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_metadata_decorator.cc index 66f464aaa36cd..e6ac01eae2584 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_metadata_decorator.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/datapolicies/v2/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_metadata_decorator.h" +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.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 #include #include #include diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.cc index ce790d235ad8c..ad1bdc40cd96c 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/datapolicies/v2/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.h" +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.h b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.h index b675f8b95a92b..bca082efc904b 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.h +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V2_INTERNAL_DATA_POLICY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATAPOLICIES_V2_INTERNAL_DATA_POLICY_STUB_H +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub_factory.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub_factory.cc index fd26c518a3c49..ef7e433a11154 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub_factory.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/bigquery/datapolicies/v2/datapolicy.proto #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_stub_factory.h" +#include "google/cloud/bigquery/datapolicies/v2/datapolicy.grpc.pb.h" #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_auth_decorator.h" #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_logging_decorator.h" #include "google/cloud/bigquery/datapolicies/v2/internal/data_policy_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.cc index 3d4568c2f6d62..0e876ff2064e5 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_datapolicies_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataPolicyServiceTracingConnection::DataPolicyServiceTracingConnection( std::shared_ptr child) @@ -138,18 +136,14 @@ DataPolicyServiceTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataPolicyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.h b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.h index d24847c78080b..bef38050ad267 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.h +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_datapolicies_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataPolicyServiceTracingConnection : public bigquery_datapolicies_v2::DataPolicyServiceConnection { public: @@ -86,8 +84,6 @@ class DataPolicyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.cc b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.cc index 4dc26ef7a8ce3..922ac473c06d8 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.cc +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_datapolicies_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataPolicyServiceTracingStub::DataPolicyServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -165,15 +163,9 @@ DataPolicyServiceTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataPolicyServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.h b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.h index b161efd496c37..024709ff502be 100644 --- a/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.h +++ b/google/cloud/bigquery/datapolicies/v2/internal/data_policy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_datapolicies_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataPolicyServiceTracingStub : public DataPolicyServiceStub { public: ~DataPolicyServiceTracingStub() override = default; @@ -96,8 +94,6 @@ class DataPolicyServiceTracingStub : public DataPolicyServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h index 6ace2eafbbd60..fc2ea8dba1bb9 100644 --- a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h +++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_H #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h" +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.pb.h" #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h index 6264d14802dd7..c954b16516d07 100644 --- a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h +++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc index 80f1228b847fe..df608a2dce3b9 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h" -#include +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc index 2990548cad3da..3823c96c1cf37 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h" +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc index 86f97235fd5dd..b9f69c22ee6fa 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h" +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.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 #include #include #include diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc index 97ff410cf160a..f4257a40da268 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h" +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h index e5a05f61be1e5..5c33807e9fc71 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_H +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc index 9b7f2a0858651..528b34910307c 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc @@ -17,19 +17,19 @@ // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.h" +#include "google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h" #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h" #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h" #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h" #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h" #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include #include #include diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc index af3bd81d0053a..3c922f6e5032e 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_datatransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataTransferServiceTracingConnection::DataTransferServiceTracingConnection( std::shared_ptr child) @@ -238,18 +236,14 @@ DataTransferServiceTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataTransferServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h index d9841e928c3e2..6bb9ffdc7cb83 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_datatransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataTransferServiceTracingConnection : public bigquery_datatransfer_v1::DataTransferServiceConnection { public: @@ -126,8 +124,6 @@ class DataTransferServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc index 41b65665dc9a0..0f6ec4a2461cc 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_datatransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataTransferServiceTracingStub::DataTransferServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -281,15 +279,9 @@ DataTransferServiceTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataTransferServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h index 6bc13abef5ea1..d268576f22eb8 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_datatransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataTransferServiceTracingStub : public DataTransferServiceStub { public: ~DataTransferServiceTracingStub() override = default; @@ -143,8 +141,6 @@ class DataTransferServiceTracingStub : public DataTransferServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/migration/v2/internal/migration_auth_decorator.cc b/google/cloud/bigquery/migration/v2/internal/migration_auth_decorator.cc index ddd62d5b802ff..5412a27fb7344 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_auth_decorator.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/migration/v2/migration_service.proto #include "google/cloud/bigquery/migration/v2/internal/migration_auth_decorator.h" -#include +#include "google/cloud/bigquery/migration/v2/migration_service.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/migration/v2/internal/migration_logging_decorator.cc b/google/cloud/bigquery/migration/v2/internal/migration_logging_decorator.cc index f1fc9f93af503..263ee2311f26d 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_logging_decorator.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/migration/v2/migration_service.proto #include "google/cloud/bigquery/migration/v2/internal/migration_logging_decorator.h" +#include "google/cloud/bigquery/migration/v2/migration_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/migration/v2/internal/migration_metadata_decorator.cc b/google/cloud/bigquery/migration/v2/internal/migration_metadata_decorator.cc index c05180f27eaea..d834b3b5c7062 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_metadata_decorator.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/migration/v2/migration_service.proto #include "google/cloud/bigquery/migration/v2/internal/migration_metadata_decorator.h" +#include "google/cloud/bigquery/migration/v2/migration_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 #include #include #include diff --git a/google/cloud/bigquery/migration/v2/internal/migration_stub.cc b/google/cloud/bigquery/migration/v2/internal/migration_stub.cc index 0c3684f4ba572..8e8b7a0e99a37 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_stub.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/migration/v2/migration_service.proto #include "google/cloud/bigquery/migration/v2/internal/migration_stub.h" +#include "google/cloud/bigquery/migration/v2/migration_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/migration/v2/internal/migration_stub.h b/google/cloud/bigquery/migration/v2/internal/migration_stub.h index 7ed2ae0b5b3fb..5c1e68d7f2f97 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_stub.h +++ b/google/cloud/bigquery/migration/v2/internal/migration_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_V2_INTERNAL_MIGRATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_V2_INTERNAL_MIGRATION_STUB_H +#include "google/cloud/bigquery/migration/v2/migration_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/migration/v2/internal/migration_stub_factory.cc b/google/cloud/bigquery/migration/v2/internal/migration_stub_factory.cc index b13e2252d720f..f51d98e88e5a4 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_stub_factory.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/bigquery/migration/v2/internal/migration_metadata_decorator.h" #include "google/cloud/bigquery/migration/v2/internal/migration_stub.h" #include "google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.h" +#include "google/cloud/bigquery/migration/v2/migration_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 #include #include diff --git a/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc b/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc index 4e55e7c0c5dbc..cf548f76d6eab 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_migration_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MigrationServiceTracingConnection::MigrationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -113,16 +111,12 @@ MigrationServiceTracingConnection::ListMigrationSubtasks( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMigrationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.h b/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.h index 7be577d96a75e..87341d497d365 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.h +++ b/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_migration_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MigrationServiceTracingConnection : public bigquery_migration_v2::MigrationServiceConnection { public: @@ -77,8 +75,6 @@ class MigrationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.cc b/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.cc index b58a5988764a9..07f9573b02e57 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_migration_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MigrationServiceTracingStub::MigrationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -132,15 +130,9 @@ MigrationServiceTracingStub::ListMigrationSubtasks( context, *span, child_->ListMigrationSubtasks(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMigrationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.h b/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.h index 57509f94cb653..b6de22be79380 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.h +++ b/google/cloud/bigquery/migration/v2/internal/migration_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_migration_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MigrationServiceTracingStub : public MigrationServiceStub { public: ~MigrationServiceTracingStub() override = default; @@ -87,8 +85,6 @@ class MigrationServiceTracingStub : public MigrationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/migration/v2/migration_connection.h b/google/cloud/bigquery/migration/v2/migration_connection.h index 773edbb66cbef..4390b09be7413 100644 --- a/google/cloud/bigquery/migration/v2/migration_connection.h +++ b/google/cloud/bigquery/migration/v2/migration_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/bigquery/migration/v2/internal/migration_retry_traits.h" #include "google/cloud/bigquery/migration/v2/migration_connection_idempotency_policy.h" +#include "google/cloud/bigquery/migration/v2/migration_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/migration/v2/migration_connection_idempotency_policy.h b/google/cloud/bigquery/migration/v2/migration_connection_idempotency_policy.h index 3fcf7dc68be0b..a1073a8500d62 100644 --- a/google/cloud/bigquery/migration/v2/migration_connection_idempotency_policy.h +++ b/google/cloud/bigquery/migration/v2/migration_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_V2_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_V2_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/migration/v2/migration_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/quickstart/.bazelrc b/google/cloud/bigquery/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/bigquery/quickstart/.bazelrc +++ b/google/cloud/bigquery/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc index a28e523bbf4a7..4a6835c5b37bc 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/reservation/v1/reservation.proto #include "google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h" -#include +#include "google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc index 3a14eab21e1c4..4b2e51ec4ef36 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/reservation/v1/reservation.proto #include "google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h" +#include "google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc index cacd0d1e4406a..cfea8681cb2dc 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/reservation/v1/reservation.proto #include "google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h" +#include "google/cloud/bigquery/reservation/v1/reservation.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 #include #include #include diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc index 36d3319806399..f44a3883b1934 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/reservation/v1/reservation.proto #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h" +#include "google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h index 7dbce9a91437b..c4d64342d149c 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_H +#include "google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc index e8c82beca748c..c45e9363b5656 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h" #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h" #include "google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h" +#include "google/cloud/bigquery/reservation/v1/reservation.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 #include #include diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc index 3b2968ba3ff22..4ce33751bd24c 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_reservation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReservationServiceTracingConnection::ReservationServiceTracingConnection( std::shared_ptr child) @@ -358,18 +356,14 @@ ReservationServiceTracingConnection::ListReservationGroups( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReservationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h index b0ab19d7d8299..e9d7b93f7836f 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_reservation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReservationServiceTracingConnection : public bigquery_reservation_v1::ReservationServiceConnection { public: @@ -177,8 +175,6 @@ class ReservationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc index 989b27bc87394..f341163ec4661 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_reservation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReservationServiceTracingStub::ReservationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -440,15 +438,9 @@ ReservationServiceTracingStub::ListReservationGroups( context, *span, child_->ListReservationGroups(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReservationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h index f3f9c4add5294..3e51d0cb6d1f3 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_reservation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReservationServiceTracingStub : public ReservationServiceStub { public: ~ReservationServiceTracingStub() override = default; @@ -208,8 +206,6 @@ class ReservationServiceTracingStub : public ReservationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/reservation/v1/reservation_connection.h b/google/cloud/bigquery/reservation/v1/reservation_connection.h index c991697567aa0..8b2c65250b12d 100644 --- a/google/cloud/bigquery/reservation/v1/reservation_connection.h +++ b/google/cloud/bigquery/reservation/v1/reservation_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_H #include "google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h" +#include "google/cloud/bigquery/reservation/v1/reservation.pb.h" #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h b/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h index c297d7838f1d1..247843fbf9ba0 100644 --- a/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h +++ b/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/retry_traits.h b/google/cloud/bigquery/retry_traits.h deleted file mode 100644 index 9227228d0295b..0000000000000 --- a/google/cloud/bigquery/retry_traits.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RETRY_TRAITS_H - -#include "google/cloud/bigquery/internal/bigquery_read_retry_traits.h" -#warning "This header is deprecated, it only provided internal symbols." - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RETRY_TRAITS_H diff --git a/google/cloud/bigquery/storage/v1/bigquery_read_connection.h b/google/cloud/bigquery/storage/v1/bigquery_read_connection.h index 63a7245212169..421d59cc488ff 100644 --- a/google/cloud/bigquery/storage/v1/bigquery_read_connection.h +++ b/google/cloud/bigquery/storage/v1/bigquery_read_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/bigquery/storage/v1/bigquery_read_connection_idempotency_policy.h" #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_retry_traits.h" +#include "google/cloud/bigquery/storage/v1/storage.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/storage/v1/bigquery_read_connection_idempotency_policy.h b/google/cloud/bigquery/storage/v1/bigquery_read_connection_idempotency_policy.h index 7cec89d74c419..27a10651b9d4d 100644 --- a/google/cloud/bigquery/storage/v1/bigquery_read_connection_idempotency_policy.h +++ b/google/cloud/bigquery/storage/v1/bigquery_read_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_BIGQUERY_READ_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_BIGQUERY_READ_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/storage/v1/bigquery_write_connection.h b/google/cloud/bigquery/storage/v1/bigquery_write_connection.h index a2dd1c8ee5550..b57ef42c860d8 100644 --- a/google/cloud/bigquery/storage/v1/bigquery_write_connection.h +++ b/google/cloud/bigquery/storage/v1/bigquery_write_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/bigquery/storage/v1/bigquery_write_connection_idempotency_policy.h" #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_retry_traits.h" +#include "google/cloud/bigquery/storage/v1/storage.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/storage/v1/bigquery_write_connection_idempotency_policy.h b/google/cloud/bigquery/storage/v1/bigquery_write_connection_idempotency_policy.h index ffe761930a202..28bc808ecfbfe 100644 --- a/google/cloud/bigquery/storage/v1/bigquery_write_connection_idempotency_policy.h +++ b/google/cloud/bigquery/storage/v1/bigquery_write_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_BIGQUERY_WRITE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_BIGQUERY_WRITE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_auth_decorator.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_auth_decorator.cc index 54aa8bb5d8dfb..d74a2d17397cb 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_auth_decorator.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_auth_decorator.h" -#include +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_logging_decorator.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_logging_decorator.cc index 835919702d256..a7211ac94f64e 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_logging_decorator.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_logging_decorator.h" +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.cc index 0e46204115544..4018672e6ac34 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.h" +#include "google/cloud/bigquery/storage/v1/storage.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 #include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.cc index 23bf8641f0ab1..dce81254d0236 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.h" +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.h b/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.h index c20709cbc33b5..0b60576905138 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.h +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_INTERNAL_BIGQUERY_READ_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_INTERNAL_BIGQUERY_READ_STUB_H +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub_factory.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub_factory.cc index bf7847fb6e7ca..a924a08fac15e 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub_factory.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.h" #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.h" #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.h" +#include "google/cloud/bigquery/storage/v1/storage.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 #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc index 302d0ef2712d4..a7ca606689595 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigQueryReadTracingConnection::BigQueryReadTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -64,16 +62,12 @@ BigQueryReadTracingConnection::SplitReadStream( return internal::EndSpan(*span, child_->SplitReadStream(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigQueryReadTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.h b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.h index 0a7afdee44576..abfc7ad755f3b 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.h +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigQueryReadTracingConnection : public bigquery_storage_v1::BigQueryReadConnection { public: @@ -57,8 +55,6 @@ class BigQueryReadTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.cc index 9436b3e167b93..8a3590ac81c11 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigQueryReadTracingStub::BigQueryReadTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -74,15 +72,9 @@ BigQueryReadTracingStub::SplitReadStream( child_->SplitReadStream(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigQueryReadTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.h b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.h index 31a2a3a952990..782d09c25f355 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.h +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigQueryReadTracingStub : public BigQueryReadStub { public: ~BigQueryReadTracingStub() override = default; @@ -61,8 +59,6 @@ class BigQueryReadTracingStub : public BigQueryReadStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_auth_decorator.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_auth_decorator.cc index 24008ae17fd3c..cbdaead5cef49 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_auth_decorator.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_auth_decorator.h" +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_logging_decorator.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_logging_decorator.cc index 49c725a73f5cd..6484bdd284aa4 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_logging_decorator.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_logging_decorator.h" +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_metadata_decorator.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_metadata_decorator.cc index 9af03b2621968..5591e93dbdb5d 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_metadata_decorator.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_metadata_decorator.h" +#include "google/cloud/bigquery/storage/v1/storage.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 #include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.cc index 32af6d38ae95f..daa2323d8399f 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/bigquery/storage/v1/storage.proto #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.h" +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.h b/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.h index 3485b37155834..cd2816024dfd9 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.h +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_INTERNAL_BIGQUERY_WRITE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_STORAGE_V1_INTERNAL_BIGQUERY_WRITE_STUB_H +#include "google/cloud/bigquery/storage/v1/storage.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub_factory.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub_factory.cc index 3275d6d215e7c..42b5c7bf9ca2b 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub_factory.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_metadata_decorator.h" #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_stub.h" #include "google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.h" +#include "google/cloud/bigquery/storage/v1/storage.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 #include #include diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.cc index b915dff1b13ad..a98f0d4e2b83a 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigQueryWriteTracingConnection::BigQueryWriteTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -88,16 +86,12 @@ BigQueryWriteTracingConnection::FlushRows( return internal::EndSpan(*span, child_->FlushRows(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigQueryWriteTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.h b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.h index f7d1e33a6c10c..573062d21d765 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.h +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigQueryWriteTracingConnection : public bigquery_storage_v1::BigQueryWriteConnection { public: @@ -72,8 +70,6 @@ class BigQueryWriteTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc index 040fd4baff031..9f35c1cbac092 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigQueryWriteTracingStub::BigQueryWriteTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -116,15 +114,9 @@ BigQueryWriteTracingStub::FlushRows( child_->FlushRows(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigQueryWriteTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.h b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.h index 7a63a3faaac9a..82efd781ab69d 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.h +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigquery_storage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigQueryWriteTracingStub : public BigQueryWriteStub { public: ~BigQueryWriteTracingStub() override = default; @@ -79,8 +77,6 @@ class BigQueryWriteTracingStub : public BigQueryWriteStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel b/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel index 3ee10d0eed017..6dbb039fe44ea 100644 --- a/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel +++ b/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel @@ -33,7 +33,7 @@ cc_library( "//google/cloud/bigquery:google_cloud_cpp_bigquery_rest_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -50,8 +50,8 @@ cc_library( "//google/cloud/bigquery:google_cloud_cpp_bigquery_rest_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) for test in experimental_bigquery_rest_client_benchmark_unit_tests] diff --git a/google/cloud/bigquerycontrol/BUILD.bazel b/google/cloud/bigquerycontrol/BUILD.bazel index b14edb09ad7c2..812cb093dcca5 100644 --- a/google/cloud/bigquerycontrol/BUILD.bazel +++ b/google/cloud/bigquerycontrol/BUILD.bazel @@ -25,7 +25,7 @@ service_dirs = [ src_dirs = service_dirs + [d + "internal/" for d in service_dirs] googleapis_deps = [ - "@com_google_googleapis//google/cloud/bigquery/v2:bigquery_cc_proto", + "@googleapis//google/cloud/bigquery/v2:bigquery_cc_proto", ] cc_gapic_library( diff --git a/google/cloud/bigquerycontrol/quickstart/.bazelrc b/google/cloud/bigquerycontrol/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/bigquerycontrol/quickstart/.bazelrc +++ b/google/cloud/bigquerycontrol/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/bigquerycontrol/v2/dataset_connection.h b/google/cloud/bigquerycontrol/v2/dataset_connection.h index 0be5bdab45456..cd3b94b953285 100644 --- a/google/cloud/bigquerycontrol/v2/dataset_connection.h +++ b/google/cloud/bigquerycontrol/v2/dataset_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_DATASET_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_DATASET_CONNECTION_H +#include "google/cloud/bigquery/v2/dataset.pb.h" #include "google/cloud/bigquerycontrol/v2/dataset_connection_idempotency_policy.h" #include "google/cloud/bigquerycontrol/v2/internal/dataset_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/dataset_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/dataset_connection_idempotency_policy.h index 8164426b20c7e..af5a8fb6bde5a 100644 --- a/google/cloud/bigquerycontrol/v2/dataset_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/dataset_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_DATASET_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_DATASET_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/dataset.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_logging_decorator.h index be6d2cd75efc2..44f45eacff711 100644 --- a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_DATASET_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_DATASET_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/dataset.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_metadata_decorator.h index 48b20e28f89d1..da3b6686875aa 100644 --- a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_DATASET_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_DATASET_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/dataset.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc index fb48a231fdd16..866e39cd68bd1 100644 --- a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/dataset.proto #include "google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h" +#include "google/cloud/bigquery/v2/dataset.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h index db840d5c3a11c..1a1c2629619fd 100644 --- a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_DATASET_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_DATASET_REST_STUB_H +#include "google/cloud/bigquery/v2/dataset.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.cc index 87ecb9c487b9a..92e74db4bceae 100644 --- a/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatasetServiceTracingConnection::DatasetServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -98,16 +96,12 @@ DatasetServiceTracingConnection::UndeleteDataset( return internal::EndSpan(*span, child_->UndeleteDataset(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatasetServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.h index ebdc5cac1aa84..363d105f80caa 100644 --- a/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/dataset_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatasetServiceTracingConnection : public bigquerycontrol_v2::DatasetServiceConnection { public: @@ -69,8 +67,6 @@ class DatasetServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/internal/job_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/job_rest_logging_decorator.h index 1eba27bd9b1b4..4f211669d1cf8 100644 --- a/google/cloud/bigquerycontrol/v2/internal/job_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/job_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_JOB_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_JOB_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/job.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/job_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/job_rest_metadata_decorator.h index 0f4e68970e457..b4386102d45d9 100644 --- a/google/cloud/bigquerycontrol/v2/internal/job_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/job_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_JOB_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_JOB_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/job.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc index 2a468e833894e..31243f79d534b 100644 --- a/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/job.proto #include "google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h" +#include "google/cloud/bigquery/v2/job.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h index a6b24b0a50bec..cf99f90548137 100644 --- a/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_JOB_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_JOB_REST_STUB_H +#include "google/cloud/bigquery/v2/job.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.cc index 8a9e1763deee2..a3c4b317d13e6 100644 --- a/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobServiceTracingConnection::JobServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -97,16 +95,12 @@ JobServiceTracingConnection::Query( return internal::EndSpan(*span, child_->Query(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.h index ef7c3a0938506..64e4d7362e59a 100644 --- a/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobServiceTracingConnection : public bigquerycontrol_v2::JobServiceConnection { public: @@ -66,8 +64,6 @@ class JobServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/internal/model_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/model_rest_logging_decorator.h index 45a6739f5fb26..f9f3ee58221d3 100644 --- a/google/cloud/bigquerycontrol/v2/internal/model_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/model_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_MODEL_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_MODEL_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/model.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/model_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/model_rest_metadata_decorator.h index 276fcd27e64c0..b2b41a7754aa0 100644 --- a/google/cloud/bigquerycontrol/v2/internal/model_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/model_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_MODEL_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_MODEL_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/model.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc index b9026b7d2deab..383cd9d85f883 100644 --- a/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/model.proto #include "google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h" +#include "google/cloud/bigquery/v2/model.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h index 80c9500815477..7dc939094813d 100644 --- a/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_MODEL_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_MODEL_REST_STUB_H +#include "google/cloud/bigquery/v2/model.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.cc index 18abd8120a067..203fffb0273cd 100644 --- a/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelServiceTracingConnection::ModelServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -70,16 +68,12 @@ Status ModelServiceTracingConnection::DeleteModel( return internal::EndSpan(*span, child_->DeleteModel(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.h index c52362bb6f7f4..9cca8bd487294 100644 --- a/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/model_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelServiceTracingConnection : public bigquerycontrol_v2::ModelServiceConnection { public: @@ -56,8 +54,6 @@ class ModelServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/internal/project_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/project_rest_logging_decorator.h index b066836a55368..d5d545b4d0f1b 100644 --- a/google/cloud/bigquerycontrol/v2/internal/project_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/project_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_PROJECT_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_PROJECT_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/project.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/project_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/project_rest_metadata_decorator.h index 1a56cf3da9a90..a56693988e4d5 100644 --- a/google/cloud/bigquerycontrol/v2/internal/project_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/project_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_PROJECT_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_PROJECT_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/project.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.cc index 4f6d6d9ef4b37..38e8b848adf00 100644 --- a/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/project.proto #include "google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h" +#include "google/cloud/bigquery/v2/project.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h index 4d5f357cd33d8..d3c67125bfc51 100644 --- a/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/project_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_PROJECT_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_PROJECT_REST_STUB_H +#include "google/cloud/bigquery/v2/project.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.cc index 113332042cd56..9d5a4c9dc7bcb 100644 --- a/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProjectServiceTracingConnection::ProjectServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -41,16 +39,12 @@ ProjectServiceTracingConnection::GetServiceAccount( return internal::EndSpan(*span, child_->GetServiceAccount(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProjectServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.h index 67da6620f2447..4e6262695b724 100644 --- a/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/project_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProjectServiceTracingConnection : public bigquerycontrol_v2::ProjectServiceConnection { public: @@ -48,8 +46,6 @@ class ProjectServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/routine_rest_logging_decorator.h index 525ea79ca371e..523d7df91b6fc 100644 --- a/google/cloud/bigquerycontrol/v2/internal/routine_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/routine_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROUTINE_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROUTINE_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/routine.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/routine_rest_metadata_decorator.h index 10e66ff1765e5..7a4f3e10421aa 100644 --- a/google/cloud/bigquerycontrol/v2/internal/routine_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/routine_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROUTINE_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROUTINE_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/routine.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc index 72352c8e1321f..8f5712807217d 100644 --- a/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/routine.proto #include "google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h" +#include "google/cloud/bigquery/v2/routine.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h index 603ef30e5baf9..0570acb5a4ae8 100644 --- a/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROUTINE_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROUTINE_REST_STUB_H +#include "google/cloud/bigquery/v2/routine.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.cc index f99fd3f60fa89..2473ccfcf97b7 100644 --- a/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RoutineServiceTracingConnection::RoutineServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -76,16 +74,12 @@ RoutineServiceTracingConnection::ListRoutines( return internal::EndSpan(*span, child_->ListRoutines(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRoutineServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.h index ba86a141ce091..43f00c2826ecb 100644 --- a/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/routine_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RoutineServiceTracingConnection : public bigquerycontrol_v2::RoutineServiceConnection { public: @@ -61,8 +59,6 @@ class RoutineServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_logging_decorator.h index b54b416e26704..3dda5aca0f7eb 100644 --- a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROW_ACCESS_POLICY_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROW_ACCESS_POLICY_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/row_access_policy.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_metadata_decorator.h index 4b86362152ce0..3368a245ddc92 100644 --- a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROW_ACCESS_POLICY_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROW_ACCESS_POLICY_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/row_access_policy.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.cc index ded2701fced02..8079bbcec2327 100644 --- a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/row_access_policy.proto #include "google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h" +#include "google/cloud/bigquery/v2/row_access_policy.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h index 0dddc899a6749..789d7518c1835 100644 --- a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROW_ACCESS_POLICY_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_ROW_ACCESS_POLICY_REST_STUB_H +#include "google/cloud/bigquery/v2/row_access_policy.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.cc index 1cf3f5f289106..03ea8c5c150ae 100644 --- a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RowAccessPolicyServiceTracingConnection:: RowAccessPolicyServiceTracingConnection( std::shared_ptr @@ -98,18 +96,14 @@ Status RowAccessPolicyServiceTracingConnection::BatchDeleteRowAccessPolicies( child_->BatchDeleteRowAccessPolicies(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRowAccessPolicyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.h index 8d626efb1d3f1..d806aac91c459 100644 --- a/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/row_access_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RowAccessPolicyServiceTracingConnection : public bigquerycontrol_v2::RowAccessPolicyServiceConnection { public: @@ -70,8 +68,6 @@ class RowAccessPolicyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/internal/table_rest_logging_decorator.h b/google/cloud/bigquerycontrol/v2/internal/table_rest_logging_decorator.h index 7b184514edb2e..71aa94654097d 100644 --- a/google/cloud/bigquerycontrol/v2/internal/table_rest_logging_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/table_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_TABLE_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_TABLE_REST_LOGGING_DECORATOR_H +#include "google/cloud/bigquery/v2/table.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/table_rest_metadata_decorator.h b/google/cloud/bigquerycontrol/v2/internal/table_rest_metadata_decorator.h index 9a211d82c37aa..0f65a512be563 100644 --- a/google/cloud/bigquerycontrol/v2/internal/table_rest_metadata_decorator.h +++ b/google/cloud/bigquerycontrol/v2/internal/table_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_TABLE_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_TABLE_REST_METADATA_DECORATOR_H +#include "google/cloud/bigquery/v2/table.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc index 1651c276dfcd1..85d0fdeb60f9b 100644 --- a/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc +++ b/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/bigquery/v2/table.proto #include "google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h" +#include "google/cloud/bigquery/v2/table.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h b/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h index 96418d11764f1..1261b7c246a9f 100644 --- a/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h +++ b/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_TABLE_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_INTERNAL_TABLE_REST_STUB_H +#include "google/cloud/bigquery/v2/table.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.cc b/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.cc index 18013c77ed2d7..4d488cff65d25 100644 --- a/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.cc +++ b/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TableServiceTracingConnection::TableServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -89,16 +87,12 @@ TableServiceTracingConnection::ListTables( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTableServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.h b/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.h index 6c1402e4ec595..91fa030e7bedd 100644 --- a/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.h +++ b/google/cloud/bigquerycontrol/v2/internal/table_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigquerycontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TableServiceTracingConnection : public bigquerycontrol_v2::TableServiceConnection { public: @@ -64,8 +62,6 @@ class TableServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigquerycontrol/v2/job_connection.h b/google/cloud/bigquerycontrol/v2/job_connection.h index df5c6f314ae42..9fd0248aa1df1 100644 --- a/google/cloud/bigquerycontrol/v2/job_connection.h +++ b/google/cloud/bigquerycontrol/v2/job_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_JOB_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_JOB_CONNECTION_H +#include "google/cloud/bigquery/v2/job.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/job_retry_traits.h" #include "google/cloud/bigquerycontrol/v2/job_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/job_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/job_connection_idempotency_policy.h index da0e540de1446..d16aed54efac7 100644 --- a/google/cloud/bigquerycontrol/v2/job_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/job_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_JOB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_JOB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/job.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/model_connection.h b/google/cloud/bigquerycontrol/v2/model_connection.h index d005e455f1e78..673034c579ecc 100644 --- a/google/cloud/bigquerycontrol/v2/model_connection.h +++ b/google/cloud/bigquerycontrol/v2/model_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_MODEL_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_MODEL_CONNECTION_H +#include "google/cloud/bigquery/v2/model.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/model_retry_traits.h" #include "google/cloud/bigquerycontrol/v2/model_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/model_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/model_connection_idempotency_policy.h index 671763178a993..ec387f7302243 100644 --- a/google/cloud/bigquerycontrol/v2/model_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/model_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_MODEL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_MODEL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/model.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/project_connection.h b/google/cloud/bigquerycontrol/v2/project_connection.h index 072718c4f216a..f22264e9b3707 100644 --- a/google/cloud/bigquerycontrol/v2/project_connection.h +++ b/google/cloud/bigquerycontrol/v2/project_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_PROJECT_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_PROJECT_CONNECTION_H +#include "google/cloud/bigquery/v2/project.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/project_retry_traits.h" #include "google/cloud/bigquerycontrol/v2/project_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/project_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/project_connection_idempotency_policy.h index b0a3371366648..15b635e0f0d4f 100644 --- a/google/cloud/bigquerycontrol/v2/project_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/project_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_PROJECT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_PROJECT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/project.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/routine_connection.h b/google/cloud/bigquerycontrol/v2/routine_connection.h index a262a224cfebb..792be56081bab 100644 --- a/google/cloud/bigquerycontrol/v2/routine_connection.h +++ b/google/cloud/bigquerycontrol/v2/routine_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROUTINE_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROUTINE_CONNECTION_H +#include "google/cloud/bigquery/v2/routine.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/routine_retry_traits.h" #include "google/cloud/bigquerycontrol/v2/routine_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/routine_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/routine_connection_idempotency_policy.h index b4a25430c6671..32c119d2dff5a 100644 --- a/google/cloud/bigquerycontrol/v2/routine_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/routine_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROUTINE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROUTINE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/routine.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/row_access_policy_connection.h b/google/cloud/bigquerycontrol/v2/row_access_policy_connection.h index 2dab3bdbe6b6d..540cbfe560dc2 100644 --- a/google/cloud/bigquerycontrol/v2/row_access_policy_connection.h +++ b/google/cloud/bigquerycontrol/v2/row_access_policy_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROW_ACCESS_POLICY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROW_ACCESS_POLICY_CONNECTION_H +#include "google/cloud/bigquery/v2/row_access_policy.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/row_access_policy_retry_traits.h" #include "google/cloud/bigquerycontrol/v2/row_access_policy_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/row_access_policy_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/row_access_policy_connection_idempotency_policy.h index 0b603e9044c88..7b6c3d8dac4c0 100644 --- a/google/cloud/bigquerycontrol/v2/row_access_policy_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/row_access_policy_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROW_ACCESS_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_ROW_ACCESS_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/row_access_policy.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/table_connection.h b/google/cloud/bigquerycontrol/v2/table_connection.h index b8b740ef8e3ef..c62d549441d1d 100644 --- a/google/cloud/bigquerycontrol/v2/table_connection.h +++ b/google/cloud/bigquerycontrol/v2/table_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_TABLE_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_TABLE_CONNECTION_H +#include "google/cloud/bigquery/v2/table.pb.h" #include "google/cloud/bigquerycontrol/v2/internal/table_retry_traits.h" #include "google/cloud/bigquerycontrol/v2/table_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigquerycontrol/v2/table_connection_idempotency_policy.h b/google/cloud/bigquerycontrol/v2/table_connection_idempotency_policy.h index c69ace1733ec6..e1bf6ec1ddef5 100644 --- a/google/cloud/bigquerycontrol/v2/table_connection_idempotency_policy.h +++ b/google/cloud/bigquerycontrol/v2/table_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_TABLE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERYCONTROL_V2_TABLE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/bigquery/v2/table.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/bigtable/BUILD.bazel b/google/cloud/bigtable/BUILD.bazel index b48840d42db4d..28fc70cb2dcf0 100644 --- a/google/cloud/bigtable/BUILD.bazel +++ b/google/cloud/bigtable/BUILD.bazel @@ -54,19 +54,19 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_google_absl//absl/strings:str_format", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", - "@com_google_googleapis//google/rpc:error_details_cc_proto", - "@com_github_google_crc32c//:crc32c", - "@com_google_absl//absl/strings:cord", - "@com_github_grpc_grpc//:grpc++", + "@abseil-cpp//absl/strings:str_format", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googleapis//google/longrunning:longrunning_cc_grpc", + "@googleapis//google/rpc:error_details_cc_proto", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/crc:crc32c", + "@grpc//:grpc++", ] + select({ ":metrics_enabled": [ "//:opentelemetry", - "@io_opentelemetry_cpp//api", - "@io_opentelemetry_cpp//sdk/src/metrics", + "@opentelemetry-cpp//api", + "@opentelemetry-cpp//sdk/src/metrics", ], "//conditions:default": [], }), @@ -91,7 +91,7 @@ cc_library( ":google_cloud_cpp_bigtable", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -108,7 +108,7 @@ cc_library( "//:grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -129,7 +129,7 @@ cc_library( "//:grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in bigtable_client_unit_tests] @@ -146,6 +146,6 @@ cc_test( "//:grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt index 48436804617f3..2a1e87682d6a2 100644 --- a/google/cloud/bigtable/CMakeLists.txt +++ b/google/cloud/bigtable/CMakeLists.txt @@ -47,8 +47,7 @@ include(CTest) # Export the version information for Bazel. include(CreateBazelConfig) -find_package(opentelemetry-cpp CONFIG) -find_package(Crc32c) +find_package(opentelemetry-cpp CONFIG REQUIRED) # the client library add_library( @@ -109,7 +108,6 @@ add_library( admin_client.h app_profile_config.cc app_profile_config.h - async_row_reader.h bound_query.cc bound_query.h bytes.cc @@ -117,15 +115,11 @@ add_library( cell.h client.cc client.h - client_options.cc - client_options.h cluster_config.cc cluster_config.h cluster_list_responses.h column_family.h completion_queue.h - data_client.cc - data_client.h data_connection.cc data_connection.h expr.cc @@ -194,18 +188,9 @@ add_library( internal/default_row_reader.h internal/defaults.cc internal/defaults.h + internal/endpoint_options.h internal/google_bytes_traits.cc internal/google_bytes_traits.h - internal/legacy_async_bulk_apply.cc - internal/legacy_async_bulk_apply.h - internal/legacy_async_row_reader.cc - internal/legacy_async_row_reader.h - internal/legacy_async_row_sampler.cc - internal/legacy_async_row_sampler.h - internal/legacy_row_reader.cc - internal/legacy_row_reader.h - internal/logging_data_client.cc - internal/logging_data_client.h internal/logging_result_set_reader.cc internal/logging_result_set_reader.h internal/metrics.cc @@ -297,18 +282,14 @@ target_link_libraries( google-cloud-cpp::bigtable_protos google-cloud-cpp::common google-cloud-cpp::grpc_utils - Crc32c::crc32c gRPC::grpc++ gRPC::grpc protobuf::libprotobuf) -if (opentelemetry-cpp_FOUND) - target_compile_definitions( - google_cloud_cpp_bigtable - PRIVATE GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS) - target_link_libraries(google_cloud_cpp_bigtable - PUBLIC google-cloud-cpp::opentelemetry) - set(EXTRA_MODULES "google_cloud_cpp_opentelemetry" "opentelemetry_metrics") -endif () +target_compile_definitions(google_cloud_cpp_bigtable + PRIVATE GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS) +target_link_libraries(google_cloud_cpp_bigtable + PUBLIC google-cloud-cpp::opentelemetry) +set(EXTRA_MODULES "google_cloud_cpp_opentelemetry" "opentelemetry_metrics") google_cloud_cpp_add_common_options(google_cloud_cpp_bigtable) target_include_directories( google_cloud_cpp_bigtable @@ -354,9 +335,7 @@ google_cloud_cpp_add_pkgconfig( "google_cloud_cpp_grpc_utils" "google_cloud_cpp_common" "google_cloud_cpp_bigtable_protos" - ${EXTRA_MODULES} - LIBS - crc32c) + ${EXTRA_MODULES}) # Create and install the CMake configuration files. include(CMakePackageConfigHelpers) @@ -410,11 +389,8 @@ if (BUILD_TESTING) testing/cleanup_stale_resources.h testing/embedded_server_test_fixture.cc testing/embedded_server_test_fixture.h - testing/inprocess_data_client.cc - testing/inprocess_data_client.h testing/mock_async_failing_rpc_factory.h testing/mock_bigtable_stub.h - testing/mock_data_client.h testing/mock_mutate_rows_limiter.h testing/mock_mutate_rows_reader.h testing/mock_partial_result_set_reader.h @@ -425,9 +401,7 @@ if (BUILD_TESTING) testing/random_names.cc testing/random_names.h testing/table_integration_test.cc - testing/table_integration_test.h - testing/table_test_fixture.cc - testing/table_test_fixture.h) + testing/table_integration_test.h) target_link_libraries( bigtable_client_testing PUBLIC google-cloud-cpp::bigtable @@ -459,11 +433,9 @@ if (BUILD_TESTING) bound_query_test.cc bytes_test.cc cell_test.cc - client_options_test.cc client_test.cc cluster_config_test.cc column_family_test.cc - data_client_test.cc data_connection_test.cc expr_test.cc filters_test.cc @@ -492,12 +464,6 @@ if (BUILD_TESTING) internal/default_row_reader_test.cc internal/defaults_test.cc internal/google_bytes_traits_test.cc - internal/legacy_async_bulk_apply_test.cc - internal/legacy_async_row_reader_test.cc - internal/legacy_async_row_sampler_test.cc - internal/legacy_bulk_mutator_test.cc - internal/legacy_row_reader_test.cc - internal/logging_data_client_test.cc internal/logging_result_set_reader_test.cc internal/metrics_test.cc internal/mutate_rows_limiter_test.cc @@ -511,7 +477,6 @@ if (BUILD_TESTING) internal/retry_traits_test.cc internal/traced_row_reader_test.cc internal/tuple_utils_test.cc - legacy_table_test.cc metadata_update_policy_test.cc mocks/mock_row_reader_test.cc mutation_batcher_test.cc @@ -529,15 +494,8 @@ if (BUILD_TESTING) rpc_retry_policy_test.cc sql_statement_test.cc table_admin_test.cc - table_apply_test.cc - table_bulk_apply_test.cc - table_check_and_mutate_row_test.cc table_config_test.cc - table_readmodifywriterow_test.cc - table_readrow_test.cc - table_readrows_test.cc table_resource_test.cc - table_sample_row_keys_test.cc table_test.cc testing/cleanup_stale_resources_test.cc testing/random_names_test.cc diff --git a/google/cloud/bigtable/admin/bigtable_instance_admin_client.h b/google/cloud/bigtable/admin/bigtable_instance_admin_client.h index dbfb64ab01481..c8be52c0513be 100644 --- a/google/cloud/bigtable/admin/bigtable_instance_admin_client.h +++ b/google/cloud/bigtable/admin/bigtable_instance_admin_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/bigtable_instance_admin_connection.h b/google/cloud/bigtable/admin/bigtable_instance_admin_connection.h index 941f91fea1c50..34afef13a90b5 100644 --- a/google/cloud/bigtable/admin/bigtable_instance_admin_connection.h +++ b/google/cloud/bigtable/admin/bigtable_instance_admin_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/admin/bigtable_instance_admin_connection_idempotency_policy.h b/google/cloud/bigtable/admin/bigtable_instance_admin_connection_idempotency_policy.h index 7e43c82f5af91..28d36da00f188 100644 --- a/google/cloud/bigtable/admin/bigtable_instance_admin_connection_idempotency_policy.h +++ b/google/cloud/bigtable/admin/bigtable_instance_admin_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/admin/bigtable_table_admin_client.h b/google/cloud/bigtable/admin/bigtable_table_admin_client.h index 793939eeab947..b9049768b5d7e 100644 --- a/google/cloud/bigtable/admin/bigtable_table_admin_client.h +++ b/google/cloud/bigtable/admin/bigtable_table_admin_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/bigtable_table_admin_connection.h b/google/cloud/bigtable/admin/bigtable_table_admin_connection.h index d62e51b075fde..4ea5324b9ce97 100644 --- a/google/cloud/bigtable/admin/bigtable_table_admin_connection.h +++ b/google/cloud/bigtable/admin/bigtable_table_admin_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.h b/google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.h index 1d2a533a55490..0879c7f71922a 100644 --- a/google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.h +++ b/google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.cc index 52e165e995cf4..c025368ca24fd 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/bigtable/admin/v2/bigtable_instance_admin.proto #include "google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.h index cf79e70e27ffe..7dacdd9a9961f 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_connection_impl.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_connection_impl.h index 0d8f66954e7e4..7e9cd4a9687c1 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_connection_impl.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.cc index 27d02161e5404..41b3265d8a536 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.h index 08e9be4a2c2a6..fa2103e7e6099 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.cc index 91f7ce424ff58..217d1d96dc1f6 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.h index c3d3bd29ecef1..a257c2b02bf9c 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc index 81e7674434ed0..74b387d54c075 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h index 1cb2eee76c896..a0525db9eabe4 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub_factory.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub_factory.cc index 3a1f4da4d0717..8129171c8c4bd 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub_factory.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.cc index 522d0d8405e6a..c60d90ae21f10 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigtableInstanceAdminTracingConnection::BigtableInstanceAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -531,17 +529,13 @@ Status BigtableInstanceAdminTracingConnection::DeleteMaterializedView( return internal::EndSpan(*span, child_->DeleteMaterializedView(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigtableInstanceAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.h index ebdcd8ad91d94..6f0ab1e7b7b14 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigtableInstanceAdminTracingConnection : public bigtable_admin::BigtableInstanceAdminConnection { public: @@ -239,8 +237,6 @@ class BigtableInstanceAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc index bff207bbefcec..196768d7aaf66 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigtableInstanceAdminTracingStub::BigtableInstanceAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -586,15 +584,9 @@ future BigtableInstanceAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigtableInstanceAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.h index 254f1cd215815..87f22a8d3b609 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigtableInstanceAdminTracingStub : public BigtableInstanceAdminStub { public: ~BigtableInstanceAdminTracingStub() override = default; @@ -273,8 +271,6 @@ class BigtableInstanceAdminTracingStub : public BigtableInstanceAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.cc index ed820ab706916..8aeb0974a9bc9 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/bigtable/admin/v2/bigtable_table_admin.proto #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.h index 5c1ebaf82b795..90afaa17fe8d0 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_connection_impl.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_connection_impl.h index 27812af525d89..5d8c95b19e690 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_connection_impl.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.cc index 52e1715f91fd7..ecee7762f2f57 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.h index d47f13dd7e4c6..f2799aaf1ec2e 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.cc index da9d69c6725c0..72bc82ea3aa10 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.h index b0ba622681699..3ef48673d3c9b 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc index 5ee3d92b16d67..8297c1c0563d3 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h index 728a5d8015d8a..7255901e44b0c 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub_factory.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub_factory.cc index 68f1aa81b202b..0553204c8824d 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub_factory.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc index 71f4e692e544a..bc23ff38a77c9 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigtableTableAdminTracingConnection::BigtableTableAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -501,17 +499,13 @@ BigtableTableAdminTracingConnection::AsyncCheckConsistency( child_->AsyncCheckConsistency(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigtableTableAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.h index e1eb0c009e39d..2003fb21682aa 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigtableTableAdminTracingConnection : public bigtable_admin::BigtableTableAdminConnection { public: @@ -226,8 +224,6 @@ class BigtableTableAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc index f61e11495baa6..6036848dee28a 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigtableTableAdminTracingStub::BigtableTableAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -561,15 +559,9 @@ future BigtableTableAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigtableTableAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.h index a2b19c0170d9d..7585127cb05ee 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigtable_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigtableTableAdminTracingStub : public BigtableTableAdminStub { public: ~BigtableTableAdminTracingStub() override = default; @@ -260,8 +258,6 @@ class BigtableTableAdminTracingStub : public BigtableTableAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigtable/admin_client.cc b/google/cloud/bigtable/admin_client.cc index cdc151945d6d7..4bcf80c036e36 100644 --- a/google/cloud/bigtable/admin_client.cc +++ b/google/cloud/bigtable/admin_client.cc @@ -28,12 +28,6 @@ std::shared_ptr MakeAdminClient(std::string project, new AdminClient(std::move(project), std::move(params))); } -std::shared_ptr CreateDefaultAdminClient(std::string project, - ClientOptions options) { - return MakeAdminClient(std::move(project), - internal::MakeOptions(std::move(options))); -} - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable } // namespace cloud diff --git a/google/cloud/bigtable/admin_client.h b/google/cloud/bigtable/admin_client.h index 31ebc18855d7b..9f8dd1b5b9aab 100644 --- a/google/cloud/bigtable/admin_client.h +++ b/google/cloud/bigtable/admin_client.h @@ -16,9 +16,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_ADMIN_CLIENT_H #include "google/cloud/bigtable/admin/bigtable_table_admin_connection.h" -#include "google/cloud/bigtable/client_options.h" #include "google/cloud/bigtable/internal/admin_client_params.h" #include "google/cloud/bigtable/version.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/options.h" #include #include @@ -65,16 +65,6 @@ class AdminClient final { std::shared_ptr MakeAdminClient(std::string project, Options options = {}); -/** - * Create a new table admin client configured via @p options. - * - * @deprecated use the `MakeAdminClient` method which accepts - * `google::cloud::Options` instead. - */ -GOOGLE_CLOUD_CPP_DEPRECATED("use `MakeAdminClient` instead") -std::shared_ptr CreateDefaultAdminClient(std::string project, - ClientOptions options); - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable } // namespace cloud diff --git a/google/cloud/bigtable/admin_client_test.cc b/google/cloud/bigtable/admin_client_test.cc index f9f0ccc617eb5..d723f8a64ff1b 100644 --- a/google/cloud/bigtable/admin_client_test.cc +++ b/google/cloud/bigtable/admin_client_test.cc @@ -21,16 +21,6 @@ namespace bigtable { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -TEST(AdminClientTest, CreateDefaultClient) { - auto admin_client = CreateDefaultAdminClient("test-project", {}); - ASSERT_TRUE(admin_client); - EXPECT_EQ("test-project", admin_client->project()); -} - -#include "google/cloud/internal/diagnostics_pop.inc" - TEST(AdminClientTest, MakeClient) { auto admin_client = MakeAdminClient("test-project"); ASSERT_TRUE(admin_client); diff --git a/google/cloud/bigtable/app_profile_config.h b/google/cloud/bigtable/app_profile_config.h index 0a7bb9031e34b..db256f2f12c46 100644 --- a/google/cloud/bigtable/app_profile_config.h +++ b/google/cloud/bigtable/app_profile_config.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_APP_PROFILE_CONFIG_H #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/async_read_stream_test.cc b/google/cloud/bigtable/async_read_stream_test.cc index bcb9b4af40cd1..b6a9505315942 100644 --- a/google/cloud/bigtable/async_read_stream_test.cc +++ b/google/cloud/bigtable/async_read_stream_test.cc @@ -15,7 +15,7 @@ #include "google/cloud/bigtable/completion_queue.h" #include "google/cloud/bigtable/version.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/async_row_reader.h b/google/cloud/bigtable/async_row_reader.h deleted file mode 100644 index e899ad3c29439..0000000000000 --- a/google/cloud/bigtable/async_row_reader.h +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_ASYNC_ROW_READER_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_ASYNC_ROW_READER_H - -#include "google/cloud/bigtable/version.h" -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * @deprecated Please use `bigtable::RowReader::NO_ROWS_LIMIT` instead. - */ -template -class AsyncRowReader { - public: - /// Special value to be used as rows_limit indicating no limit. - GOOGLE_CLOUD_CPP_DEPRECATED( - "`AsyncRowReader<>::NO_ROWS_LIMIT` is deprecated. It is scheduled for " - "deletion on 2023-05-01. Please use `RowReader::NO_ROWS_LIMIT` instead.") - // NOLINTNEXTLINE(readability-identifier-naming) - static std::int64_t constexpr NO_ROWS_LIMIT = 0; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_ASYNC_ROW_READER_H diff --git a/google/cloud/bigtable/benchmarks/BUILD.bazel b/google/cloud/bigtable/benchmarks/BUILD.bazel index d38595bf6c969..2215e0a2f1f88 100644 --- a/google/cloud/bigtable/benchmarks/BUILD.bazel +++ b/google/cloud/bigtable/benchmarks/BUILD.bazel @@ -60,6 +60,6 @@ cc_library( "//:bigtable", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in bigtable_benchmarks_unit_tests] diff --git a/google/cloud/bigtable/benchmarks/benchmark.cc b/google/cloud/bigtable/benchmarks/benchmark.cc index 87e9baac9b657..d758bb6b09714 100644 --- a/google/cloud/bigtable/benchmarks/benchmark.cc +++ b/google/cloud/bigtable/benchmarks/benchmark.cc @@ -16,6 +16,7 @@ #include "google/cloud/bigtable/admin/bigtable_table_admin_client.h" #include "google/cloud/bigtable/benchmarks/random_mutation.h" #include "google/cloud/bigtable/resource_names.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/background_threads_impl.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/internal/make_status.h" diff --git a/google/cloud/bigtable/benchmarks/embedded_server.cc b/google/cloud/bigtable/benchmarks/embedded_server.cc index 758089c837876..8f415677488d1 100644 --- a/google/cloud/bigtable/benchmarks/embedded_server.cc +++ b/google/cloud/bigtable/benchmarks/embedded_server.cc @@ -15,8 +15,8 @@ #include "google/cloud/bigtable/benchmarks/embedded_server.h" #include "google/cloud/bigtable/benchmarks/constants.h" #include "google/cloud/bigtable/benchmarks/random_mutation.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/benchmarks/embedded_server_test.cc b/google/cloud/bigtable/benchmarks/embedded_server_test.cc index 9f11bacf0f3a7..79c956d7f5a7f 100644 --- a/google/cloud/bigtable/benchmarks/embedded_server_test.cc +++ b/google/cloud/bigtable/benchmarks/embedded_server_test.cc @@ -16,6 +16,7 @@ #include "google/cloud/bigtable/admin/bigtable_table_admin_client.h" #include "google/cloud/bigtable/resource_names.h" #include "google/cloud/bigtable/table.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/testing_util/status_matchers.h" #include #include diff --git a/google/cloud/bigtable/benchmarks/mutation_batcher_throughput_benchmark.cc b/google/cloud/bigtable/benchmarks/mutation_batcher_throughput_benchmark.cc index d02b8f1c90ddb..e5c01218a6ab0 100644 --- a/google/cloud/bigtable/benchmarks/mutation_batcher_throughput_benchmark.cc +++ b/google/cloud/bigtable/benchmarks/mutation_batcher_throughput_benchmark.cc @@ -18,6 +18,7 @@ #include "google/cloud/bigtable/resource_names.h" #include "google/cloud/bigtable/table.h" #include "google/cloud/bigtable/testing/random_names.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/background_threads_impl.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/internal/make_status.h" diff --git a/google/cloud/bigtable/bigtable_client_testing.bzl b/google/cloud/bigtable/bigtable_client_testing.bzl index 865460e3aead3..2146dbf028f1a 100644 --- a/google/cloud/bigtable/bigtable_client_testing.bzl +++ b/google/cloud/bigtable/bigtable_client_testing.bzl @@ -19,10 +19,8 @@ bigtable_client_testing_hdrs = [ "testing/cleanup_stale_resources.h", "testing/embedded_server_test_fixture.h", - "testing/inprocess_data_client.h", "testing/mock_async_failing_rpc_factory.h", "testing/mock_bigtable_stub.h", - "testing/mock_data_client.h", "testing/mock_mutate_rows_limiter.h", "testing/mock_mutate_rows_reader.h", "testing/mock_partial_result_set_reader.h", @@ -32,14 +30,11 @@ bigtable_client_testing_hdrs = [ "testing/mock_sample_row_keys_reader.h", "testing/random_names.h", "testing/table_integration_test.h", - "testing/table_test_fixture.h", ] bigtable_client_testing_srcs = [ "testing/cleanup_stale_resources.cc", "testing/embedded_server_test_fixture.cc", - "testing/inprocess_data_client.cc", "testing/random_names.cc", "testing/table_integration_test.cc", - "testing/table_test_fixture.cc", ] diff --git a/google/cloud/bigtable/bigtable_client_unit_tests.bzl b/google/cloud/bigtable/bigtable_client_unit_tests.bzl index c5dda043da0a4..cf689e85ca90b 100644 --- a/google/cloud/bigtable/bigtable_client_unit_tests.bzl +++ b/google/cloud/bigtable/bigtable_client_unit_tests.bzl @@ -24,11 +24,9 @@ bigtable_client_unit_tests = [ "bound_query_test.cc", "bytes_test.cc", "cell_test.cc", - "client_options_test.cc", "client_test.cc", "cluster_config_test.cc", "column_family_test.cc", - "data_client_test.cc", "data_connection_test.cc", "expr_test.cc", "filters_test.cc", @@ -57,12 +55,6 @@ bigtable_client_unit_tests = [ "internal/default_row_reader_test.cc", "internal/defaults_test.cc", "internal/google_bytes_traits_test.cc", - "internal/legacy_async_bulk_apply_test.cc", - "internal/legacy_async_row_reader_test.cc", - "internal/legacy_async_row_sampler_test.cc", - "internal/legacy_bulk_mutator_test.cc", - "internal/legacy_row_reader_test.cc", - "internal/logging_data_client_test.cc", "internal/logging_result_set_reader_test.cc", "internal/metrics_test.cc", "internal/mutate_rows_limiter_test.cc", @@ -76,7 +68,6 @@ bigtable_client_unit_tests = [ "internal/retry_traits_test.cc", "internal/traced_row_reader_test.cc", "internal/tuple_utils_test.cc", - "legacy_table_test.cc", "metadata_update_policy_test.cc", "mocks/mock_row_reader_test.cc", "mutation_batcher_test.cc", @@ -94,15 +85,8 @@ bigtable_client_unit_tests = [ "rpc_retry_policy_test.cc", "sql_statement_test.cc", "table_admin_test.cc", - "table_apply_test.cc", - "table_bulk_apply_test.cc", - "table_check_and_mutate_row_test.cc", "table_config_test.cc", - "table_readmodifywriterow_test.cc", - "table_readrow_test.cc", - "table_readrows_test.cc", "table_resource_test.cc", - "table_sample_row_keys_test.cc", "table_test.cc", "testing/cleanup_stale_resources_test.cc", "testing/random_names_test.cc", diff --git a/google/cloud/bigtable/client_options.cc b/google/cloud/bigtable/client_options.cc deleted file mode 100644 index 7bee3a22e4675..0000000000000 --- a/google/cloud/bigtable/client_options.cc +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and - -#include "google/cloud/bigtable/client_options.h" -#include "google/cloud/bigtable/internal/client_options_defaults.h" -#include "google/cloud/bigtable/internal/defaults.h" -#include "google/cloud/internal/background_threads_impl.h" -#include "google/cloud/internal/getenv.h" -#include "google/cloud/internal/user_agent_prefix.h" -#include "absl/strings/str_split.h" -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -Options&& MakeOptions(ClientOptions&& o) { - if (!o.connection_pool_name_.empty()) { - o.opts_ - .lookup()["cbt-c++/connection-pool-name"] = - std::move(o.connection_pool_name_); - } - return std::move(o.opts_); -} -} // namespace internal - -ClientOptions::ClientOptions() { opts_ = internal::DefaultOptions(); } - -ClientOptions::ClientOptions(Options opts) { - ::google::cloud::internal::CheckExpectedOptions< - ClientOptionList, CommonOptionList, GrpcOptionList>(opts, __func__); - opts_ = internal::DefaultOptions(std::move(opts)); -} - -ClientOptions::ClientOptions(std::shared_ptr creds) { - opts_ = internal::DefaultOptions( - Options{}.set(std::move(creds))); - - // This constructor ignores the emulator environment variables, which might be - // set by `internal::DefaultOptions()`. - opts_.set("bigtable.googleapis.com"); - opts_.set("bigtableadmin.googleapis.com"); - opts_.set("bigtableadmin.googleapis.com"); -} - -// NOLINTNEXTLINE(readability-identifier-naming) -ClientOptions& ClientOptions::set_connection_pool_size(std::size_t size) { - opts_.set(size == 0 - ? internal::DefaultConnectionPoolSize() - : static_cast(size)); - return *this; -} - -std::string ClientOptions::UserAgentPrefix() { - return google::cloud::internal::UserAgentPrefix(); -} - -ClientOptions& ClientOptions::DisableBackgroundThreads( - google::cloud::CompletionQueue const& cq) { - opts_.set(cq); - return *this; -} - -BackgroundThreadsFactory ClientOptions::background_threads_factory() const { - return google::cloud::internal::MakeBackgroundThreadsFactory(opts_); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/client_options.h b/google/cloud/bigtable/client_options.h deleted file mode 100644 index 834ea1a162e53..0000000000000 --- a/google/cloud/bigtable/client_options.h +++ /dev/null @@ -1,734 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_CLIENT_OPTIONS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_CLIENT_OPTIONS_H - -#include "google/cloud/bigtable/options.h" -#include "google/cloud/bigtable/version.h" -#include "google/cloud/background_threads.h" -#include "google/cloud/common_options.h" -#include "google/cloud/completion_queue.h" -#include "google/cloud/grpc_options.h" -#include "google/cloud/internal/algorithm.h" -#include "google/cloud/internal/make_status.h" -#include "google/cloud/options.h" -#include "google/cloud/status.h" -#include "google/cloud/tracing_options.h" -#include "absl/strings/str_split.h" -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -class ClientOptions; -namespace internal { -Options&& MakeOptions(ClientOptions&& o); -} // namespace internal - -/** - * Configuration options for the Bigtable Client. - * - * Applications typically configure the client class using: - * @code - * auto client = - * bigtable::Client(bigtable::ClientOptions().SetCredentials(...)); - * @endcode - * - * @deprecated Please use `google::cloud::Options` instead. - */ -class ClientOptions { - public: - /** - * Initialize the client options. - * - * Configure the client to connect to the Cloud Bigtable service, using the - * default options. - * - * @par Environment Variables - * If the `BIGTABLE_EMULATOR_HOST` environment variable is set, the default - * configuration changes in important ways: - * - * - The credentials are initialized to `grpc::InsecureCredentials()`. - * - Any client created with these objects will connect to the endpoint - * (typically just a `host:port` string) set in the environment variable. - * - * This makes it easy to test applications using the Cloud Bigtable Emulator. - * - * @see The Google Cloud Platform introduction to - * [application default - * credentials](https://cloud.google.com/docs/authentication/production) - * @see `grpc::GoogleDefaultCredentials` in the [grpc - * documentation](https://grpc.io/grpc/cpp/namespacegrpc.html) - * @see The [documentation](https://cloud.google.com/bigtable/docs/emulator) - * for the Cloud Bigtable Emulator. - * - * @deprecated Please use `google::cloud::Options` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED("use `google::cloud::Options` instead") - ClientOptions(); - - /** - * Initialize the client options. - * - * Expected options are any of the types in the following option lists. - * - * - `google::cloud::CommonOptionList` - * - `google::cloud::GrpcOptionList` - * - `google::cloud::bigtable::ClientOptionList` - * - * @note Unrecognized options will be ignored. To debug issues with options - * set `GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes` in the environment and - * unexpected options will be logged. - * - * @param opts (optional) configuration options - * - * @deprecated Please use `google::cloud::Options` directly instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED("use `google::cloud::Options` directly instead") - explicit ClientOptions(Options opts); - - /** - * Connect to the production instance of Cloud Bigtable using @p creds. - * - * This constructor always connects to the production instance of Cloud - * Bigtable, and can be used when the application default credentials are - * not configured in the environment where the application is running. - * - * @param creds gRPC authentication credentials - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcCredentialOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `google::cloud::GrpcCredentialOption` " - "instead") - explicit ClientOptions(std::shared_ptr creds); - - /** - * Return the current endpoint for data RPCs. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::EndpointOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `google::cloud::EndpointOption` " - "instead") - std::string const& data_endpoint() const { - return opts_.get(); - } - - /** - * Set the current endpoint for data RPCs. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::EndpointOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `google::cloud::EndpointOption` " - "instead") - ClientOptions& set_data_endpoint(std::string endpoint) { - opts_.set(std::move(endpoint)); - return *this; - } - - /** - * Return the current endpoint for admin RPCs. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::EndpointOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `google::cloud::EndpointOption` " - "instead") - std::string const& admin_endpoint() const { - return opts_.get(); - } - - /** - * Set the current endpoint for admin RPCs. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::EndpointOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `google::cloud::EndpointOption` " - "instead") - ClientOptions& set_admin_endpoint(std::string endpoint) { - opts_.set(endpoint); - // These two endpoints are generally equivalent, but they may differ in - // some tests. - opts_.set(std::move(endpoint)); - return *this; - } - - /** - * Set the name of the connection pool. - * - * gRPC typically opens a single connection for each destination. To improve - * performance, the Cloud Bigtable C++ client can open multiple connections - * to a given destination, but these connections are shared by all threads - * in the application. Sometimes the application may want even more - * segregation, for example, the application may want to use a different pool - * for high-priority requests vs. lower priority ones. Using different names - * creates segregated pools. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsOption` or - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsOption` or " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - ClientOptions& set_connection_pool_name(std::string name) { - connection_pool_name_ = std::move(name); - return *this; - } - - /** - * Return the name of the connection pool. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsOption` or - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsOption` or " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - std::string const& connection_pool_name() const { - return connection_pool_name_; - } - - /** - * Set the size of the connection pool. - * - * Specifying 0 for @p size will set the size of the connection pool to - * default. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcNumChannelsOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcNumChannelsOption` instead") - ClientOptions& set_connection_pool_size(std::size_t size); - - /** - * Return the size of the connection pool. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcNumChannelsOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcNumChannelsOption` instead") - std::size_t connection_pool_size() const { - return opts_.get(); - } - - /** - * Return the current credentials. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcCredentialOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcCredentialOption` instead") - std::shared_ptr credentials() const { - return opts_.get(); - } - - /** - * Set the current credentials. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcCredentialOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcCredentialOption` instead") - ClientOptions& SetCredentials( - std::shared_ptr credentials) { - opts_.set(std::move(credentials)); - return *this; - } - - /** - * Access all the channel arguments. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsOption` or - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsOption` or " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - grpc::ChannelArguments channel_arguments() const { - return ::google::cloud::internal::MakeChannelArguments(opts_); - } - - /** - * Set all the channel arguments. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - ClientOptions& set_channel_arguments( - grpc::ChannelArguments const& channel_arguments) { - opts_.set(channel_arguments); - return *this; - } - - /** - * Set compression algorithm for channel. - * - * Please see the docs for grpc::ChannelArguments::SetCompressionAlgorithm() - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetCompressionAlgorithm(grpc_compression_algorithm algorithm) { - opts_.lookup().SetCompressionAlgorithm( - algorithm); - } - - /** - * Set the `grpclb` fallback timeout with the timestamp @p fallback_timeout - * for the channel. - * - * For example: - * - * @code - * bigtable::ClientOptions::SetGrpclbFallbackTimeout( - * std::chrono::milliseconds(5000)) - * bigtable::ClientOptions::SetGrpclbFallbackTimeout( - * std::chrono::seconds(5)) - * @endcode - * - * @tparam Rep a placeholder to match the Rep tparam for @p fallback_timeout, - * the semantics of this template parameter are documented in - * `std::chrono::duration<>` (in brief, the underlying arithmetic type - * used to store the number of ticks), for our purposes it is simply a - * formal parameter. - * @tparam Period a placeholder to match the Period tparam for @p - * fallback_timeout, the semantics of this template parameter are - * documented in `std::chrono::duration<>` (in brief, the length of the - * tick in seconds, expressed as a `std::ratio<>`), for our purposes it - * is simply a formal parameter. - * - * @see - * [std::chrono::duration<>](http://en.cppreference.com/w/cpp/chrono/duration) - * for more details. - * - * Please see the docs for - * `grpc::ChannelArguments::SetGrpclbFallbackTimeout()` on - * https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html for more - * details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - template - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - google::cloud::Status SetGrpclbFallbackTimeout( - std::chrono::duration fallback_timeout) { - std::chrono::milliseconds ft_ms = - std::chrono::duration_cast(fallback_timeout); - - if (ft_ms.count() > std::numeric_limits::max()) { - return google::cloud::internal::OutOfRangeError( - "The supplied duration is larger than the " - "maximum value allowed by gRPC (INT_MAX)", - GCP_ERROR_INFO()); - } - auto fallback_timeout_ms = static_cast(ft_ms.count()); - opts_.lookup().SetGrpclbFallbackTimeout( - fallback_timeout_ms); - return google::cloud::Status(); - } - - /** - * Set the string to prepend to the user agent. - * - * Please see the docs for `grpc::ChannelArguments::SetUserAgentPrefix()` - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::UserAgentProductsOption` or - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::UserAgentProductsOption` " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetUserAgentPrefix(grpc::string const& user_agent_prefix) { - opts_.lookup().SetUserAgentPrefix( - user_agent_prefix); - } - - /** - * Set the buffer pool to be attached to the constructed channel. - * - * Please see the docs for `grpc::ChannelArguments::SetResourceQuota()` - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetResourceQuota(grpc::ResourceQuota const& resource_quota) { - opts_.lookup().SetResourceQuota( - resource_quota); - } - - /** - * Set the max receive message size in bytes. -1 means unlimited. - * - * Please see the docs for - * `grpc::ChannelArguments::SetMaxReceiveMessageSize()` on - * https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html for more - * details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetMaxReceiveMessageSize(int size) { - opts_.lookup().SetMaxReceiveMessageSize( - size); - } - - /** - * Set the max send message size in bytes. -1 means unlimited. - * - * Please see the docs for grpc::ChannelArguments::SetMaxSendMessageSize() - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetMaxSendMessageSize(int size) { - opts_.lookup().SetMaxSendMessageSize( - size); - } - - /** - * Set LB policy name. - * - * Please see the docs for - * grpc::ChannelArguments::SetLoadBalancingPolicyName() - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetLoadBalancingPolicyName(grpc::string const& lb_policy_name) { - opts_.lookup().SetLoadBalancingPolicyName( - lb_policy_name); - } - - /** - * Set service config in JSON form. - * - * Please see the docs for grpc::ChannelArguments::SetServiceConfigJSON() - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetServiceConfigJSON(grpc::string const& service_config_json) { - opts_.lookup().SetServiceConfigJSON( - service_config_json); - } - - /** - * Set target name override for SSL host name checking. - * - * Please see the docs for grpc::ChannelArguments::SetSslTargetNameOverride() - * on https://grpc.io/grpc/cpp/classgrpc_1_1_channel_arguments.html - * for more details. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcChannelArgumentsNativeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcChannelArgumentsNativeOption` instead") - void SetSslTargetNameOverride(grpc::string const& name) { - opts_.lookup().SetSslTargetNameOverride( - name); - } - - /// Return the user agent prefix used by the library. - GOOGLE_CLOUD_CPP_DEPRECATED("Not intended for use in application code") - static std::string UserAgentPrefix(); - - /** - * Return whether tracing is enabled for the given @p component. - * - * The C++ clients can log interesting events to help library and application - * developers troubleshoot problems. This flag returns true if tracing should - * be enabled by clients configured with this option. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::LoggingComponentsOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::LoggingComponentsOption` instead") - bool tracing_enabled(std::string const& component) const { - return google::cloud::internal::Contains( - opts_.get(), component); - } - - /** - * Enable tracing for @p component in clients configured with this object. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::LoggingComponentsOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::LoggingComponentsOption` instead") - ClientOptions& enable_tracing(std::string const& component) { - opts_.lookup().insert(component); - return *this; - } - - /** - * Disable tracing for @p component in clients configured with this object. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::LoggingComponentsOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::LoggingComponentsOption` instead") - ClientOptions& disable_tracing(std::string const& component) { - opts_.lookup().erase(component); - return *this; - } - - /** - * Return the options for use when tracing RPCs. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcTracingOptionsOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcTracingOptionsOption` instead") - TracingOptions const& tracing_options() const { - return opts_.get(); - } - - /** - * Maximum connection refresh period, as set via `set_max_conn_refresh_period` - * - * @deprecated Please configure `google::cloud::Options` with - * `bigtable::MinConnectionRefreshOption` and - * `bigtable::MaxConnectionRefreshOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `MinConnectionRefreshOption` and " - "`MaxConnectionRefreshOption` instead") - std::chrono::milliseconds max_conn_refresh_period() { - return opts_.get(); - } - - /** - * If set to a positive number, the client will refresh connections at random - * moments not more apart from each other than this duration. This is - * necessary to avoid all connections simultaneously expiring and causing - * latency spikes. - * - * If needed it changes max_conn_refresh_period() to preserve the invariant: - * - * @code - * assert(min_conn_refresh_period() <= max_conn_refresh_period()) - * @endcode - * - * @deprecated Please configure `google::cloud::Options` with - * `bigtable::MinConnectionRefreshOption` and - * `bigtable::MaxConnectionRefreshOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `MinConnectionRefreshOption` and " - "`MaxConnectionRefreshOption` instead") - ClientOptions& set_max_conn_refresh_period(std::chrono::milliseconds period) { - opts_.set(period); - auto& min_conn_refresh_period = opts_.lookup(); - min_conn_refresh_period = (std::min)(min_conn_refresh_period, period); - return *this; - } - - /** - * Minimum connection refresh period, as set via `set_min_conn_refresh_period` - * - * @deprecated Please configure `google::cloud::Options` with - * `bigtable::MinConnectionRefreshOption` and - * `bigtable::MaxConnectionRefreshOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `MinConnectionRefreshOption` and " - "`MaxConnectionRefreshOption` instead") - std::chrono::milliseconds min_conn_refresh_period() { - return opts_.get(); - } - - /** - * Configures the *minimum* connection refresh period. The library will wait - * at least this long before attempting any refresh operation. - * - * If needed it changes max_conn_refresh_period() to preserve the invariant: - * - * @code - * assert(min_conn_refresh_period() <= max_conn_refresh_period()) - * @endcode - * - * @deprecated Please configure `google::cloud::Options` with - * `bigtable::MinConnectionRefreshOption` and - * `bigtable::MaxConnectionRefreshOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with `MinConnectionRefreshOption` and " - "`MaxConnectionRefreshOption` instead") - ClientOptions& set_min_conn_refresh_period(std::chrono::milliseconds period) { - opts_.set(period); - auto& max_conn_refresh_period = opts_.lookup(); - max_conn_refresh_period = (std::max)(max_conn_refresh_period, period); - return *this; - } - - /** - * Set the number of background threads. - * - * @note This value is not used if `DisableBackgroundThreads()` is called. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcBackgroundThreadPoolSizeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcBackgroundThreadPoolSizeOption` instead") - ClientOptions& set_background_thread_pool_size(std::size_t s) { - opts_.set(s); - return *this; - } - - /** - * Return the number of background threads. - * - * @note This value is not used if `DisableBackgroundThreads()` is called. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcBackgroundThreadPoolSizeOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcBackgroundThreadPoolSizeOption` instead") - std::size_t background_thread_pool_size() const { - return opts_.get(); - } - - /** - * Configure the connection to use @p cq for all background work. - * - * Connections need to perform background work on behalf of the application. - * Normally they just create a background thread and a `CompletionQueue` for - * this work, but the application may need more fine-grained control of their - * threads. In this case the application can provide the `CompletionQueue` and - * it assumes responsibility for creating one or more threads blocked on - * `CompletionQueue::Run()`. - * - * @deprecated Please configure `google::cloud::Options` with - * `google::cloud::GrpcCompletionQueueOption` instead. - */ - GOOGLE_CLOUD_CPP_DEPRECATED( - "use `google::cloud::Options` with " - "`google::cloud::GrpcCompletionQueueOption` instead") - ClientOptions& DisableBackgroundThreads( - google::cloud::CompletionQueue const& cq); - - /** - * Backwards compatibility alias - * - * @deprecated Consider using `google::cloud::BackgroundThreadsFactory` - * directly - */ - using BackgroundThreadsFactory = ::google::cloud::BackgroundThreadsFactory; - - /// @deprecated Not intended for applications to use. There is no alternative - /// implemented or planned. - GOOGLE_CLOUD_CPP_DEPRECATED( - "Not intended for applications to use. There is no alternative " - "implemented or planned") - BackgroundThreadsFactory background_threads_factory() const; - - private: - friend struct ClientOptionsTestTraits; - friend Options&& internal::MakeOptions(ClientOptions&&); - - /// Return the current endpoint for instance admin RPCs. - std::string const& instance_admin_endpoint() const { - return opts_.get(); - } - - std::string connection_pool_name_; - Options opts_; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_CLIENT_OPTIONS_H diff --git a/google/cloud/bigtable/client_options_test.cc b/google/cloud/bigtable/client_options_test.cc deleted file mode 100644 index 80594490cc89d..0000000000000 --- a/google/cloud/bigtable/client_options_test.cc +++ /dev/null @@ -1,593 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/client_options.h" -#include "google/cloud/bigtable/internal/client_options_defaults.h" -#include "google/cloud/bigtable/options.h" -#include "google/cloud/grpc_options.h" -#include "google/cloud/internal/background_threads_impl.h" -#include "google/cloud/status.h" -#include "google/cloud/testing_util/scoped_environment.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/types/optional.h" -#include -#include -// ClientOptions is deprecated. We need to suppress the compiler warnings. -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -struct ClientOptionsTestTraits { - static std::string const& InstanceAdminEndpoint( - ClientOptions const& options) { - return options.instance_admin_endpoint(); - } -}; -namespace { -using ::google::cloud::internal::GetIntChannelArgument; -using ::google::cloud::internal::GetStringChannelArgument; -using ::google::cloud::testing_util::ScopedEnvironment; -using ::testing::HasSubstr; - -TEST(ClientOptionsTest, ClientOptionsDefaultSettings) { - ClientOptions client_options; - EXPECT_EQ("bigtable.googleapis.com", client_options.data_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", client_options.admin_endpoint()); - EXPECT_EQ(typeid(grpc::GoogleDefaultCredentials()), - typeid(client_options.credentials())); - - EXPECT_EQ("", client_options.connection_pool_name()); - // The number of connections should be >= 1, we "know" what the actual value - // is, but we do not want a change-detection-test. - EXPECT_LE(1UL, client_options.connection_pool_size()); - - auto args = client_options.channel_arguments(); - auto max_send = GetIntChannelArgument(args, GRPC_ARG_MAX_SEND_MESSAGE_LENGTH); - ASSERT_TRUE(max_send.has_value()); - EXPECT_EQ(BIGTABLE_CLIENT_DEFAULT_MAX_MESSAGE_LENGTH, max_send.value()); - auto max_recv = - GetIntChannelArgument(args, GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH); - ASSERT_TRUE(max_recv.has_value()); - EXPECT_EQ(BIGTABLE_CLIENT_DEFAULT_MAX_MESSAGE_LENGTH, max_recv.value()); - - // See `kDefaultKeepaliveTime` - auto time = GetIntChannelArgument(args, GRPC_ARG_KEEPALIVE_TIME_MS); - ASSERT_TRUE(time.has_value()); - EXPECT_EQ(30000, time.value()); - - // See `kDefaultKeepaliveTimeout` - auto timeout = GetIntChannelArgument(args, GRPC_ARG_KEEPALIVE_TIMEOUT_MS); - ASSERT_TRUE(timeout.has_value()); - EXPECT_EQ(10000, timeout.value()); -} - -TEST(ClientOptionsTest, OptionsConstructor) { - using ms = std::chrono::milliseconds; - using min = std::chrono::minutes; - auto channel_args = grpc::ChannelArguments(); - channel_args.SetString("test-key-1", "value-1"); - auto credentials = grpc::InsecureChannelCredentials(); - auto options = ClientOptions( - Options{} - .set("testdata.googleapis.com") - .set("testadmin.googleapis.com") - .set("testinstanceadmin.googleapis.com") - .set(credentials) - .set( - TracingOptions{}.SetOptions("single_line_mode=F")) - .set({"test-component"}) - .set(3) - .set(ms(100)) - .set(min(4)) - .set(5) - .set(channel_args) - .set({{"test-key-2", "value-2"}}) - .set({"test-prefix"})); - - EXPECT_EQ("testdata.googleapis.com", options.data_endpoint()); - EXPECT_EQ("testadmin.googleapis.com", options.admin_endpoint()); - EXPECT_EQ("testinstanceadmin.googleapis.com", - ClientOptionsTestTraits::InstanceAdminEndpoint(options)); - EXPECT_EQ(credentials, options.credentials()); - EXPECT_FALSE(options.tracing_options().single_line_mode()); - EXPECT_TRUE(options.tracing_enabled("test-component")); - EXPECT_EQ(3U, options.connection_pool_size()); - EXPECT_EQ(ms(100), options.min_conn_refresh_period()); - EXPECT_EQ(min(4), options.max_conn_refresh_period()); - EXPECT_EQ(5U, options.background_thread_pool_size()); - auto args = options.channel_arguments(); - auto key1 = GetStringChannelArgument(args, "test-key-1"); - ASSERT_TRUE(key1.has_value()); - EXPECT_EQ("value-1", key1.value()); - auto key2 = GetStringChannelArgument(args, "test-key-2"); - ASSERT_TRUE(key2.has_value()); - EXPECT_EQ("value-2", key2.value()); - auto s = GetStringChannelArgument(args, GRPC_ARG_PRIMARY_USER_AGENT_STRING); - ASSERT_TRUE(s.has_value()); - EXPECT_THAT(*s, HasSubstr("test-prefix")); -} - -TEST(ClientOptionsTest, CustomBackgroundThreadsOption) { - struct Fake : BackgroundThreads { - CompletionQueue cq() const override { return {}; } - }; - bool invoked = false; - auto factory = [&invoked] { - invoked = true; - return std::make_unique(); - }; - - auto options = - ClientOptions(Options{}.set(factory)); - - EXPECT_FALSE(invoked); - options.background_threads_factory()(); - EXPECT_TRUE(invoked); -} - -class ClientOptionsDefaultEndpointTest : public ::testing::Test { - public: - ClientOptionsDefaultEndpointTest() - : bigtable_emulator_host_("BIGTABLE_EMULATOR_HOST", - "testendpoint.googleapis.com"), - bigtable_instance_admin_emulator_host_( - "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", {}) {} - - protected: - static std::string GetInstanceAdminEndpoint(ClientOptions const& options) { - return ClientOptionsTestTraits::InstanceAdminEndpoint(options); - } - - ScopedEnvironment bigtable_emulator_host_; - ScopedEnvironment bigtable_instance_admin_emulator_host_; -}; - -TEST_F(ClientOptionsDefaultEndpointTest, Default) { - ClientOptions client_options; - EXPECT_EQ("testendpoint.googleapis.com", client_options.data_endpoint()); - EXPECT_EQ("testendpoint.googleapis.com", client_options.admin_endpoint()); - EXPECT_EQ("testendpoint.googleapis.com", - GetInstanceAdminEndpoint(client_options)); - - // Just check `MakeOptions()` for endpoints here. - auto opts = internal::MakeOptions(std::move(client_options)); - EXPECT_EQ("testendpoint.googleapis.com", opts.get()); - EXPECT_EQ("testendpoint.googleapis.com", opts.get()); - EXPECT_EQ("testendpoint.googleapis.com", - opts.get()); -} - -TEST_F(ClientOptionsDefaultEndpointTest, WithCredentials) { - auto credentials = grpc::GoogleDefaultCredentials(); - ClientOptions tested(credentials); - EXPECT_EQ("bigtable.googleapis.com", tested.data_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", tested.admin_endpoint()); - EXPECT_EQ(credentials.get(), tested.credentials().get()); -} - -TEST_F(ClientOptionsDefaultEndpointTest, DefaultNoEmulator) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - - auto credentials = grpc::GoogleDefaultCredentials(); - ClientOptions tested(credentials); - EXPECT_EQ("bigtable.googleapis.com", tested.data_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", tested.admin_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", GetInstanceAdminEndpoint(tested)); -} - -TEST_F(ClientOptionsDefaultEndpointTest, SeparateEmulators) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", - "emulator-host:8000"); - ScopedEnvironment bigtable_instance_admin_emulator_host( - "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", "instance-emulator-host:9000"); - ClientOptions actual; - EXPECT_EQ("emulator-host:8000", actual.data_endpoint()); - EXPECT_EQ("emulator-host:8000", actual.admin_endpoint()); - EXPECT_EQ("instance-emulator-host:9000", GetInstanceAdminEndpoint(actual)); -} - -TEST_F(ClientOptionsDefaultEndpointTest, DataNoEnv) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - EXPECT_EQ("bigtable.googleapis.com", ClientOptions{}.data_endpoint()); -} - -TEST_F(ClientOptionsDefaultEndpointTest, AdminNoEnv) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - EXPECT_EQ("bigtableadmin.googleapis.com", ClientOptions{}.admin_endpoint()); -} - -TEST_F(ClientOptionsDefaultEndpointTest, AdminEmulatorOverrides) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", - "127.0.0.1:1234"); - EXPECT_EQ("127.0.0.1:1234", ClientOptions{}.admin_endpoint()); -} - -TEST_F(ClientOptionsDefaultEndpointTest, AdminInstanceAdminNoEffect) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - ScopedEnvironment bigtable_instance_admin_emulator_host( - "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", "127.0.0.1:1234"); - EXPECT_EQ("bigtableadmin.googleapis.com", ClientOptions{}.admin_endpoint()); -} - -TEST_F(ClientOptionsDefaultEndpointTest, InstanceAdminNoEnv) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - EXPECT_EQ("bigtableadmin.googleapis.com", - GetInstanceAdminEndpoint(ClientOptions())); -} - -TEST_F(ClientOptionsDefaultEndpointTest, InstanceAdminEmulatorOverrides) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", - "127.0.0.1:1234"); - EXPECT_EQ("127.0.0.1:1234", GetInstanceAdminEndpoint(ClientOptions())); -} - -TEST_F(ClientOptionsDefaultEndpointTest, InstanceAdminInstanceAdminOverrides) { - ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", "unused"); - ScopedEnvironment bigtable_instance_admin_emulator_host( - "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", "127.0.0.1:1234"); - EXPECT_EQ("127.0.0.1:1234", GetInstanceAdminEndpoint(ClientOptions())); -} - -TEST(ClientOptionsTest, EditDataEndpoint) { - auto client_options = ClientOptions{}.set_data_endpoint("customendpoint.com"); - EXPECT_EQ("customendpoint.com", client_options.data_endpoint()); -} - -TEST(ClientOptionsTest, EditAdminEndpoint) { - auto client_options = - ClientOptions{}.set_admin_endpoint("customendpoint.com"); - EXPECT_EQ("customendpoint.com", client_options.admin_endpoint()); - EXPECT_EQ("customendpoint.com", - ClientOptionsTestTraits::InstanceAdminEndpoint(client_options)); -} - -TEST(ClientOptionsTest, EditCredentials) { - auto client_options = - ClientOptions{}.SetCredentials(grpc::InsecureChannelCredentials()); - EXPECT_EQ(typeid(grpc::InsecureChannelCredentials()), - typeid(client_options.credentials())); - - auto opts = internal::MakeOptions(std::move(client_options)); - EXPECT_EQ(typeid(grpc::InsecureChannelCredentials()), - typeid(opts.get())); -} - -TEST(ClientOptionsTest, EditConnectionPoolName) { - ClientOptions client_options; - auto& returned = client_options.set_connection_pool_name("foo"); - EXPECT_EQ(&returned, &client_options); - EXPECT_EQ("foo", returned.connection_pool_name()); - - auto opts = internal::MakeOptions(std::move(client_options)); - auto args = google::cloud::internal::MakeChannelArguments(opts); - auto name = GetStringChannelArgument(args, "cbt-c++/connection-pool-name"); - ASSERT_TRUE(name.has_value()); - EXPECT_EQ("foo", name); -} - -TEST(ClientOptionsTest, EditConnectionPoolSize) { - ClientOptions client_options; - auto& returned = client_options.set_connection_pool_size(42); - EXPECT_EQ(&returned, &client_options); - EXPECT_EQ(42UL, returned.connection_pool_size()); - - auto opts = internal::MakeOptions(std::move(client_options)); - EXPECT_EQ(42, opts.get()); -} - -TEST(ClientOptionsTest, ResetToDefaultConnectionPoolSize) { - ClientOptions client_options; - auto& returned = client_options.set_connection_pool_size(0); - EXPECT_EQ(&returned, &client_options); - // The number of connections should be >= 1, we "know" what the actual value - // is, but we do not want a change-detection-test. - EXPECT_LE(1UL, returned.connection_pool_size()); -} - -TEST(ClientOptionsTest, ConnectionPoolSizeDoesNotExceedMax) { - ClientOptions client_options; - auto& returned = client_options.set_connection_pool_size( - BIGTABLE_CLIENT_DEFAULT_CONNECTION_POOL_SIZE_MAX + 1); - EXPECT_EQ(&returned, &client_options); - // The number of connections should be >= 1, we "know" what the actual value - // is, but we do not want a change-detection-test. - EXPECT_LE(BIGTABLE_CLIENT_DEFAULT_CONNECTION_POOL_SIZE_MAX, - returned.connection_pool_size()); -} - -TEST(ClientOptionsTest, SetGrpclbFallbackTimeoutMS) { - // Test milliseconds are set properly to channel_arguments - ClientOptions client_options; - ASSERT_STATUS_OK( - client_options.SetGrpclbFallbackTimeout(std::chrono::milliseconds(5))); - - auto args = client_options.channel_arguments(); - auto actual = - GetIntChannelArgument(args, GRPC_ARG_GRPCLB_FALLBACK_TIMEOUT_MS); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, 5); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = GetIntChannelArgument(args, GRPC_ARG_GRPCLB_FALLBACK_TIMEOUT_MS); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, 5); -} - -TEST(ClientOptionsTest, SetGrpclbFallbackTimeoutSec) { - // Test seconds are converted into milliseconds - ClientOptions client_options; - ASSERT_STATUS_OK( - client_options.SetGrpclbFallbackTimeout(std::chrono::seconds(5))); - - auto args = client_options.channel_arguments(); - auto actual = - GetIntChannelArgument(args, GRPC_ARG_GRPCLB_FALLBACK_TIMEOUT_MS); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, 5000); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = GetIntChannelArgument(args, GRPC_ARG_GRPCLB_FALLBACK_TIMEOUT_MS); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, 5000); -} - -TEST(ClientOptionsTest, SetGrpclbFallbackTimeoutException) { - // Test if fallback_timeout exceeds int range and StatusCode - // matches kOutOfRange - ClientOptions client_options; - EXPECT_EQ( - client_options.SetGrpclbFallbackTimeout(std::chrono::hours(999)).code(), - google::cloud::StatusCode::kOutOfRange); -} - -TEST(ClientOptionsTest, SetCompressionAlgorithm) { - ClientOptions client_options; - client_options.SetCompressionAlgorithm(GRPC_COMPRESS_NONE); - - auto args = client_options.channel_arguments(); - auto actual = - GetIntChannelArgument(args, GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, GRPC_COMPRESS_NONE); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = - GetIntChannelArgument(args, GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, GRPC_COMPRESS_NONE); -} - -TEST(ClientOptionsTest, SetLoadBalancingPolicyName) { - ClientOptions client_options; - client_options.SetLoadBalancingPolicyName("test-policy-name"); - - auto args = client_options.channel_arguments(); - auto actual = GetStringChannelArgument(args, GRPC_ARG_LB_POLICY_NAME); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, "test-policy-name"); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = GetStringChannelArgument(args, GRPC_ARG_LB_POLICY_NAME); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, "test-policy-name"); -} - -TEST(ClientOptionsTest, SetServiceConfigJSON) { - ClientOptions client_options; - client_options.SetServiceConfigJSON("test-config"); - - auto args = client_options.channel_arguments(); - auto actual = GetStringChannelArgument(args, GRPC_ARG_SERVICE_CONFIG); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, "test-config"); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = GetStringChannelArgument(args, GRPC_ARG_SERVICE_CONFIG); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, "test-config"); -} - -TEST(ClientOptionsTest, SetUserAgentPrefix) { - ClientOptions client_options; - client_options.SetUserAgentPrefix("test_prefix"); - - auto args = client_options.channel_arguments(); - auto actual = - GetStringChannelArgument(args, GRPC_ARG_PRIMARY_USER_AGENT_STRING); - ASSERT_TRUE(actual.has_value()); - EXPECT_THAT(*actual, HasSubstr("test_prefix")); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = GetStringChannelArgument(args, GRPC_ARG_PRIMARY_USER_AGENT_STRING); - ASSERT_TRUE(actual.has_value()); - EXPECT_THAT(*actual, HasSubstr("test_prefix")); -} - -TEST(ClientOptionsTest, SetSslTargetNameOverride) { - ClientOptions client_options; - client_options.SetSslTargetNameOverride("test-name"); - - auto args = client_options.channel_arguments(); - auto actual = - GetStringChannelArgument(args, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, "test-name"); - - auto opts = internal::MakeOptions(std::move(client_options)); - args = google::cloud::internal::MakeChannelArguments(opts); - actual = GetStringChannelArgument(args, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); - ASSERT_TRUE(actual.has_value()); - EXPECT_EQ(*actual, "test-name"); -} - -TEST(ClientOptionsTest, UserAgentPrefix) { - std::string const actual = ClientOptions::UserAgentPrefix(); - EXPECT_THAT(actual, HasSubstr("gl-cpp/")); -} - -TEST(ClientOptionsTest, RefreshPeriod) { - auto options = ClientOptions(); - EXPECT_LE(options.min_conn_refresh_period(), - options.max_conn_refresh_period()); - using ms = std::chrono::milliseconds; - - options.set_min_conn_refresh_period(ms(1000)); - EXPECT_EQ(1000, options.min_conn_refresh_period().count()); - - options.set_max_conn_refresh_period(ms(2000)); - EXPECT_EQ(2000, options.max_conn_refresh_period().count()); - - options.set_min_conn_refresh_period(ms(3000)); - EXPECT_EQ(3000, options.min_conn_refresh_period().count()); - EXPECT_EQ(3000, options.max_conn_refresh_period().count()); - - options.set_max_conn_refresh_period(ms(1500)); - EXPECT_EQ(1500, options.min_conn_refresh_period().count()); - EXPECT_EQ(1500, options.max_conn_refresh_period().count()); - - options.set_max_conn_refresh_period(ms(5000)); - EXPECT_EQ(1500, options.min_conn_refresh_period().count()); - EXPECT_EQ(5000, options.max_conn_refresh_period().count()); - - options.set_min_conn_refresh_period(ms(1000)); - EXPECT_EQ(1000, options.min_conn_refresh_period().count()); - EXPECT_EQ(5000, options.max_conn_refresh_period().count()); - - auto opts = internal::MakeOptions(std::move(options)); - EXPECT_EQ(1000, opts.get().count()); - EXPECT_EQ(5000, opts.get().count()); -} - -TEST(ClientOptionsTest, TracingComponents) { - ScopedEnvironment tracing("GOOGLE_CLOUD_CPP_ENABLE_TRACING", "foo,bar"); - auto options = ClientOptions(); - - // Check defaults - EXPECT_TRUE(options.tracing_enabled("foo")); - EXPECT_TRUE(options.tracing_enabled("bar")); - EXPECT_FALSE(options.tracing_enabled("baz")); - - // Edit components - options.enable_tracing("baz"); - EXPECT_TRUE(options.tracing_enabled("baz")); - options.disable_tracing("foo"); - EXPECT_FALSE(options.tracing_enabled("foo")); - - // Check `MakeOptions()` - auto opts = internal::MakeOptions(std::move(options)); - EXPECT_THAT(opts.get(), - testing::UnorderedElementsAre("bar", "baz")); -} - -TEST(ClientOptionsTest, DefaultTracingOptionsNoEnv) { - ScopedEnvironment tracing("GOOGLE_CLOUD_CPP_TRACING_OPTIONS", absl::nullopt); - - ClientOptions client_options; - auto tracing_options = client_options.tracing_options(); - EXPECT_EQ(TracingOptions(), tracing_options); - - auto opts = internal::MakeOptions(std::move(client_options)); - tracing_options = opts.get(); - EXPECT_EQ(TracingOptions(), tracing_options); -} - -TEST(ClientOptionsTest, DefaultTracingOptionsEnv) { - ScopedEnvironment tracing("GOOGLE_CLOUD_CPP_TRACING_OPTIONS", - "single_line_mode=F"); - - ClientOptions client_options; - auto tracing_options = client_options.tracing_options(); - EXPECT_FALSE(tracing_options.single_line_mode()); - - auto opts = internal::MakeOptions(std::move(client_options)); - tracing_options = opts.get(); - EXPECT_FALSE(tracing_options.single_line_mode()); -} - -TEST(ClientOptionsTest, BackgroundThreadPoolSize) { - using ThreadPool = - ::google::cloud::internal::AutomaticallyCreatedBackgroundThreads; - - auto options = ClientOptions(); - // Check that the default value is 0 or 1. Both values result in the - // BackgroundThreadsFactory creating a ThreadPool with a single thread in it. - EXPECT_GE(1U, options.background_thread_pool_size()); - - auto background = options.background_threads_factory()(); - auto* tp = dynamic_cast(background.get()); - ASSERT_NE(nullptr, tp); - EXPECT_EQ(1U, tp->pool_size()); - - options.set_background_thread_pool_size(5U); - EXPECT_EQ(5U, options.background_thread_pool_size()); - - background = options.background_threads_factory()(); - tp = dynamic_cast(background.get()); - ASSERT_NE(nullptr, tp); - EXPECT_EQ(5U, tp->pool_size()); - - auto opts = internal::MakeOptions(std::move(options)); - EXPECT_EQ(5U, opts.get()); - EXPECT_FALSE(opts.has()); -} - -TEST(ClientOptionsTest, CustomBackgroundThreads) { - auto check = [](CompletionQueue& cq, - std::unique_ptr background) { - using ms = std::chrono::milliseconds; - - // Schedule some work that cannot execute because there is no thread - // draining the completion queue. - promise p; - auto background_thread_id = p.get_future(); - background->cq().RunAsync( - [&p](CompletionQueue&) { p.set_value(std::this_thread::get_id()); }); - EXPECT_NE(std::future_status::ready, background_thread_id.wait_for(ms(10))); - - // Verify we can create our own threads to drain the completion queue. - std::thread t([&cq] { cq.Run(); }); - EXPECT_EQ(t.get_id(), background_thread_id.get()); - - cq.Shutdown(); - t.join(); - }; - - CompletionQueue cq; - auto client_options = ClientOptions().DisableBackgroundThreads(cq); - auto background = client_options.background_threads_factory()(); - - check(cq, std::move(background)); - - cq = CompletionQueue(); - client_options = ClientOptions().DisableBackgroundThreads(cq); - auto opts = internal::MakeOptions(std::move(client_options)); - background = - google::cloud::internal::MakeBackgroundThreadsFactory(std::move(opts))(); - - check(cq, std::move(background)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/cluster_config.h b/google/cloud/bigtable/cluster_config.h index 7902116895f4b..465f96725e161 100644 --- a/google/cloud/bigtable/cluster_config.h +++ b/google/cloud/bigtable/cluster_config.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_CLUSTER_CONFIG_H #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/cluster_list_responses.h b/google/cloud/bigtable/cluster_list_responses.h index fad0e53e6c655..ad51ea6627955 100644 --- a/google/cloud/bigtable/cluster_list_responses.h +++ b/google/cloud/bigtable/cluster_list_responses.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_CLUSTER_LIST_RESPONSES_H #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" #include #include diff --git a/google/cloud/bigtable/column_family.h b/google/cloud/bigtable/column_family.h index 76cb5e3a8c1cc..28c898df25139 100644 --- a/google/cloud/bigtable/column_family.h +++ b/google/cloud/bigtable/column_family.h @@ -17,8 +17,8 @@ #include "google/cloud/bigtable/version.h" #include "absl/meta/type_traits.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.pb.h" +#include "google/bigtable/admin/v2/table.pb.h" #include #include #include diff --git a/google/cloud/bigtable/config.cmake.in b/google/cloud/bigtable/config.cmake.in index 08da71ca1ef59..132b672e71812 100644 --- a/google/cloud/bigtable/config.cmake.in +++ b/google/cloud/bigtable/config.cmake.in @@ -19,6 +19,5 @@ find_dependency(google_cloud_cpp_common) find_dependency(google_cloud_cpp_grpc_utils) find_dependency(google_cloud_cpp_opentelemetry) find_dependency(absl) -find_dependency(Crc32c) include("${CMAKE_CURRENT_LIST_DIR}/google_cloud_cpp_bigtable-targets.cmake") diff --git a/google/cloud/bigtable/data_client.cc b/google/cloud/bigtable/data_client.cc deleted file mode 100644 index 9932d24c541e7..0000000000000 --- a/google/cloud/bigtable/data_client.cc +++ /dev/null @@ -1,242 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/internal/common_client.h" -#include "google/cloud/bigtable/internal/logging_data_client.h" -#include "google/cloud/internal/log_wrapper.h" -#include "google/cloud/log.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -namespace btproto = ::google::bigtable::v2; - -std::unique_ptr< - ::grpc::ClientAsyncReaderInterface> -// NOLINTNEXTLINE(performance-unnecessary-value-param) -DataClient::PrepareAsyncSampleRowKeys(grpc::ClientContext*, - btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - return nullptr; -} - -namespace { - -// TODO(#8800) - remove after `DataClient` deprecation is complete -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -/** - * Implement a simple DataClient. - * - * This implementation does not support multiple threads, or refresh - * authorization tokens. In other words, it is extremely bare bones. - */ -class DefaultDataClient : public DataClient { - public: - DefaultDataClient(std::string project, std::string instance, - Options options = {}) - : project_(std::move(project)), - instance_(std::move(instance)), - authority_(options.get()), - user_project_( - options.has() - ? absl::make_optional(options.get()) - : absl::nullopt), - impl_(std::move(options)) {} - - std::string const& project_id() const override { return project_; }; - std::string const& instance_id() const override { return instance_; }; - - std::shared_ptr Channel() override { return impl_.Channel(); } - void reset() override { impl_.reset(); } - - grpc::Status MutateRow(grpc::ClientContext* context, - btproto::MutateRowRequest const& request, - btproto::MutateRowResponse* response) override { - ApplyOptions(context); - return impl_.Stub()->MutateRow(context, request, response); - } - - std::unique_ptr< - grpc::ClientAsyncResponseReaderInterface> - AsyncMutateRow(grpc::ClientContext* context, - btproto::MutateRowRequest const& request, - grpc::CompletionQueue* cq) override { - ApplyOptions(context); - return impl_.Stub()->AsyncMutateRow(context, request, cq); - } - - grpc::Status CheckAndMutateRow( - grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - btproto::CheckAndMutateRowResponse* response) override { - ApplyOptions(context); - return impl_.Stub()->CheckAndMutateRow(context, request, response); - } - - std::unique_ptr> - AsyncCheckAndMutateRow(grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) override { - ApplyOptions(context); - return impl_.Stub()->AsyncCheckAndMutateRow(context, request, cq); - } - - grpc::Status ReadModifyWriteRow( - grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - btproto::ReadModifyWriteRowResponse* response) override { - ApplyOptions(context); - return impl_.Stub()->ReadModifyWriteRow(context, request, response); - } - - std::unique_ptr> - AsyncReadModifyWriteRow(grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) override { - ApplyOptions(context); - return impl_.Stub()->AsyncReadModifyWriteRow(context, request, cq); - } - - std::unique_ptr> - ReadRows(grpc::ClientContext* context, - btproto::ReadRowsRequest const& request) override { - ApplyOptions(context); - return impl_.Stub()->ReadRows(context, request); - } - - std::unique_ptr> - AsyncReadRows(grpc::ClientContext* context, - btproto::ReadRowsRequest const& request, - grpc::CompletionQueue* cq, void* tag) override { - ApplyOptions(context); - return impl_.Stub()->AsyncReadRows(context, request, cq, tag); - } - - std::unique_ptr<::grpc::ClientAsyncReaderInterface> - PrepareAsyncReadRows(grpc::ClientContext* context, - btproto::ReadRowsRequest const& request, - grpc::CompletionQueue* cq) override { - ApplyOptions(context); - return impl_.Stub()->PrepareAsyncReadRows(context, request, cq); - } - - std::unique_ptr> - SampleRowKeys(grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request) override { - ApplyOptions(context); - return impl_.Stub()->SampleRowKeys(context, request); - } - - std::unique_ptr< - ::grpc::ClientAsyncReaderInterface> - AsyncSampleRowKeys(grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request, - grpc::CompletionQueue* cq, void* tag) override { - ApplyOptions(context); - return impl_.Stub()->AsyncSampleRowKeys(context, request, cq, tag); - } - - std::unique_ptr< - ::grpc::ClientAsyncReaderInterface> - PrepareAsyncSampleRowKeys(grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request, - grpc::CompletionQueue* cq) override { - ApplyOptions(context); - return impl_.Stub()->PrepareAsyncSampleRowKeys(context, request, cq); - } - - std::unique_ptr> - MutateRows(grpc::ClientContext* context, - btproto::MutateRowsRequest const& request) override { - ApplyOptions(context); - return impl_.Stub()->MutateRows(context, request); - } - - std::unique_ptr< - ::grpc::ClientAsyncReaderInterface> - AsyncMutateRows(grpc::ClientContext* context, - btproto::MutateRowsRequest const& request, - grpc::CompletionQueue* cq, void* tag) override { - ApplyOptions(context); - return impl_.Stub()->AsyncMutateRows(context, request, cq, tag); - } - - std::unique_ptr< - ::grpc::ClientAsyncReaderInterface> - PrepareAsyncMutateRows(grpc::ClientContext* context, - btproto::MutateRowsRequest const& request, - grpc::CompletionQueue* cq) override { - ApplyOptions(context); - return impl_.Stub()->PrepareAsyncMutateRows(context, request, cq); - } - - private: - google::cloud::BackgroundThreadsFactory BackgroundThreadsFactory() override { - return impl_.BackgroundThreadsFactory(); - } - - void ApplyOptions(grpc::ClientContext* context) { - if (!authority_.empty()) context->set_authority(authority_); - if (user_project_) { - context->AddMetadata("x-goog-user-project", *user_project_); - } - } - - std::string project_; - std::string instance_; - std::string authority_; - absl::optional user_project_; - internal::CommonClient impl_; -}; - -// TODO(#8800) - remove after `DataClient` deprecation is complete -#include "google/cloud/internal/diagnostics_pop.inc" - -} // namespace - -std::shared_ptr MakeDataClient(std::string project_id, - std::string instance_id, - Options options) { - options = internal::DefaultDataOptions(std::move(options)); - bool tracing_enabled = google::cloud::internal::Contains( - options.get(), "rpc"); - auto tracing_options = options.get(); - - std::shared_ptr client = std::make_shared( - std::move(project_id), std::move(instance_id), std::move(options)); - if (tracing_enabled) { - GCP_LOG(INFO) << "Enabled logging for gRPC calls"; - client = std::make_shared( - std::move(client), std::move(tracing_options)); - } - return client; -} - -std::shared_ptr CreateDefaultDataClient(std::string project_id, - std::string instance_id, - ClientOptions options) { - return MakeDataClient(std::move(project_id), std::move(instance_id), - internal::MakeOptions(std::move(options))); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/data_client.h b/google/cloud/bigtable/data_client.h deleted file mode 100644 index 99b8ce658bf97..0000000000000 --- a/google/cloud/bigtable/data_client.h +++ /dev/null @@ -1,235 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_DATA_CLIENT_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_DATA_CLIENT_H - -#include "google/cloud/bigtable/client_options.h" -#include "google/cloud/bigtable/completion_queue.h" -#include "google/cloud/bigtable/row.h" -#include "google/cloud/bigtable/version.h" -#include -#include - -namespace google { -namespace cloud { -// Forward declare some classes so we can be friends. -namespace bigtable_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -class BulkMutator; -class LegacyAsyncRowReader; -class LegacyRowReader; -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable_internal -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -class Table; -namespace internal { -class AsyncRetryBulkApply; -class LegacyAsyncRowSampler; -class LoggingDataClient; -} // namespace internal - -/** - * Connects to Cloud Bigtable's data manipulation APIs. - * - * This class is used by the Cloud Bigtable wrappers to access Cloud Bigtable. - * Multiple `bigtable::Table` objects may share a connection via a single - * `DataClient` object. The `DataClient` object is configured at construction - * time, this configuration includes the credentials, access endpoints, default - * timeouts, and other gRPC configuration options. This is an interface class - * because it is also used as a dependency injection point in some of the tests. - * - * @par Cost - * Applications should avoid unnecessarily creating new objects of type - * `DataClient`. Creating a new object of this type typically requires - * connecting to the Cloud Bigtable servers, and performing the authentication - * workflows with Google Cloud Platform. These operations can take many - * milliseconds, therefore applications should try to reuse the same - * `DataClient` instances when possible. - * - * @deprecated #google::cloud::bigtable::DataConnection is the preferred way to - * communicate with the Bigtable Data API. To migrate existing code, see - * @ref migrating-from-dataclient "Migrating from DataClient". - */ -class DataClient { - public: - virtual ~DataClient() = default; - - virtual std::string const& project_id() const = 0; - virtual std::string const& instance_id() const = 0; - - /** - * Return a new channel to handle admin operations. - * - * Intended to access rarely used services in the same endpoints as the - * Bigtable admin interfaces, for example, the google.longrunning.Operations. - * - * @deprecated This member function is scheduled for deletion and `DataClient` - * will be marked as `final`. Do not extend this class. Application - * developers who need to configure the gRPC Channel can pass any of the - * following options into `MakeDataClient(...)`: - * * `google::cloud::GrpcChannelArgumentsOption` - * * `google::cloud::GrpcChannelArgumentsNativeOption` - */ - GOOGLE_CLOUD_CPP_BIGTABLE_DATA_CLIENT_DEPRECATED("Channel()") - virtual std::shared_ptr Channel() = 0; - - /** - * Reset and create new Channels. - * - * @deprecated This member function is scheduled for deletion and `DataClient` - * will be marked as `final`. Do not extend this class. The client library - * will handle all interactions with the gRPC channels. - */ - GOOGLE_CLOUD_CPP_BIGTABLE_DATA_CLIENT_DEPRECATED("reset()") - virtual void reset() = 0; - - /** - * The thread factory this client was created with. - * - * @deprecated This member function is scheduled for deletion and `DataClient` - * will be marked as `final`. Do not extend this class. Application - * developers who need to configure the background threads can pass any - * of the following options into `MakeDataClient(...)`: - * * `google::cloud::GrpcBackgroundThreadPoolSizeOption` - * * `google::cloud::GrpcCompletionQueueOption` - * * `google::cloud::GrpcBackgroundThreadFactoryOption` - */ - virtual google::cloud::BackgroundThreadsFactory - BackgroundThreadsFactory() = 0; - - // The member functions of this class are not intended for general use by - // application developers (they are simply a dependency injection point). Make - // them protected, so the mock classes can override them, and then make the - // classes that do use them friends. - protected: - friend class Table; - friend class internal::AsyncRetryBulkApply; - friend class internal::LegacyAsyncRowSampler; - friend class bigtable_internal::BulkMutator; - friend class bigtable_internal::LegacyRowReader; - friend class bigtable_internal::LegacyAsyncRowReader; - friend class internal::LoggingDataClient; - - ///@{ - /// @name the `google.bigtable.v2.Bigtable` wrappers. - virtual grpc::Status MutateRow( - grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - google::bigtable::v2::MutateRowResponse* response) = 0; - virtual std::unique_ptr> - AsyncMutateRow(grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - grpc::CompletionQueue* cq) = 0; - virtual grpc::Status CheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - google::bigtable::v2::CheckAndMutateRowResponse* response) = 0; - virtual std::unique_ptr> - AsyncCheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) = 0; - virtual grpc::Status ReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - google::bigtable::v2::ReadModifyWriteRowResponse* response) = 0; - virtual std::unique_ptr> - AsyncReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) = 0; - virtual std::unique_ptr< - grpc::ClientReaderInterface> - ReadRows(grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request) = 0; - virtual std::unique_ptr< - grpc::ClientAsyncReaderInterface> - AsyncReadRows(grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request, - grpc::CompletionQueue* cq, void* tag) = 0; - virtual std::unique_ptr<::grpc::ClientAsyncReaderInterface< - google::bigtable::v2::ReadRowsResponse>> - PrepareAsyncReadRows(::grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request, - grpc::CompletionQueue* cq) = 0; - virtual std::unique_ptr< - grpc::ClientReaderInterface> - SampleRowKeys(grpc::ClientContext* context, - google::bigtable::v2::SampleRowKeysRequest const& request) = 0; - virtual std::unique_ptr<::grpc::ClientAsyncReaderInterface< - google::bigtable::v2::SampleRowKeysResponse>> - AsyncSampleRowKeys(grpc::ClientContext* context, - google::bigtable::v2::SampleRowKeysRequest const& request, - grpc::CompletionQueue* cq, void* tag) = 0; - virtual std::unique_ptr<::grpc::ClientAsyncReaderInterface< - google::bigtable::v2::SampleRowKeysResponse>> - PrepareAsyncSampleRowKeys( - grpc::ClientContext* context, - google::bigtable::v2::SampleRowKeysRequest const& request, - grpc::CompletionQueue* cq); - virtual std::unique_ptr< - grpc::ClientReaderInterface> - MutateRows(grpc::ClientContext* context, - google::bigtable::v2::MutateRowsRequest const& request) = 0; - virtual std::unique_ptr<::grpc::ClientAsyncReaderInterface< - google::bigtable::v2::MutateRowsResponse>> - AsyncMutateRows(::grpc::ClientContext* context, - google::bigtable::v2::MutateRowsRequest const& request, - grpc::CompletionQueue* cq, void* tag) = 0; - virtual std::unique_ptr<::grpc::ClientAsyncReaderInterface< - google::bigtable::v2::MutateRowsResponse>> - PrepareAsyncMutateRows(grpc::ClientContext* context, - google::bigtable::v2::MutateRowsRequest const& request, - grpc::CompletionQueue* cq) = 0; - ///@} -}; - -/// Create a new data client configured via @p options. -std::shared_ptr MakeDataClient(std::string project_id, - std::string instance_id, - Options options = {}); - -/** - * Create a new data client configured via @p options. - * - * @deprecated use the `MakeDataClient` method which accepts - * `google::cloud::Options` instead. - */ -GOOGLE_CLOUD_CPP_DEPRECATED("use `MakeDataClient` instead") -std::shared_ptr CreateDefaultDataClient(std::string project_id, - std::string instance_id, - ClientOptions options); - -/** - * Return the fully qualified instance name for the @p client. - * - * Compute the full path of the instance associated with the client, i.e., - * `projects/instances/project_id()>/instances/instance_id()>` - */ -inline std::string InstanceName(std::shared_ptr const& client) { - return "projects/" + client->project_id() + "/instances/" + - client->instance_id(); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_DATA_CLIENT_H diff --git a/google/cloud/bigtable/data_client_test.cc b/google/cloud/bigtable/data_client_test.cc deleted file mode 100644 index 2fcc28caad549..0000000000000 --- a/google/cloud/bigtable/data_client_test.cc +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/internal/logging_data_client.h" -#include "google/cloud/testing_util/scoped_environment.h" -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -// TODO(#8800) - remove after `DataClient` deprecation is complete -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -TEST(DataClientTest, Default) { - auto data_client = - CreateDefaultDataClient("test-project", "test-instance", - ClientOptions().set_connection_pool_size(1)); - ASSERT_TRUE(data_client); - EXPECT_EQ("test-project", data_client->project_id()); - EXPECT_EQ("test-instance", data_client->instance_id()); - - auto channel0 = data_client->Channel(); - EXPECT_TRUE(channel0); - - auto channel1 = data_client->Channel(); - EXPECT_EQ(channel0.get(), channel1.get()); - - data_client->reset(); - channel1 = data_client->Channel(); - EXPECT_TRUE(channel1); - EXPECT_NE(channel0.get(), channel1.get()); -} - -TEST(DataClientTest, MakeClient) { - auto data_client = MakeDataClient("test-project", "test-instance", - Options{}.set(1)); - ASSERT_TRUE(data_client); - EXPECT_EQ("test-project", data_client->project_id()); - EXPECT_EQ("test-instance", data_client->instance_id()); - - auto channel0 = data_client->Channel(); - EXPECT_TRUE(channel0); - - auto channel1 = data_client->Channel(); - EXPECT_EQ(channel0.get(), channel1.get()); - - data_client->reset(); - channel1 = data_client->Channel(); - EXPECT_TRUE(channel1); - EXPECT_NE(channel0.get(), channel1.get()); -} - -// TODO(#8800) - remove after `DataClient` deprecation is complete -#include "google/cloud/internal/diagnostics_pop.inc" - -TEST(DataClientTest, Logging) { - testing_util::ScopedEnvironment env("GOOGLE_CLOUD_CPP_ENABLE_TRACING", "rpc"); - - auto data_client = MakeDataClient("test-project", "test-instance"); - ASSERT_TRUE(data_client); - ASSERT_TRUE( - dynamic_cast(data_client.get())) - << "Should create LoggingDataClient"; -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/data_connection.h b/google/cloud/bigtable/data_connection.h index edfdc52e2a015..2ff911892880a 100644 --- a/google/cloud/bigtable/data_connection.h +++ b/google/cloud/bigtable/data_connection.h @@ -180,7 +180,6 @@ class DataConnection { * - `google::cloud::GrpcOptionList` * - `google::cloud::UnifiedCredentialsOptionList` * - `google::cloud::bigtable::AppProfileIdOption` - * - `google::cloud::bigtable::ClientOptionsList` * - `google::cloud::bigtable::DataPolicyOptionList` * * @note Unrecognized options will be ignored. To debug issues with options set diff --git a/google/cloud/bigtable/data_connection_test.cc b/google/cloud/bigtable/data_connection_test.cc index 2a428214bca96..e51d7f38819e8 100644 --- a/google/cloud/bigtable/data_connection_test.cc +++ b/google/cloud/bigtable/data_connection_test.cc @@ -54,7 +54,6 @@ TEST(MakeDataConnection, DefaultsOptions) { << "User supplied Options are overridden in MakeDataConnection()"; } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -81,7 +80,6 @@ TEST(MakeDataConnection, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/examples/BUILD.bazel b/google/cloud/bigtable/examples/BUILD.bazel index b913265c91f30..eb88603b9db78 100644 --- a/google/cloud/bigtable/examples/BUILD.bazel +++ b/google/cloud/bigtable/examples/BUILD.bazel @@ -31,8 +31,8 @@ cc_library( "//:grpc_utils", "//google/cloud/bigtable:bigtable_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", ], ) @@ -50,7 +50,7 @@ filtered_unit_tests = [test for test in bigtable_examples_unit_tests if not test "//:grpc_utils", "//google/cloud/bigtable:bigtable_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in filtered_unit_tests] @@ -60,7 +60,7 @@ cc_test( deps = [ "//google/cloud/bigtable:google_cloud_cpp_bigtable", "//google/cloud/bigtable:google_cloud_cpp_bigtable_mocks", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/bigtable/examples/bigtable_instance_admin_snippets.cc b/google/cloud/bigtable/examples/bigtable_instance_admin_snippets.cc index 0f7984a08ad8b..3ae4f9e1c1c2c 100644 --- a/google/cloud/bigtable/examples/bigtable_instance_admin_snippets.cc +++ b/google/cloud/bigtable/examples/bigtable_instance_admin_snippets.cc @@ -23,6 +23,7 @@ #include "google/cloud/location.h" #include "google/cloud/log.h" #include "google/cloud/project.h" +#include "absl/strings/match.h" #include namespace { diff --git a/google/cloud/bigtable/examples/data_snippets.cc b/google/cloud/bigtable/examples/data_snippets.cc index 1b849dbd47a87..f261a2acdc796 100644 --- a/google/cloud/bigtable/examples/data_snippets.cc +++ b/google/cloud/bigtable/examples/data_snippets.cc @@ -17,6 +17,7 @@ #include "google/cloud/bigtable/resource_names.h" #include "google/cloud/bigtable/testing/cleanup_stale_resources.h" #include "google/cloud/bigtable/testing/random_names.h" +#include "google/cloud/grpc_options.h" //! [bigtable includes] #include "google/cloud/bigtable/client.h" #include "google/cloud/bigtable/table.h" diff --git a/google/cloud/bigtable/expr.h b/google/cloud/bigtable/expr.h index 17a072ab3fbfa..1804f47dd12db 100644 --- a/google/cloud/bigtable/expr.h +++ b/google/cloud/bigtable/expr.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_EXPR_H #include "google/cloud/bigtable/version.h" -#include +#include "google/type/expr.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/filters.h b/google/cloud/bigtable/filters.h index ea3a4671947ab..5e93c549605cd 100644 --- a/google/cloud/bigtable/filters.h +++ b/google/cloud/bigtable/filters.h @@ -17,7 +17,7 @@ #include "google/cloud/bigtable/version.h" #include "absl/meta/type_traits.h" -#include +#include "google/bigtable/v2/data.pb.h" #include #include #include diff --git a/google/cloud/bigtable/google_cloud_cpp_bigtable.bzl b/google/cloud/bigtable/google_cloud_cpp_bigtable.bzl index c5d4f47beff0b..18e4940539f6a 100644 --- a/google/cloud/bigtable/google_cloud_cpp_bigtable.bzl +++ b/google/cloud/bigtable/google_cloud_cpp_bigtable.bzl @@ -47,17 +47,14 @@ google_cloud_cpp_bigtable_hdrs = [ "admin/internal/bigtable_table_admin_tracing_stub.h", "admin_client.h", "app_profile_config.h", - "async_row_reader.h", "bound_query.h", "bytes.h", "cell.h", "client.h", - "client_options.h", "cluster_config.h", "cluster_list_responses.h", "column_family.h", "completion_queue.h", - "data_client.h", "data_connection.h", "expr.h", "filters.h", @@ -95,12 +92,8 @@ google_cloud_cpp_bigtable_hdrs = [ "internal/data_tracing_connection.h", "internal/default_row_reader.h", "internal/defaults.h", + "internal/endpoint_options.h", "internal/google_bytes_traits.h", - "internal/legacy_async_bulk_apply.h", - "internal/legacy_async_row_reader.h", - "internal/legacy_async_row_sampler.h", - "internal/legacy_row_reader.h", - "internal/logging_data_client.h", "internal/logging_result_set_reader.h", "internal/metrics.h", "internal/mutate_rows_limiter.h", @@ -183,9 +176,7 @@ google_cloud_cpp_bigtable_srcs = [ "bound_query.cc", "bytes.cc", "client.cc", - "client_options.cc", "cluster_config.cc", - "data_client.cc", "data_connection.cc", "expr.cc", "iam_binding.cc", @@ -218,11 +209,6 @@ google_cloud_cpp_bigtable_srcs = [ "internal/default_row_reader.cc", "internal/defaults.cc", "internal/google_bytes_traits.cc", - "internal/legacy_async_bulk_apply.cc", - "internal/legacy_async_row_reader.cc", - "internal/legacy_async_row_sampler.cc", - "internal/legacy_row_reader.cc", - "internal/logging_data_client.cc", "internal/logging_result_set_reader.cc", "internal/metrics.cc", "internal/mutate_rows_limiter.cc", diff --git a/google/cloud/bigtable/iam_binding.h b/google/cloud/bigtable/iam_binding.h index e50af5eaf3224..4c61d14f1ccf2 100644 --- a/google/cloud/bigtable/iam_binding.h +++ b/google/cloud/bigtable/iam_binding.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_IAM_BINDING_H #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" #include #include #include diff --git a/google/cloud/bigtable/instance_admin_client.cc b/google/cloud/bigtable/instance_admin_client.cc index d95811843a370..1309858e2d537 100644 --- a/google/cloud/bigtable/instance_admin_client.cc +++ b/google/cloud/bigtable/instance_admin_client.cc @@ -27,12 +27,6 @@ std::shared_ptr MakeInstanceAdminClient( new InstanceAdminClient(std::move(project), std::move(options))); } -std::shared_ptr CreateDefaultInstanceAdminClient( - std::string project, ClientOptions options) { - return MakeInstanceAdminClient(std::move(project), - internal::MakeOptions(std::move(options))); -} - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable } // namespace cloud diff --git a/google/cloud/bigtable/instance_admin_client.h b/google/cloud/bigtable/instance_admin_client.h index 7bdf232416a50..e5c9e1acfb394 100644 --- a/google/cloud/bigtable/instance_admin_client.h +++ b/google/cloud/bigtable/instance_admin_client.h @@ -16,7 +16,6 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INSTANCE_ADMIN_CLIENT_H #include "google/cloud/bigtable/admin/bigtable_instance_admin_connection.h" -#include "google/cloud/bigtable/client_options.h" #include "google/cloud/bigtable/version.h" #include #include @@ -62,16 +61,6 @@ class InstanceAdminClient final { std::shared_ptr MakeInstanceAdminClient( std::string project, Options options = {}); -/** - * Create a new instance admin client configured via @p options. - * - * @deprecated use the `MakeInstanceAdminClient` method which accepts - * `google::cloud::Options` instead. - */ -GOOGLE_CLOUD_CPP_DEPRECATED("use `MakeInstanceAdminClient` instead") -std::shared_ptr CreateDefaultInstanceAdminClient( - std::string project, ClientOptions options); - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable } // namespace cloud diff --git a/google/cloud/bigtable/instance_admin_client_test.cc b/google/cloud/bigtable/instance_admin_client_test.cc index 2d86e882d2965..a6cff0f75240a 100644 --- a/google/cloud/bigtable/instance_admin_client_test.cc +++ b/google/cloud/bigtable/instance_admin_client_test.cc @@ -21,16 +21,6 @@ namespace bigtable { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -TEST(InstanceAdminClientTest, CreateDefaultClient) { - auto admin_client = CreateDefaultInstanceAdminClient("test-project", {}); - ASSERT_TRUE(admin_client); - EXPECT_EQ("test-project", admin_client->project()); -} - -#include "google/cloud/internal/diagnostics_pop.inc" - TEST(InstanceAdminClientTest, MakeClient) { auto admin_client = MakeInstanceAdminClient("test-project"); ASSERT_TRUE(admin_client); diff --git a/google/cloud/bigtable/instance_admin_test.cc b/google/cloud/bigtable/instance_admin_test.cc index a556750b81985..433eb80c5dc89 100644 --- a/google/cloud/bigtable/instance_admin_test.cc +++ b/google/cloud/bigtable/instance_admin_test.cc @@ -15,6 +15,7 @@ #include "google/cloud/bigtable/instance_admin.h" #include "google/cloud/bigtable/admin/mocks/mock_bigtable_instance_admin_connection.h" #include "google/cloud/bigtable/testing/mock_policies.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/location.h" #include "google/cloud/project.h" #include "google/cloud/testing_util/status_matchers.h" diff --git a/google/cloud/bigtable/instance_config.h b/google/cloud/bigtable/instance_config.h index bf108661cd3d4..c564067e8c4e3 100644 --- a/google/cloud/bigtable/instance_config.h +++ b/google/cloud/bigtable/instance_config.h @@ -17,8 +17,8 @@ #include "google/cloud/bigtable/cluster_config.h" #include "google/cloud/bigtable/version.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" +#include "google/bigtable/admin/v2/common.pb.h" #include #include diff --git a/google/cloud/bigtable/instance_list_responses.h b/google/cloud/bigtable/instance_list_responses.h index 3f098603de276..f06a3d1b3350d 100644 --- a/google/cloud/bigtable/instance_list_responses.h +++ b/google/cloud/bigtable/instance_list_responses.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INSTANCE_LIST_RESPONSES_H #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" #include #include diff --git a/google/cloud/bigtable/instance_update_config.h b/google/cloud/bigtable/instance_update_config.h index 9bcc5f9f22cda..35fbac87b060c 100644 --- a/google/cloud/bigtable/instance_update_config.h +++ b/google/cloud/bigtable/instance_update_config.h @@ -18,8 +18,8 @@ #include "google/cloud/bigtable/cluster_config.h" #include "google/cloud/bigtable/version.h" #include "google/cloud/internal/algorithm.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.pb.h" +#include "google/bigtable/admin/v2/common.pb.h" #include #include diff --git a/google/cloud/bigtable/internal/async_bulk_apply.cc b/google/cloud/bigtable/internal/async_bulk_apply.cc index e19c3a0ffddfb..1039aa862b30b 100644 --- a/google/cloud/bigtable/internal/async_bulk_apply.cc +++ b/google/cloud/bigtable/internal/async_bulk_apply.cc @@ -14,6 +14,7 @@ #include "google/cloud/bigtable/internal/async_bulk_apply.h" #include "google/cloud/bigtable/internal/async_streaming_read.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/grpc_opentelemetry.h" #include "google/cloud/internal/retry_loop_helpers.h" diff --git a/google/cloud/bigtable/internal/async_bulk_apply_test.cc b/google/cloud/bigtable/internal/async_bulk_apply_test.cc index d8304717c466b..f860d202df592 100644 --- a/google/cloud/bigtable/internal/async_bulk_apply_test.cc +++ b/google/cloud/bigtable/internal/async_bulk_apply_test.cc @@ -16,6 +16,7 @@ #include "google/cloud/bigtable/internal/operation_context.h" #include "google/cloud/bigtable/testing/mock_bigtable_stub.h" #include "google/cloud/bigtable/testing/mock_mutate_rows_limiter.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/async_streaming_read_rpc_impl.h" #include "google/cloud/internal/background_threads_impl.h" #ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS @@ -1119,7 +1120,6 @@ TEST_F(AsyncBulkApplyTest, BigtableCookie) { CheckFailedMutations(actual.get(), expected); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::SpanNamed; @@ -1191,7 +1191,6 @@ TEST_F(AsyncBulkApplyTest, CallSpanActiveThroughout) { auto overlay = opentelemetry::trace::Scope(internal::MakeSpan("overlay")); (void)f.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/internal/async_row_reader_test.cc b/google/cloud/bigtable/internal/async_row_reader_test.cc index 41dfec788c604..b742726626875 100644 --- a/google/cloud/bigtable/internal/async_row_reader_test.cc +++ b/google/cloud/bigtable/internal/async_row_reader_test.cc @@ -1733,7 +1733,6 @@ TEST_F(AsyncRowReaderTest, BigtableCookie) { std::make_shared()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::SpanNamed; @@ -1811,7 +1810,6 @@ TEST_F(AsyncRowReaderTest, CallSpanActiveThroughout) { // Block until the async call has completed. p.get_future().get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable_internal diff --git a/google/cloud/bigtable/internal/async_row_sampler_test.cc b/google/cloud/bigtable/internal/async_row_sampler_test.cc index 5a88ade0c8f84..8593f32811c88 100644 --- a/google/cloud/bigtable/internal/async_row_sampler_test.cc +++ b/google/cloud/bigtable/internal/async_row_sampler_test.cc @@ -772,7 +772,6 @@ TEST_F(AsyncSampleRowKeysTest, BigtableCookie) { EXPECT_THAT(sor, StatusIs(StatusCode::kPermissionDenied, HasSubstr("fail"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::SpanNamed; @@ -838,7 +837,6 @@ TEST_F(AsyncSampleRowKeysTest, CallSpanActiveThroughout) { auto overlay = opentelemetry::trace::Scope(internal::MakeSpan("overlay")); (void)f.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/internal/bigtable_auth_decorator.cc b/google/cloud/bigtable/internal/bigtable_auth_decorator.cc index f81eb363768b5..fd9270d7e5aed 100644 --- a/google/cloud/bigtable/internal/bigtable_auth_decorator.cc +++ b/google/cloud/bigtable/internal/bigtable_auth_decorator.cc @@ -18,7 +18,7 @@ #include "google/cloud/bigtable/internal/bigtable_auth_decorator.h" #include "google/cloud/internal/async_streaming_read_rpc_auth.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/internal/bigtable_logging_decorator.cc b/google/cloud/bigtable/internal/bigtable_logging_decorator.cc index a5fe8ed5a200e..38c3fa582216e 100644 --- a/google/cloud/bigtable/internal/bigtable_logging_decorator.cc +++ b/google/cloud/bigtable/internal/bigtable_logging_decorator.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/internal/bigtable_metadata_decorator.cc b/google/cloud/bigtable/internal/bigtable_metadata_decorator.cc index 7736c6a92462c..ec07fe2fd0c92 100644 --- a/google/cloud/bigtable/internal/bigtable_metadata_decorator.cc +++ b/google/cloud/bigtable/internal/bigtable_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/internal/bigtable_stub.cc b/google/cloud/bigtable/internal/bigtable_stub.cc index cb00ccb83ffe8..2d16604374264 100644 --- a/google/cloud/bigtable/internal/bigtable_stub.cc +++ b/google/cloud/bigtable/internal/bigtable_stub.cc @@ -20,7 +20,7 @@ #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_streaming_read_rpc_impl.h" #include "google/cloud/status_or.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/internal/bigtable_stub.h b/google/cloud/bigtable/internal/bigtable_stub.h index d9bc25f175d05..eb3ba8862812b 100644 --- a/google/cloud/bigtable/internal/bigtable_stub.h +++ b/google/cloud/bigtable/internal/bigtable_stub.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/internal/bigtable_stub_factory.cc b/google/cloud/bigtable/internal/bigtable_stub_factory.cc index 9d5add4a61c44..8f201cf522438 100644 --- a/google/cloud/bigtable/internal/bigtable_stub_factory.cc +++ b/google/cloud/bigtable/internal/bigtable_stub_factory.cc @@ -29,7 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/log.h" -#include +#include "google/bigtable/v2/feature_flags.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/internal/bigtable_stub_factory_test.cc b/google/cloud/bigtable/internal/bigtable_stub_factory_test.cc index d7b07d00cc171..a94e233fd2928 100644 --- a/google/cloud/bigtable/internal/bigtable_stub_factory_test.cc +++ b/google/cloud/bigtable/internal/bigtable_stub_factory_test.cc @@ -264,7 +264,6 @@ TEST(BigtableStubFactory, FeaturesFlags) { (void)stub->MutateRow(context, Options{}, {}); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -335,7 +334,6 @@ TEST(BigtableStubFactory, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/internal/bigtable_tracing_stub.cc b/google/cloud/bigtable/internal/bigtable_tracing_stub.cc index 2150cb22880ae..9295184d5dbfb 100644 --- a/google/cloud/bigtable/internal/bigtable_tracing_stub.cc +++ b/google/cloud/bigtable/internal/bigtable_tracing_stub.cc @@ -28,8 +28,6 @@ namespace cloud { namespace bigtable_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BigtableTracingStub::BigtableTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -262,15 +260,9 @@ BigtableTracingStub::AsyncPrepareQuery( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBigtableTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/internal/bigtable_tracing_stub.h b/google/cloud/bigtable/internal/bigtable_tracing_stub.h index d006b380ca250..2873553a09e67 100644 --- a/google/cloud/bigtable/internal/bigtable_tracing_stub.h +++ b/google/cloud/bigtable/internal/bigtable_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace bigtable_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BigtableTracingStub : public BigtableStub { public: ~BigtableTracingStub() override = default; @@ -137,8 +135,6 @@ class BigtableTracingStub : public BigtableStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/bigtable/internal/bulk_mutator.cc b/google/cloud/bigtable/internal/bulk_mutator.cc index 7203d23fbd14d..fad9d4342563a 100644 --- a/google/cloud/bigtable/internal/bulk_mutator.cc +++ b/google/cloud/bigtable/internal/bulk_mutator.cc @@ -15,6 +15,7 @@ #include "google/cloud/bigtable/internal/bulk_mutator.h" #include "google/cloud/bigtable/rpc_retry_policy.h" #include "google/cloud/bigtable/table.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/log.h" #include @@ -195,22 +196,6 @@ BulkMutator::BulkMutator(std::string const& app_profile_id, : state_(app_profile_id, table_name, idempotent_policy, std::move(mut)), operation_context_(std::move(operation_context)) {} -grpc::Status BulkMutator::MakeOneRequest(bigtable::DataClient& client, - grpc::ClientContext& client_context) { - // Send the request to the server. - auto const& mutations = state_.BeforeStart(); - auto stream = client.MutateRows(&client_context, mutations); - // Read the stream of responses. - btproto::MutateRowsResponse response; - while (stream->Read(&response)) { - state_.OnRead(std::move(response)); - } - // Handle any errors in the stream. - auto grpc_status = stream->Finish(); - state_.OnFinish(MakeStatusFromRpcError(grpc_status)); - return grpc_status; -} - Status BulkMutator::MakeOneRequest(BigtableStub& stub, MutateRowsLimiter& limiter, Options const& options) { diff --git a/google/cloud/bigtable/internal/bulk_mutator.h b/google/cloud/bigtable/internal/bulk_mutator.h index bd543dc6f0ccc..922c9caeab426 100644 --- a/google/cloud/bigtable/internal/bulk_mutator.h +++ b/google/cloud/bigtable/internal/bulk_mutator.h @@ -16,12 +16,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_BULK_MUTATOR_H #include "google/cloud/bigtable/completion_queue.h" -#include "google/cloud/bigtable/data_client.h" #include "google/cloud/bigtable/idempotent_mutation_policy.h" #include "google/cloud/bigtable/internal/bigtable_stub.h" #include "google/cloud/bigtable/internal/mutate_rows_limiter.h" #include "google/cloud/bigtable/internal/operation_context.h" #include "google/cloud/bigtable/version.h" +#include "google/cloud/idempotency.h" #include "google/cloud/internal/invoke_result.h" #include "google/cloud/status.h" #include @@ -89,7 +89,7 @@ class BulkMutatorState { * request provided by the application. */ int original_index; - Idempotency idempotency; + google::cloud::Idempotency idempotency; /// Set to `false` if the result is unknown. bool has_mutation_result; /** @@ -123,10 +123,6 @@ class BulkMutator { /// Return true if there are pending mutations in the mutator bool HasPendingMutations() const { return state_.HasPendingMutations(); } - /// Synchronously send one batch request to the given stub. - grpc::Status MakeOneRequest(bigtable::DataClient& client, - grpc::ClientContext& client_context); - /// Synchronously send one batch request to the given stub. Status MakeOneRequest(BigtableStub& stub, MutateRowsLimiter& limiter, Options const& options); diff --git a/google/cloud/bigtable/internal/bulk_mutator_test.cc b/google/cloud/bigtable/internal/bulk_mutator_test.cc index 7724da5f21501..e7bf9f7433e9d 100644 --- a/google/cloud/bigtable/internal/bulk_mutator_test.cc +++ b/google/cloud/bigtable/internal/bulk_mutator_test.cc @@ -14,6 +14,7 @@ #include "google/cloud/bigtable/internal/bulk_mutator.h" #include "google/cloud/bigtable/internal/operation_context.h" +#include "google/cloud/grpc_options.h" #ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS #include "google/cloud/bigtable/internal/metrics.h" #include "google/cloud/testing_util/fake_clock.h" diff --git a/google/cloud/bigtable/internal/crc32c.cc b/google/cloud/bigtable/internal/crc32c.cc index 3210fdbefafdd..572c031e69f0c 100644 --- a/google/cloud/bigtable/internal/crc32c.cc +++ b/google/cloud/bigtable/internal/crc32c.cc @@ -14,13 +14,7 @@ #include "google/cloud/bigtable/internal/crc32c.h" #include "absl/base/config.h" -#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION >= 20230125 #include "absl/crc/crc32c.h" -#define GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C 1 -#else -#define GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C 0 -#endif // ABSL_LTS_RELEASE_VERSION -#include namespace google { namespace cloud { @@ -28,8 +22,8 @@ namespace bigtable_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data) { - return crc32c::Extend(crc, reinterpret_cast(data.data()), - data.size()); + return static_cast( + absl::ExtendCrc32c(absl::crc32c_t{crc}, data)); } std::uint32_t ExtendCrc32c(std::uint32_t crc, @@ -47,8 +41,6 @@ std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data) { return crc; } -#if GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C - std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data, std::uint32_t data_crc) { return static_cast(absl::ConcatCrc32c( @@ -69,26 +61,6 @@ std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data, absl::crc32c_t{crc}, absl::crc32c_t{data_crc}, data.size())); } -#else - -std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data, - std::uint32_t /*data_crc*/) { - return ExtendCrc32c(crc, data); -} - -std::uint32_t ExtendCrc32c(std::uint32_t crc, - bigtable_internal::ConstBufferSequence const& data, - std::uint32_t /*data_crc*/) { - return ExtendCrc32c(crc, data); -} - -std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data, - std::uint32_t /*data_crc*/) { - return ExtendCrc32c(crc, data); -} - -#endif // GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable_internal } // namespace cloud diff --git a/google/cloud/bigtable/internal/data_tracing_connection.cc b/google/cloud/bigtable/internal/data_tracing_connection.cc index e7c4942135b62..d97f825eb4fde 100644 --- a/google/cloud/bigtable/internal/data_tracing_connection.cc +++ b/google/cloud/bigtable/internal/data_tracing_connection.cc @@ -21,7 +21,6 @@ namespace cloud { namespace bigtable_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace { std::vector EndBulkApplySpan( @@ -215,15 +214,6 @@ std::shared_ptr MakeDataTracingConnection( return std::make_shared(std::move(conn)); } -#else - -std::shared_ptr MakeDataTracingConnection( - std::shared_ptr conn) { - return conn; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable_internal } // namespace cloud diff --git a/google/cloud/bigtable/internal/data_tracing_connection_test.cc b/google/cloud/bigtable/internal/data_tracing_connection_test.cc index 5e9fadf777fc6..d60ef219b1a07 100644 --- a/google/cloud/bigtable/internal/data_tracing_connection_test.cc +++ b/google/cloud/bigtable/internal/data_tracing_connection_test.cc @@ -26,7 +26,6 @@ namespace bigtable_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::bigtable_mocks::MockDataConnection; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::IsOkAndHolds; @@ -641,7 +640,6 @@ TEST(DataTracingConnection, AsyncReadRowFailure) { Not(SpanHasAttributes( OTelAttribute("gcloud.bigtable.row_found", _)))))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/internal/default_row_reader.cc b/google/cloud/bigtable/internal/default_row_reader.cc index 844bdace38dd2..7cb45dad72e67 100644 --- a/google/cloud/bigtable/internal/default_row_reader.cc +++ b/google/cloud/bigtable/internal/default_row_reader.cc @@ -15,6 +15,7 @@ #include "google/cloud/bigtable/internal/default_row_reader.h" #include "google/cloud/bigtable/table.h" #include "google/cloud/grpc_error_delegate.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/internal/retry_loop_helpers.h" diff --git a/google/cloud/bigtable/internal/default_row_reader_test.cc b/google/cloud/bigtable/internal/default_row_reader_test.cc index bcbd97dfc077e..9c282ad0660cf 100644 --- a/google/cloud/bigtable/internal/default_row_reader_test.cc +++ b/google/cloud/bigtable/internal/default_row_reader_test.cc @@ -16,6 +16,7 @@ #include "google/cloud/bigtable/row_reader.h" #include "google/cloud/bigtable/testing/mock_bigtable_stub.h" #include "google/cloud/bigtable/testing/mock_policies.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/make_status.h" #ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS #include "google/cloud/bigtable/internal/metrics.h" diff --git a/google/cloud/bigtable/internal/defaults.cc b/google/cloud/bigtable/internal/defaults.cc index c7c1cd041ea86..9544730158bda 100644 --- a/google/cloud/bigtable/internal/defaults.cc +++ b/google/cloud/bigtable/internal/defaults.cc @@ -126,20 +126,24 @@ int DefaultConnectionPoolSize() { } Options HandleUniverseDomain(Options opts) { - if (!opts.has()) { + if (!opts.has<::google::cloud::bigtable_internal::DataEndpointOption>()) { auto ep = google::cloud::internal::UniverseDomainEndpoint( "bigtable.googleapis.com", opts); - opts.set(std::move(ep)); + opts.set<::google::cloud::bigtable_internal::DataEndpointOption>( + std::move(ep)); } - if (!opts.has()) { + if (!opts.has<::google::cloud::bigtable_internal::AdminEndpointOption>()) { auto ep = google::cloud::internal::UniverseDomainEndpoint( "bigtableadmin.googleapis.com", opts); - opts.set(std::move(ep)); + opts.set<::google::cloud::bigtable_internal::AdminEndpointOption>( + std::move(ep)); } - if (!opts.has()) { + if (!opts.has< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()) { auto ep = google::cloud::internal::UniverseDomainEndpoint( "bigtableadmin.googleapis.com", opts); - opts.set(std::move(ep)); + opts.set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + std::move(ep)); } return opts; } @@ -153,14 +157,16 @@ Options DefaultOptions(Options opts) { if (opts.has()) { auto const& ep = opts.get(); - if (!opts.has()) { - opts.set(ep); + if (!opts.has<::google::cloud::bigtable_internal::DataEndpointOption>()) { + opts.set<::google::cloud::bigtable_internal::DataEndpointOption>(ep); } - if (!opts.has()) { - opts.set(ep); + if (!opts.has<::google::cloud::bigtable_internal::AdminEndpointOption>()) { + opts.set<::google::cloud::bigtable_internal::AdminEndpointOption>(ep); } - if (!opts.has()) { - opts.set(ep); + if (!opts.has<::google::cloud::bigtable_internal:: + InstanceAdminEndpointOption>()) { + opts.set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + ep); } } @@ -168,7 +174,7 @@ Options DefaultOptions(Options opts) { GetEnv("GOOGLE_CLOUD_ENABLE_DIRECT_PATH").value_or(""); if (absl::c_any_of(absl::StrSplit(direct_path, ','), [](absl::string_view v) { return v == "bigtable"; })) { - opts.set( + opts.set<::google::cloud::bigtable_internal::DataEndpointOption>( "google-c2p:///directpath-bigtable.googleapis.com") .set("directpath-bigtable.googleapis.com"); @@ -180,15 +186,18 @@ Options DefaultOptions(Options opts) { auto emulator = GetEnv("BIGTABLE_EMULATOR_HOST"); if (emulator) { - opts.set(*emulator); - opts.set(*emulator); - opts.set(*emulator); + opts.set<::google::cloud::bigtable_internal::DataEndpointOption>(*emulator); + opts.set<::google::cloud::bigtable_internal::AdminEndpointOption>( + *emulator); + opts.set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + *emulator); } auto instance_admin_emulator = GetEnv("BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST"); if (instance_admin_emulator) { - opts.set(*std::move(instance_admin_emulator)); + opts.set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + *std::move(instance_admin_emulator)); } // Handle `UniverseDomainOption`. Note that we have already addressed the @@ -285,17 +294,21 @@ Options DefaultDataOptions(Options opts) { "bigtable.googleapis.com", opts); opts.set(std::move(ep)); } - return opts.set(opts.get()); + return opts.set( + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); } Options DefaultInstanceAdminOptions(Options opts) { opts = DefaultOptions(std::move(opts)); - return opts.set(opts.get()); + return opts.set( + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } Options DefaultTableAdminOptions(Options opts) { opts = DefaultOptions(std::move(opts)); - return opts.set(opts.get()); + return opts.set( + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); } } // namespace internal diff --git a/google/cloud/bigtable/internal/defaults_test.cc b/google/cloud/bigtable/internal/defaults_test.cc index 19f666a323504..aa4e50948c53f 100644 --- a/google/cloud/bigtable/internal/defaults_test.cc +++ b/google/cloud/bigtable/internal/defaults_test.cc @@ -14,6 +14,7 @@ #include "google/cloud/bigtable/internal/defaults.h" #include "google/cloud/bigtable/internal/client_options_defaults.h" +#include "google/cloud/bigtable/internal/endpoint_options.h" #include "google/cloud/bigtable/options.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" @@ -53,10 +54,15 @@ TEST(OptionsTest, Defaults) { "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", absl::nullopt); auto opts = DefaultOptions(); - EXPECT_EQ("bigtable.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", - opts.get()); + EXPECT_EQ("bigtable.googleapis.com", + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "bigtableadmin.googleapis.com", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "bigtableadmin.googleapis.com", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); EXPECT_EQ(typeid(grpc::GoogleDefaultCredentials()), typeid(opts.get())); EXPECT_FALSE(opts.has()); @@ -94,9 +100,12 @@ TEST(OptionsTest, DefaultOptionsDoesNotOverride) { channel_args.SetString("test-key-1", "value-1"); auto opts = DefaultOptions( Options{} - .set("testdata.googleapis.com") - .set("testadmin.googleapis.com") - .set("testinstanceadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "testdata.googleapis.com") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "testadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "testinstanceadmin.googleapis.com") .set(grpc::InsecureChannelCredentials()) .set( TracingOptions{}.SetOptions("single_line_mode=F")) @@ -107,10 +116,15 @@ TEST(OptionsTest, DefaultOptionsDoesNotOverride) { .set({{"test-key-2", "value-2"}}) .set({"test-prefix"})); - EXPECT_EQ("testdata.googleapis.com", opts.get()); - EXPECT_EQ("testadmin.googleapis.com", opts.get()); - EXPECT_EQ("testinstanceadmin.googleapis.com", - opts.get()); + EXPECT_EQ("testdata.googleapis.com", + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "testadmin.googleapis.com", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "testinstanceadmin.googleapis.com", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); EXPECT_EQ(typeid(grpc::InsecureChannelCredentials()), typeid(opts.get())); EXPECT_FALSE(opts.get().single_line_mode()); @@ -134,29 +148,49 @@ TEST(OptionsTest, EndpointOptionSetsAll) { auto options = Options{}.set("endpoint-option"); options = DefaultOptions(std::move(options)); EXPECT_EQ("endpoint-option", options.get()); - EXPECT_EQ("endpoint-option", options.get()); - EXPECT_EQ("endpoint-option", options.get()); - EXPECT_EQ("endpoint-option", options.get()); + EXPECT_EQ( + "endpoint-option", + options.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "endpoint-option", + options.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "endpoint-option", + options.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(OptionsTest, EndpointOptionOverridden) { - auto options = Options{} - .set("ignored") - .set("data") - .set("table-admin") - .set("instance-admin"); + auto options = + Options{} + .set("ignored") + .set<::google::cloud::bigtable_internal::DataEndpointOption>("data") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "table-admin") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "instance-admin"); options = DefaultOptions(std::move(options)); - EXPECT_EQ("data", options.get()); - EXPECT_EQ("table-admin", options.get()); - EXPECT_EQ("instance-admin", options.get()); + EXPECT_EQ( + "data", + options.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "table-admin", + options.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "instance-admin", + options.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(OptionsTest, DefaultDataOptionsEndpoint) { auto options = Options{} - .set("data.googleapis.com") - .set("tableadmin.googleapis.com") - .set("instanceadmin.googleapis.com"); + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "data.googleapis.com") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "tableadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "instanceadmin.googleapis.com"); options = DefaultDataOptions(std::move(options)); EXPECT_EQ("data.googleapis.com", options.get()); @@ -168,9 +202,12 @@ TEST(OptionsTest, DefaultDataOptionsEndpoint) { TEST(OptionsTest, DefaultInstanceAdminOptions) { auto options = Options{} - .set("data.googleapis.com") - .set("tableadmin.googleapis.com") - .set("instanceadmin.googleapis.com"); + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "data.googleapis.com") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "tableadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "instanceadmin.googleapis.com"); options = DefaultInstanceAdminOptions(std::move(options)); EXPECT_EQ("instanceadmin.googleapis.com", options.get()); @@ -182,9 +219,12 @@ TEST(OptionsTest, DefaultInstanceAdminOptions) { TEST(OptionsTest, DefaultTableAdminOptions) { auto options = Options{} - .set("data.googleapis.com") - .set("tableadmin.googleapis.com") - .set("instanceadmin.googleapis.com"); + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "data.googleapis.com") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "tableadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "instanceadmin.googleapis.com"); options = DefaultTableAdminOptions(std::move(options)); EXPECT_EQ("tableadmin.googleapis.com", options.get()); @@ -285,9 +325,12 @@ TEST(OptionsTest, BigtableEndpointOptionsOverrideUniverseDomain) { auto options = Options{} .set("ud-option.net") - .set("data.googleapis.com") - .set("tableadmin.googleapis.com") - .set("instanceadmin.googleapis.com"); + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "data.googleapis.com") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "tableadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "instanceadmin.googleapis.com"); EXPECT_EQ(DefaultDataOptions(options).get(), "data.googleapis.com"); @@ -304,9 +347,11 @@ TEST(OptionsTest, BigtableEndpointEnvVarsOverrideUniverseDomain) { auto options = Options{} .set("ud-option.net") - .set("ignored-data.googleapis.com") - .set("ignored-tableadmin.googleapis.com") - .set( + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "ignored-data.googleapis.com") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "ignored-tableadmin.googleapis.com") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( "ignored-instanceadmin.googleapis.com") .set("ignored-endpoint.googleapis.com"); @@ -350,9 +395,15 @@ TEST(EndpointEnvTest, EmulatorEnvOnly) { ScopedEnvironment emulator("BIGTABLE_EMULATOR_HOST", "emulator-host:8000"); auto opts = DefaultOptions(); - EXPECT_EQ("emulator-host:8000", opts.get()); - EXPECT_EQ("emulator-host:8000", opts.get()); - EXPECT_EQ("emulator-host:8000", opts.get()); + EXPECT_EQ("emulator-host:8000", + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "emulator-host:8000", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "emulator-host:8000", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(EndpointEnvTest, InstanceEmulatorEnvOnly) { @@ -360,10 +411,15 @@ TEST(EndpointEnvTest, InstanceEmulatorEnvOnly) { "instance-emulator-host:9000"); auto opts = DefaultOptions(); - EXPECT_EQ("bigtable.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", opts.get()); - EXPECT_EQ("instance-emulator-host:9000", - opts.get()); + EXPECT_EQ("bigtable.googleapis.com", + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "bigtableadmin.googleapis.com", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "instance-emulator-host:9000", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(EndpointEnvTest, InstanceEmulatorEnvOverridesOtherEnv) { @@ -372,10 +428,15 @@ TEST(EndpointEnvTest, InstanceEmulatorEnvOverridesOtherEnv) { "instance-emulator-host:9000"); auto opts = DefaultOptions(); - EXPECT_EQ("emulator-host:8000", opts.get()); - EXPECT_EQ("emulator-host:8000", opts.get()); - EXPECT_EQ("instance-emulator-host:9000", - opts.get()); + EXPECT_EQ("emulator-host:8000", + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "emulator-host:8000", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "instance-emulator-host:9000", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(EndpointEnvTest, EmulatorEnvOverridesUserOptions) { @@ -384,13 +445,22 @@ TEST(EndpointEnvTest, EmulatorEnvOverridesUserOptions) { auto opts = DefaultOptions( Options{} .set("ignored-any") - .set("ignored-data") - .set("ignored-admin") - .set("ignored-instance-admin")); - - EXPECT_EQ("emulator-host:8000", opts.get()); - EXPECT_EQ("emulator-host:8000", opts.get()); - EXPECT_EQ("emulator-host:8000", opts.get()); + .set<::google::cloud::bigtable_internal::DataEndpointOption>( + "ignored-data") + .set<::google::cloud::bigtable_internal::AdminEndpointOption>( + "ignored-admin") + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "ignored-instance-admin")); + + EXPECT_EQ("emulator-host:8000", + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); + EXPECT_EQ( + "emulator-host:8000", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "emulator-host:8000", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(EndpointEnvTest, InstanceEmulatorEnvOverridesUserOption) { @@ -400,10 +470,13 @@ TEST(EndpointEnvTest, InstanceEmulatorEnvOverridesUserOption) { auto opts = DefaultOptions( Options{} .set("ignored-any") - .set("ignored-instance-admin")); + .set<::google::cloud::bigtable_internal::InstanceAdminEndpointOption>( + "ignored-instance-admin")); - EXPECT_EQ("instance-emulator-host:9000", - opts.get()); + EXPECT_EQ( + "instance-emulator-host:9000", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); } TEST(EndpointEnvTest, EmulatorEnvDefaultsToInsecureCredentials) { @@ -431,12 +504,16 @@ TEST(EndpointEnvTest, DirectPathEnabled) { auto opts = DefaultOptions(); EXPECT_EQ("google-c2p:///directpath-bigtable.googleapis.com", - opts.get()); + opts.get<::google::cloud::bigtable_internal::DataEndpointOption>()); EXPECT_EQ("directpath-bigtable.googleapis.com", opts.get()); // Admin endpoints are not affected. - EXPECT_EQ("bigtableadmin.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", - opts.get()); + EXPECT_EQ( + "bigtableadmin.googleapis.com", + opts.get<::google::cloud::bigtable_internal::AdminEndpointOption>()); + EXPECT_EQ( + "bigtableadmin.googleapis.com", + opts.get< + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption>()); EXPECT_EQ(1, opts.get()); } diff --git a/google/cloud/bigtable/internal/endpoint_options.h b/google/cloud/bigtable/internal/endpoint_options.h new file mode 100644 index 0000000000000..58c1185263dff --- /dev/null +++ b/google/cloud/bigtable/internal/endpoint_options.h @@ -0,0 +1,58 @@ +// Copyright 2026 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_ENDPOINT_OPTIONS_H +#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_ENDPOINT_OPTIONS_H + +#include "google/cloud/version.h" +#include + +namespace google { +namespace cloud { +namespace bigtable_internal { +GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN + +/** + * The endpoint for data operations. + * + */ +struct DataEndpointOption { + using Type = std::string; +}; + +/** + * The endpoint for table admin operations. + * + */ +struct AdminEndpointOption { + using Type = std::string; +}; + +/** + * The endpoint for instance admin operations. + * + * In most scenarios this should have the same value as `AdminEndpointOption`. + * The most common exception is testing, where the emulator for instance admin + * operations may be different than the emulator for admin and data operations. + * */ +struct InstanceAdminEndpointOption { + using Type = std::string; +}; + +GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END +} // namespace bigtable_internal +} // namespace cloud +} // namespace google + +#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_ENDPOINT_OPTIONS_H diff --git a/google/cloud/bigtable/internal/legacy_async_bulk_apply.cc b/google/cloud/bigtable/internal/legacy_async_bulk_apply.cc deleted file mode 100644 index b4d2efa5da9a9..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_bulk_apply.cc +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_async_bulk_apply.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { - -future> AsyncRetryBulkApply::Create( - CompletionQueue cq, std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - IdempotentMutationPolicy& idempotent_policy, - MetadataUpdatePolicy metadata_update_policy, - std::shared_ptr client, - std::string const& app_profile_id, std::string const& table_name, - BulkMutation mut) { - if (mut.empty()) return make_ready_future(std::vector{}); - - std::shared_ptr bulk_apply(new AsyncRetryBulkApply( - std::move(rpc_retry_policy), std::move(rpc_backoff_policy), - idempotent_policy, std::move(metadata_update_policy), std::move(client), - app_profile_id, table_name, std::move(mut))); - bulk_apply->StartIteration(std::move(cq)); - return bulk_apply->promise_.get_future(); -} - -AsyncRetryBulkApply::AsyncRetryBulkApply( - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - IdempotentMutationPolicy& idempotent_policy, - MetadataUpdatePolicy metadata_update_policy, - std::shared_ptr client, - std::string const& app_profile_id, std::string const& table_name, - BulkMutation mut) - : rpc_retry_policy_(std::move(rpc_retry_policy)), - rpc_backoff_policy_(std::move(rpc_backoff_policy)), - metadata_update_policy_(std::move(metadata_update_policy)), - client_(std::move(client)), - state_(app_profile_id, table_name, idempotent_policy, std::move(mut)) {} - -void AsyncRetryBulkApply::StartIteration(CompletionQueue cq) { - auto context = std::make_unique(); - rpc_retry_policy_->Setup(*context); - rpc_backoff_policy_->Setup(*context); - metadata_update_policy_.Setup(*context); - auto& client = client_; - auto self = shared_from_this(); - cq.MakeStreamingReadRpc( - [client](grpc::ClientContext* context, - google::bigtable::v2::MutateRowsRequest const& request, - grpc::CompletionQueue* cq) { - return client->PrepareAsyncMutateRows(context, request, cq); - }, - state_.BeforeStart(), std::move(context), - [self, cq](google::bigtable::v2::MutateRowsResponse r) { - self->OnRead(std::move(r)); - return make_ready_future(true); - }, - [self, cq](Status const& s) { self->OnFinish(cq, s); }); -} - -void AsyncRetryBulkApply::OnRead( - google::bigtable::v2::MutateRowsResponse response) { - state_.OnRead(std::move(response)); -} - -void AsyncRetryBulkApply::OnFinish(CompletionQueue cq, Status const& status) { - state_.OnFinish(status); - if (!state_.HasPendingMutations() || !rpc_retry_policy_->OnFailure(status)) { - SetPromise(); - return; - } - - auto self = this->shared_from_this(); - cq.MakeRelativeTimer(rpc_backoff_policy_->OnCompletion(status)) - .then([self, cq](auto result) { - if (result.get()) { - self->StartIteration(std::move(cq)); - } else { - self->SetPromise(); - } - }); -} - -void AsyncRetryBulkApply::SetPromise() { - promise_.set_value(std::move(state_).OnRetryDone()); -} - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_async_bulk_apply.h b/google/cloud/bigtable/internal/legacy_async_bulk_apply.h deleted file mode 100644 index f53802f5c50f1..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_bulk_apply.h +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_BULK_APPLY_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_BULK_APPLY_H - -#include "google/cloud/bigtable/completion_queue.h" -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/idempotent_mutation_policy.h" -#include "google/cloud/bigtable/internal/async_retry_op.h" -#include "google/cloud/bigtable/internal/bulk_mutator.h" -#include "google/cloud/bigtable/version.h" -#include "google/cloud/internal/invoke_result.h" -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -/** - * Implement the retry loop for AsyncBulkApply. - * - * The retry loop for AsyncBulkApply() is fairly different from all the other - * retry loops: only those mutations that are idempotent and had a transient - * failure can be retried, and the result for each mutation arrives in a stream. - * This class implements that retry loop. - */ -class AsyncRetryBulkApply - : public std::enable_shared_from_this { - public: - static future> Create( - CompletionQueue cq, std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - IdempotentMutationPolicy& idempotent_policy, - MetadataUpdatePolicy metadata_update_policy, - std::shared_ptr client, - std::string const& app_profile_id, std::string const& table_name, - BulkMutation mut); - - private: - AsyncRetryBulkApply(std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - IdempotentMutationPolicy& idempotent_policy, - MetadataUpdatePolicy metadata_update_policy, - std::shared_ptr client, - std::string const& app_profile_id, - std::string const& table_name, BulkMutation mut); - - void StartIteration(CompletionQueue cq); - void OnRead(google::bigtable::v2::MutateRowsResponse response); - void OnFinish(CompletionQueue cq, google::cloud::Status const& status); - void SetPromise(); - - std::unique_ptr rpc_retry_policy_; - std::unique_ptr rpc_backoff_policy_; - MetadataUpdatePolicy metadata_update_policy_; - std::shared_ptr client_; - bigtable_internal::BulkMutatorState state_; - promise> promise_; -}; - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_BULK_APPLY_H diff --git a/google/cloud/bigtable/internal/legacy_async_bulk_apply_test.cc b/google/cloud/bigtable/internal/legacy_async_bulk_apply_test.cc deleted file mode 100644 index 9c2e21f730758..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_bulk_apply_test.cc +++ /dev/null @@ -1,522 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_async_bulk_apply.h" -#include "google/cloud/bigtable/testing/mock_mutate_rows_reader.h" -#include "google/cloud/bigtable/testing/mock_policies.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/future.h" -#include "google/cloud/internal/api_client_header.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/fake_completion_queue_impl.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/testing_util/validate_metadata.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; - -using ::google::cloud::bigtable::testing::MockBackoffPolicy; -using ::google::cloud::bigtable::testing::MockClientAsyncReaderInterface; -using ::google::cloud::testing_util::chrono_literals::operator""_ms; -using ::google::cloud::testing_util::FakeCompletionQueueImpl; -using ::google::cloud::testing_util::StatusIs; - -class AsyncBulkApplyTest : public bigtable::testing::TableTestFixture { - protected: - AsyncBulkApplyTest() - : TableTestFixture( - CompletionQueue(std::make_shared())), - rpc_retry_policy_( - bigtable::DefaultRPCRetryPolicy(internal::kBigtableLimits)), - rpc_backoff_policy_(bigtable::DefaultRPCBackoffPolicy( - internal::kBigtableTableAdminLimits)), - idempotent_mutation_policy_( - bigtable::DefaultIdempotentMutationPolicy()), - metadata_update_policy_("my_table", MetadataParamTypes::NAME) {} - - void SimulateIteration() { - cq_impl_->SimulateCompletion(true); - // state == PROCESSING - cq_impl_->SimulateCompletion(true); - // state == PROCESSING, 1 read - cq_impl_->SimulateCompletion(false); - // state == FINISHING - cq_impl_->SimulateCompletion(true); - } - - std::shared_ptr rpc_retry_policy_; - std::shared_ptr rpc_backoff_policy_; - std::shared_ptr idempotent_mutation_policy_; - MetadataUpdatePolicy metadata_update_policy_; -}; - -std::vector StatusOnly(std::vector const& failures) { - std::vector v; - std::transform(failures.begin(), failures.end(), std::back_inserter(v), - [](FailedMutation const& f) { return f.status(); }); - return v; -} - -TEST_F(AsyncBulkApplyTest, NoMutations) { - bigtable::BulkMutation mut; - - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, rpc_retry_policy_->clone(), rpc_backoff_policy_->clone(), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - ASSERT_EQ(0U, bulk_apply_future.get().size()); -} - -TEST_F(AsyncBulkApplyTest, Success) { - bigtable::BulkMutation mut{ - bigtable::SingleRowMutation("foo2", - {bigtable::SetCell("f", "c", 0_ms, "v2")}), - bigtable::SingleRowMutation("foo3", - {bigtable::SetCell("f", "c", 0_ms, "v3")}), - }; - - auto* reader = - new MockClientAsyncReaderInterface; - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::OK); - - auto& r2 = *r->add_entries(); - r2.set_index(1); - r2.mutable_status()->set_code(grpc::StatusCode::OK); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - EXPECT_CALL(*reader, StartCall).Times(1); - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .WillOnce([reader](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - return std::unique_ptr< - MockClientAsyncReaderInterface>( - reader); - }) - .RetiresOnSaturation(); - - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, rpc_retry_policy_->clone(), rpc_backoff_policy_->clone(), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - bulk_apply_future.then( - [](future> f) { f.get(); }); - - ASSERT_EQ(1U, cq_impl_->size()); - - SimulateIteration(); - - ASSERT_EQ(0U, cq_impl_->size()); -} - -TEST_F(AsyncBulkApplyTest, PartialSuccessRetry) { - bigtable::BulkMutation mut{ - bigtable::SingleRowMutation("foo2", - {bigtable::SetCell("f", "c", 0_ms, "v2")}), - bigtable::SingleRowMutation("foo3", - {bigtable::SetCell("f", "c", 0_ms, "v3")}), - }; - - auto* reader0 = - new MockClientAsyncReaderInterface; - auto* reader1 = - new MockClientAsyncReaderInterface; - - EXPECT_CALL(*reader0, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::OK); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - - EXPECT_CALL(*reader1, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::OK); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - - EXPECT_CALL(*reader0, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - EXPECT_CALL(*reader1, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - EXPECT_CALL(*reader0, StartCall).Times(1); - EXPECT_CALL(*reader1, StartCall).Times(1); - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .WillOnce([reader0](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - return std::unique_ptr< - MockClientAsyncReaderInterface>( - reader0); - }) - .WillOnce([reader1](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - return std::unique_ptr< - MockClientAsyncReaderInterface>( - reader1); - }); - - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, rpc_retry_policy_->clone(), rpc_backoff_policy_->clone(), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - SimulateIteration(); - // simulate the backoff timer - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - - SimulateIteration(); - - bulk_apply_future.get(); - - ASSERT_EQ(0U, cq_impl_->size()); - EXPECT_TRUE(cq_impl_->empty()); -} - -TEST_F(AsyncBulkApplyTest, DefaultFailureRetry) { - bigtable::BulkMutation mut{ - bigtable::SingleRowMutation("foo2", - {bigtable::SetCell("f", "c", 0_ms, "v2")}), - bigtable::SingleRowMutation("foo3", - {bigtable::SetCell("f", "c", 0_ms, "v3")}), - }; - - auto* reader0 = - new MockClientAsyncReaderInterface; - auto* reader1 = - new MockClientAsyncReaderInterface; - - EXPECT_CALL(*reader0, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::OK); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - - EXPECT_CALL(*reader1, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::OK); - - auto& r2 = *r->add_entries(); - r2.set_index(1); - r2.mutable_status()->set_code(grpc::StatusCode::OK); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - - EXPECT_CALL(*reader0, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::UNAVAILABLE, ""); - }); - - EXPECT_CALL(*reader1, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - EXPECT_CALL(*reader0, StartCall).Times(1); - EXPECT_CALL(*reader1, StartCall).Times(1); - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .WillOnce([reader0](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - return std::unique_ptr< - MockClientAsyncReaderInterface>( - reader0); - }) - .WillOnce([reader1](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - return std::unique_ptr< - MockClientAsyncReaderInterface>( - reader1); - }); - - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, rpc_retry_policy_->clone(), rpc_backoff_policy_->clone(), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - SimulateIteration(); - // simulate the backoff timer - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - - SimulateIteration(); - - bulk_apply_future.get(); - - ASSERT_EQ(0U, cq_impl_->size()); - - EXPECT_TRUE(cq_impl_->empty()); -} - -TEST_F(AsyncBulkApplyTest, TooManyFailures) { - bigtable::BulkMutation mut{ - bigtable::SingleRowMutation("foo2", - {bigtable::SetCell("f", "c", 0_ms, "v2")}), - bigtable::SingleRowMutation("foo3", - {bigtable::SetCell("f", "c", 0_ms, "v3")}), - }; - - // We give up on the 3rd error. - auto constexpr kErrorCount = 2; - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .Times(kErrorCount + 1) - .WillRepeatedly([](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - }); - EXPECT_CALL(*reader, StartCall); - return reader; - }); - - auto limited_retry_policy = LimitedErrorCountRetryPolicy(kErrorCount); - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, limited_retry_policy.clone(), rpc_backoff_policy_->clone(), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - for (int retry = 0; retry < kErrorCount; ++retry) { - SimulateIteration(); - // simulate the backoff timer - cq_impl_->SimulateCompletion(true); - ASSERT_EQ(1U, cq_impl_->size()); - } - - SimulateIteration(); - - auto failures = StatusOnly(bulk_apply_future.get()); - EXPECT_THAT(failures, ElementsAre(StatusIs(StatusCode::kUnavailable), - StatusIs(StatusCode::kUnavailable))); - - ASSERT_EQ(0U, cq_impl_->size()); - EXPECT_TRUE(cq_impl_->empty()); -} - -TEST_F(AsyncBulkApplyTest, RetryPolicyUsedForOkStreamsWithFailedMutations) { - bigtable::BulkMutation mut{bigtable::SingleRowMutation( - "row", {bigtable::SetCell("f", "c", 0_ms, "v2")})}; - - // We give up on the 3rd error. - auto constexpr kErrorCount = 2; - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .Times(kErrorCount + 1) - .WillRepeatedly([](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - EXPECT_CALL(*reader, StartCall); - return reader; - }); - - auto limited_retry_policy = LimitedErrorCountRetryPolicy(kErrorCount); - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, limited_retry_policy.clone(), rpc_backoff_policy_->clone(), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - for (int retry = 0; retry != kErrorCount; ++retry) { - SimulateIteration(); - // simulate the backoff timer - cq_impl_->SimulateCompletion(true); - ASSERT_EQ(1U, cq_impl_->size()); - } - - SimulateIteration(); - - auto failures = StatusOnly(bulk_apply_future.get()); - EXPECT_THAT(failures, ElementsAre(StatusIs(StatusCode::kUnavailable))); - - ASSERT_EQ(0U, cq_impl_->size()); - EXPECT_TRUE(cq_impl_->empty()); -} - -TEST_F(AsyncBulkApplyTest, UsesBackoffPolicy) { - bigtable::BulkMutation mut{ - bigtable::SingleRowMutation("foo2", - {bigtable::SetCell("f", "c", 0_ms, "v2")}), - bigtable::SingleRowMutation("foo3", - {bigtable::SetCell("f", "c", 0_ms, "v3")}), - }; - - auto grpc_error = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - auto error = MakeStatusFromRpcError(grpc_error); - - std::unique_ptr mock(new MockBackoffPolicy); - EXPECT_CALL(*mock, Setup).Times(2); - EXPECT_CALL(*mock, OnCompletion(error)).WillOnce([](Status const&) { - return 10_ms; - }); - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .WillOnce([grpc_error](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish) - .WillOnce([grpc_error](grpc::Status* status, void*) { - *status = grpc_error; - }); - EXPECT_CALL(*reader, StartCall); - return reader; - }) - .WillOnce([](grpc::ClientContext*, btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r, void*) { - auto& r1 = *r->add_entries(); - r1.set_index(0); - r1.mutable_status()->set_code(grpc::StatusCode::OK); - - auto& r2 = *r->add_entries(); - r2.set_index(1); - r2.mutable_status()->set_code(grpc::StatusCode::OK); - }) - .WillOnce([](btproto::MutateRowsResponse*, void*) {}); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - EXPECT_CALL(*reader, StartCall); - return reader; - }); - - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, rpc_retry_policy_->clone(), std::move(mock), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - SimulateIteration(); - // simulate the backoff timer - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - - SimulateIteration(); - - ASSERT_EQ(0U, cq_impl_->size()); -} - -TEST_F(AsyncBulkApplyTest, CancelDuringBackoff) { - bigtable::BulkMutation mut{ - bigtable::SingleRowMutation("foo2", - {bigtable::SetCell("f", "c", 0_ms, "v2")}), - bigtable::SingleRowMutation("foo3", - {bigtable::SetCell("f", "c", 0_ms, "v3")}), - }; - - auto grpc_error = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - auto error = MakeStatusFromRpcError(grpc_error); - - std::unique_ptr mock(new MockBackoffPolicy); - EXPECT_CALL(*mock, Setup); - EXPECT_CALL(*mock, OnCompletion(error)).WillOnce([](Status const&) { - return 10_ms; - }); - - EXPECT_CALL(*client_, PrepareAsyncMutateRows) - .WillOnce([grpc_error](grpc::ClientContext*, - btproto::MutateRowsRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish) - .WillOnce([grpc_error](grpc::Status* status, void*) { - *status = grpc_error; - }); - EXPECT_CALL(*reader, StartCall); - return reader; - }); - - auto bulk_apply_future = internal::AsyncRetryBulkApply::Create( - cq_, rpc_retry_policy_->clone(), std::move(mock), - *idempotent_mutation_policy_, metadata_update_policy_, client_, - "my-app-profile", "my-table", std::move(mut)); - - SimulateIteration(); - ASSERT_EQ(1U, cq_impl_->size()); - - // cancel the pending operation. - bulk_apply_future.cancel(); - // simulate the backoff timer expiring. - cq_impl_->SimulateCompletion(false); - - ASSERT_EQ(0U, cq_impl_->size()); - - auto failures = StatusOnly(bulk_apply_future.get()); - EXPECT_THAT(failures, ElementsAre(StatusIs(StatusCode::kUnavailable), - StatusIs(StatusCode::kUnavailable))); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_async_row_reader.cc b/google/cloud/bigtable/internal/legacy_async_row_reader.cc deleted file mode 100644 index 80ce9973850d0..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_row_reader.cc +++ /dev/null @@ -1,281 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_async_row_reader.h" -#include "google/cloud/bigtable/version.h" -#include "google/cloud/log.h" - -namespace google { -namespace cloud { -namespace bigtable_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -void LegacyAsyncRowReader::MakeRequest() { - status_ = Status(); - google::bigtable::v2::ReadRowsRequest request; - - request.set_app_profile_id(app_profile_id_); - request.set_table_name(table_name_); - auto row_set_proto = row_set_.as_proto(); - request.mutable_rows()->Swap(&row_set_proto); - - auto filter_proto = filter_.as_proto(); - request.mutable_filter()->Swap(&filter_proto); - - if (rows_limit_ != NO_ROWS_LIMIT) { - request.set_rows_limit(rows_limit_ - rows_count_); - } - parser_ = parser_factory_->Create(false); - - auto context = std::make_unique(); - rpc_retry_policy_->Setup(*context); - rpc_backoff_policy_->Setup(*context); - metadata_update_policy_.Setup(*context); - - auto& client = client_; - auto self = this->shared_from_this(); - cq_.MakeStreamingReadRpc( - [client](grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request, - grpc::CompletionQueue* cq) { - return client->PrepareAsyncReadRows(context, request, cq); - }, - request, std::move(context), - [self](google::bigtable::v2::ReadRowsResponse r) { - return self->OnDataReceived(std::move(r)); - }, - [self](Status s) { self->OnStreamFinished(std::move(s)); }); -} - -void LegacyAsyncRowReader::TryGiveRowToUser() { - // The user is likely to ask for more rows immediately after receiving a - // row, which means that this function will be called recursively. The depth - // of the recursion can be as deep as the size of ready_rows_, which might - // be significant and potentially lead to stack overflow. The way to - // overcome this is to always switch thread to a CompletionQueue thread. - // Switching thread for every row has a non-trivial cost, though. To find a - // good balance, we allow for recursion no deeper than 100 and achieve it by - // tracking the level in `recursion_level_`. - // - // The magic value 100 is arbitrary, but back-of-the-envelope calculation - // indicates it should cap this stack usage to below 100K. Default stack - // size is usually 1MB. - struct CountFrames { - explicit CountFrames(int& cntr) : cntr(++cntr) {} - ~CountFrames() { --cntr; } - int& cntr; - } counter(recursion_level_); - - if (ready_rows_.empty()) { - if (whole_op_finished_) { - // The scan is finished for good, there will be no more rows. - on_finish_(status_); - return; - } - if (!continue_reading_) { - GCP_LOG(FATAL) - << "No rows are ready and we can't continue reading. This is a bug, " - "please report it at " - "https://github.com/googleapis/google-cloud-cpp/issues/new"; - } - // No rows, but we can fetch some. - auto continue_reading = std::move(continue_reading_); - continue_reading_.reset(); - continue_reading->set_value(true); - return; - } - - // Yay! We have something to give to the user and they want it. - auto row = std::move(ready_rows_.front()); - ready_rows_.pop(); - - auto self = this->shared_from_this(); - bool const break_recursion = recursion_level_ >= 100; - on_row_(std::move(row)).then([self, break_recursion](future fut) { - bool should_cancel; -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - try { - should_cancel = !fut.get(); - } catch (std::exception& ex) { - self->Cancel( - std::string("future<> returned from the user callback threw an " - "exception: ") + - ex.what()); - return; - } catch (...) { - self->Cancel( - "future<> returned from the user callback threw an unknown " - "exception"); - return; - } -#else // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - should_cancel = !fut.get(); -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - if (should_cancel) { - self->Cancel("User cancelled"); - return; - } - if (break_recursion) { - self->cq_.RunAsync([self] { self->UserWantsRows(); }); - return; - } - self->UserWantsRows(); - }); -} - -future LegacyAsyncRowReader::OnDataReceived( - google::bigtable::v2::ReadRowsResponse response) { - // assert(!whole_op_finished_); - // assert(!continue_reading_); - // assert(status_.ok()); - status_ = ConsumeResponse(std::move(response)); - // We've processed the response. - // - // If there were errors (e.g. malformed response from the server), we should - // interrupt this stream. Interrupting it will yield lower layers calling - // `OnStreamFinished` with a status unrelated to the real reason, so we - // store the actual reason in status_ and proceed exactly the - // same way as if the stream was broken for other reasons. - // - // Even if status_ is not OK, we might have consumed some rows, - // but, don't give them to the user yet. We want to keep the invariant that - // either the user doesn't hold a `future<>` when we're fetching more rows. - // Retries (successful or not) will do it. Improving this behavior makes - // little sense because parser errors are very unexpected and probably not - // retryable anyway. - - if (status_.ok()) { - continue_reading_.emplace(promise()); - auto res = continue_reading_->get_future(); - TryGiveRowToUser(); - return res; - } - return make_ready_future(false); -} - -void LegacyAsyncRowReader::OnStreamFinished(Status status) { - // assert(!continue_reading_); - if (status_.ok()) { - status_ = std::move(status); - } - grpc::Status parser_status; - parser_->HandleEndOfStream(parser_status); - if (!parser_status.ok() && status_.ok()) { - // If there stream finished with an error ignore what the parser says. - status_ = MakeStatusFromRpcError(parser_status); - } - - // In the unlikely case when we have already reached the requested - // number of rows and still receive an error (the parser can throw - // an error at end of stream for example), there is no need to - // retry and we have no good value for rows_limit anyway. - if (rows_limit_ != NO_ROWS_LIMIT && rows_limit_ <= rows_count_) { - status_ = Status(); - } - - if (!last_read_row_key_.empty()) { - // We've returned some rows and need to make sure we don't - // request them again. - row_set_ = - row_set_.Intersect(bigtable::RowRange::Open(last_read_row_key_, "")); - } - - // If we receive an error, but the retryable set is empty, consider it a - // success. - if (row_set_.IsEmpty()) { - status_ = Status(); - } - - if (status_.ok()) { - // We've successfully finished the scan. - whole_op_finished_ = true; - TryGiveRowToUser(); - return; - } - - if (!rpc_retry_policy_->OnFailure(status_)) { - // Can't retry. - whole_op_finished_ = true; - TryGiveRowToUser(); - return; - } - auto self = this->shared_from_this(); - cq_.MakeRelativeTimer(rpc_backoff_policy_->OnCompletion(status_)) - .then( - [self]( - future> result) { - if (auto tp = result.get()) { - self->MakeRequest(); - } else { - self->whole_op_finished_ = true; - self->TryGiveRowToUser(); - } - }); -} - -void LegacyAsyncRowReader::Cancel(std::string const& reason) { - ready_rows_ = std::queue(); - auto continue_reading = std::move(continue_reading_); - continue_reading_.reset(); - Status status(StatusCode::kCancelled, reason); - if (!continue_reading) { - // If we're not in the middle of the stream fire some user callbacks, but - // also override the overall status. - // assert(whole_op_finished_); - status_ = std::move(status); - TryGiveRowToUser(); - return; - } - // If we are in the middle of the stream, cancel the stream. - status_ = std::move(status); - continue_reading->set_value(false); -} - -Status LegacyAsyncRowReader::DrainParser() { - grpc::Status status; - while (parser_->HasNext()) { - bigtable::Row parsed_row = parser_->Next(status); - if (!status.ok()) { - return MakeStatusFromRpcError(status); - } - ++rows_count_; - last_read_row_key_ = parsed_row.row_key(); - ready_rows_.emplace(std::move(parsed_row)); - } - return Status(); -} - -Status LegacyAsyncRowReader::ConsumeResponse( - google::bigtable::v2::ReadRowsResponse response) { - for (auto& chunk : *response.mutable_chunks()) { - grpc::Status status; - parser_->HandleChunk(std::move(chunk), status); - if (!status.ok()) { - return MakeStatusFromRpcError(status); - } - Status parser_status = DrainParser(); - if (!parser_status.ok()) { - return parser_status; - } - } - if (!response.last_scanned_row_key().empty()) { - last_read_row_key_ = std::move(*response.mutable_last_scanned_row_key()); - } - return Status(); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable_internal -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_async_row_reader.h b/google/cloud/bigtable/internal/legacy_async_row_reader.h deleted file mode 100644 index 0202f2ea1348d..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_row_reader.h +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_ROW_READER_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_ROW_READER_H - -#include "google/cloud/bigtable/completion_queue.h" -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/filters.h" -#include "google/cloud/bigtable/internal/readrowsparser.h" -#include "google/cloud/bigtable/metadata_update_policy.h" -#include "google/cloud/bigtable/row.h" -#include "google/cloud/bigtable/row_set.h" -#include "google/cloud/bigtable/rpc_backoff_policy.h" -#include "google/cloud/bigtable/rpc_retry_policy.h" -#include "google/cloud/bigtable/version.h" -#include "google/cloud/future.h" -#include "google/cloud/grpc_error_delegate.h" -#include "google/cloud/optional.h" -#include "google/cloud/status_or.h" -#include "absl/types/optional.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * Objects of this class represent the state of reading rows via AsyncReadRows. - */ -class LegacyAsyncRowReader - : public std::enable_shared_from_this { - using RowFunctor = std::function(bigtable::Row)>; - using FinishFunctor = std::function; - - public: - /// Special value to be used as rows_limit indicating no limit. - // NOLINTNEXTLINE(readability-identifier-naming) - static std::int64_t constexpr NO_ROWS_LIMIT = 0; - // Callbacks keep pointers to these objects. - LegacyAsyncRowReader(LegacyAsyncRowReader&&) = delete; - LegacyAsyncRowReader(LegacyAsyncRowReader const&) = delete; - - static std::shared_ptr Create( - CompletionQueue cq, std::shared_ptr client, - std::string app_profile_id, std::string table_name, RowFunctor on_row, - FinishFunctor on_finish, bigtable::RowSet row_set, - std::int64_t rows_limit, bigtable::Filter filter, - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - bigtable::MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr - parser_factory) { - std::shared_ptr res(new LegacyAsyncRowReader( - std::move(cq), std::move(client), std::move(app_profile_id), - std::move(table_name), std::move(on_row), std::move(on_finish), - std::move(row_set), rows_limit, std::move(filter), - std::move(rpc_retry_policy), std::move(rpc_backoff_policy), - std::move(metadata_update_policy), std::move(parser_factory))); - res->MakeRequest(); - return res; - } - - private: - LegacyAsyncRowReader( - CompletionQueue cq, std::shared_ptr client, - std::string app_profile_id, std::string table_name, RowFunctor on_row, - FinishFunctor on_finish, bigtable::RowSet row_set, - std::int64_t rows_limit, bigtable::Filter filter, - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - bigtable::MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory) - : cq_(std::move(cq)), - client_(std::move(client)), - app_profile_id_(std::move(app_profile_id)), - table_name_(std::move(table_name)), - on_row_(std::move(on_row)), - on_finish_(std::move(on_finish)), - row_set_(std::move(row_set)), - rows_limit_(rows_limit), - filter_(std::move(filter)), - rpc_retry_policy_(std::move(rpc_retry_policy)), - rpc_backoff_policy_(std::move(rpc_backoff_policy)), - metadata_update_policy_(std::move(metadata_update_policy)), - parser_factory_(std::move(parser_factory)) {} - - void MakeRequest(); - - /** - * Called when the user asks for more rows via satisfying the future returned - * from the row callback. - */ - void UserWantsRows() { TryGiveRowToUser(); } - - /** - * Attempt to call a user callback. - * - * If no rows are ready, this will not call the callback immediately and - * instead ask lower layers for more data. - */ - void TryGiveRowToUser(); - - /// Called when lower layers provide us with a response chunk. - future OnDataReceived(google::bigtable::v2::ReadRowsResponse response); - - /// Called when the whole stream finishes. - void OnStreamFinished(Status status); - - /// User satisfied the future returned from the row callback with false. - void Cancel(std::string const& reason); - - /// Process everything that is accumulated in the parser. - Status DrainParser(); - - /// Parse the data from the response. - Status ConsumeResponse(google::bigtable::v2::ReadRowsResponse response); - - std::mutex mu_; - CompletionQueue cq_; - std::shared_ptr client_; - std::string app_profile_id_; - std::string table_name_; - RowFunctor on_row_; - FinishFunctor on_finish_; - bigtable::RowSet row_set_; - std::int64_t rows_limit_; - bigtable::Filter filter_; - std::unique_ptr rpc_retry_policy_; - std::unique_ptr rpc_backoff_policy_; - bigtable::MetadataUpdatePolicy metadata_update_policy_; - std::unique_ptr parser_factory_; - std::unique_ptr parser_; - /// Number of rows read so far, used to set row_limit in retries. - std::int64_t rows_count_ = 0; - /// Holds the last read row key, for retries. - bigtable::RowKeyType last_read_row_key_; - /// The queue of rows which we already received but no one has asked for them. - std::queue ready_rows_; - /** - * The promise to the underlying stream to either continue reading or cancel. - * - * If the `absl::optional` is empty, it means that either the whole scan is - * finished or the underlying layers are already trying to fetch more data. - * - * If the `absl::optional` is not empty, the lower layers are waiting for this - * to be satisfied before they start fetching more data. - */ - absl::optional> continue_reading_; - /// The final status of the operation. - bool whole_op_finished_ = false; - /** - * The status of the last retry attempt_. - * - * It is reset to OK at the beginning of every retry. If an error is - * encountered (be it while parsing the response or on stream finish), it is - * stored here (unless a different error had already been stored). - */ - Status status_; - /// Tracks the level of recursion of TryGiveRowToUser - int recursion_level_ = 0; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable_internal -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_ROW_READER_H diff --git a/google/cloud/bigtable/internal/legacy_async_row_reader_test.cc b/google/cloud/bigtable/internal/legacy_async_row_reader_test.cc deleted file mode 100644 index 83eef314300b0..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_row_reader_test.cc +++ /dev/null @@ -1,1159 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_data_client.h" -#include "google/cloud/bigtable/testing/mock_read_rows_reader.h" -#include "google/cloud/bigtable/testing/mock_response_reader.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/api_client_header.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/fake_completion_queue_impl.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/testing_util/validate_metadata.h" -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; - -using ::google::cloud::bigtable::testing::MockClientAsyncReaderInterface; -using ::google::cloud::testing_util::ValidateMetadataFixture; -using ::google::cloud::testing_util::chrono_literals::operator""_ms; -using ::google::cloud::testing_util::FakeCompletionQueueImpl; -using ::testing::HasSubstr; -using ::testing::Values; -using ::testing::WithParamInterface; - -template -bool Unsatisfied(future const& fut) { - return std::future_status::timeout == fut.wait_for(1_ms); -} - -class TableAsyncReadRowsTest : public bigtable::testing::TableTestFixture { - protected: - TableAsyncReadRowsTest() - : TableTestFixture( - CompletionQueue(std::make_shared())), - stream_status_future_(stream_status_promise_.get_future()) {} - - MockClientAsyncReaderInterface& AddReader( - std::function request_expectations, - bool expect_a_read = true) { - readers_.emplace_back( - new MockClientAsyncReaderInterface); - reader_started_.push_back(false); - size_t idx = reader_started_.size() - 1; - auto& reader = LastReader(); - // We can't move request_expectations into the lambda because of lack of - // generalized lambda capture in C++11, so let's pass it by pointer. - auto request_expectations_ptr = - std::make_shared( - std::move(request_expectations)); - - EXPECT_CALL(*client_, PrepareAsyncReadRows) - .WillOnce([this, &reader, request_expectations_ptr]( - grpc::ClientContext* context, - btproto::ReadRowsRequest const& r, - grpc::CompletionQueue*) { - validate_metadata_fixture_.IsContextMDValid( - *context, "google.bigtable.v2.Bigtable.ReadRows", r, - google::cloud::internal::HandCraftedLibClientHeader()); - (*request_expectations_ptr)(r); - return std::unique_ptr< - MockClientAsyncReaderInterface>( - &reader); - }) - .RetiresOnSaturation(); - - EXPECT_CALL(reader, StartCall).WillOnce([idx, this](void*) { - reader_started_[idx] = true; - }); - if (expect_a_read) { - // The last call, to which we'll return ok==false. - EXPECT_CALL(reader, Read).WillOnce([](btproto::ReadRowsResponse*, void*) { - }); - } - return reader; - } - - MockClientAsyncReaderInterface& LastReader() { - return *readers_.back(); - } - - // Start Table::AsyncReadRows. - void ReadRows(int row_limit = RowReader::NO_ROWS_LIMIT) { - table_.AsyncReadRows( - [this](Row const& row) { - EXPECT_EQ(expected_rows_.front(), row.row_key()); - expected_rows_.pop(); - row_promises_.front().set_value(row.row_key()); - row_promises_.pop(); - auto ret = std::move(futures_from_user_cb_.front()); - futures_from_user_cb_.pop(); - return ret; - }, - [this](Status const& stream_status) { - stream_status_promise_.set_value(stream_status); - }, - RowSet(), row_limit, Filter::PassAllFilter()); - } - - /// Expect a row whose row key is equal to this function's argument. - template - void ExpectRow(T const& row) { - row_promises_.emplace(); - row_futures_.emplace_back(row_promises_.back().get_future()); - promises_from_user_cb_.emplace_back(); - futures_from_user_cb_.emplace(promises_from_user_cb_.back().get_future()); - expected_rows_.push(RowKeyType(row)); - } - - /// A wrapper around ExpectRow to expect many rows. - template - void ExpectRows(std::initializer_list const& rows) { - for (auto const& row : rows) { - ExpectRow(row); - } - } - - std::vector*> - readers_; - // Whether `Start()` was called on i-th retry attempt. - std::vector reader_started_; - std::queue> row_promises_; - /** - * Future at idx i corresponse to i-th expected row. It will be satisfied - * when the relevant `on_row` callback of AsyncReadRows is called. - */ - std::vector> row_futures_; - std::queue expected_rows_; - promise stream_status_promise_; - /// Future which will be satisfied with the status passed in on_finished. - future stream_status_future_; - /// I-th promise corresponds to the future returned from the ith on_row cb. - std::vector> promises_from_user_cb_; - std::queue> futures_from_user_cb_; - ValidateMetadataFixture validate_metadata_fixture_; -}; - -/// @test Verify that successfully reading a single row works. -TEST_F(TableAsyncReadRowsTest, SingleRow) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - auto row = row_futures_[0].get(); - - // Check that we're not asking for data unless someone is waiting for it. - ASSERT_EQ(0U, cq_impl_->size()); - promises_from_user_cb_[0].set_value(true); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Like SingleRow, but the future returned from the cb is satisfied. -TEST_F(TableAsyncReadRowsTest, SingleRowInstantFinish) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - promises_from_user_cb_[0].set_value(true); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - auto row = row_futures_[0].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Verify that reading 2 rows delivered in 2 responses works. -TEST_F(TableAsyncReadRowsTest, MultipleChunks) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - ExpectRow("r2"); - promises_from_user_cb_[1].set_value(true); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - row_futures_[0].get(); - - // Check that we're not asking for data unless someone is waiting for it. - ASSERT_EQ(0U, cq_impl_->size()); - promises_from_user_cb_[0].set_value(true); - - EXPECT_TRUE(Unsatisfied(row_futures_[1])); - cq_impl_->SimulateCompletion(true); // Return data - row_futures_[1].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Like MultipleChunks but the future returned from on_row is satisfied. -TEST_F(TableAsyncReadRowsTest, MultipleChunksImmediatelySatisfied) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - ExpectRow("r2"); - promises_from_user_cb_[0].set_value(true); - promises_from_user_cb_[1].set_value(true); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - row_futures_[0].get(); - - EXPECT_TRUE(Unsatisfied(row_futures_[1])); - cq_impl_->SimulateCompletion(true); // Return data - row_futures_[1].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Verify that a single row can span multiple responses. -TEST_F(TableAsyncReadRowsTest, ResponseInMultipleChunks) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: false - })"); - }) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col2" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - promises_from_user_cb_[0].set_value(true); - ReadRows(); - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - - row_futures_[0].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Verify that parser fails if the stream finishes prematurely. -TEST_F(TableAsyncReadRowsTest, ParserEofFailsOnUnfinishedRow) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - // missing final commit - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: false - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - ASSERT_FALSE(stream_status_future_.get().ok()); -} - -/// @test Check that we ignore HandleEndOfStream errors if enough rows were read -TEST_F(TableAsyncReadRowsTest, ParserEofDoesntFailsOnUnfinishedRowIfRowLimit) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - // missing final commit - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: false - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - promises_from_user_cb_[0].set_value(true); - ReadRows(1); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - cq_impl_->SimulateCompletion(true); // Return data - - row_futures_[0].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Verify that permanent errors are not retried and properly passed. -TEST_F(TableAsyncReadRowsTest, PermanentFailure) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::PERMISSION_DENIED, "noooo"); - }); - - ReadRows(); - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_EQ(StatusCode::kPermissionDenied, stream_status.code()); -} - -/// @test Verify that transient errors are retried. -TEST_F(TableAsyncReadRowsTest, TransientErrorIsRetried) { - auto& stream2 = AddReader([](btproto::ReadRowsRequest const& req) { - // Verify that we're not asking for the same rows again. - EXPECT_TRUE(req.has_rows()); - auto const& rows = req.rows(); - EXPECT_EQ(1, rows.row_ranges_size()); - auto const& range = rows.row_ranges(0); - EXPECT_EQ("r1", range.start_key_open()); - }); - auto& stream1 = AddReader([](btproto::ReadRowsRequest const&) {}); - - // Make it a bit trickier by delivering the error while parsing second row. - EXPECT_CALL(stream1, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: false - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream1, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::UNAVAILABLE, "oh no"); - }); - - EXPECT_CALL(stream2, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream2, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRows({"r1", "r2"}); - promises_from_user_cb_[0].set_value(true); - promises_from_user_cb_[1].set_value(true); - ReadRows(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - - row_futures_[0].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream with failure - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish timer - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(row_futures_[1])); - cq_impl_->SimulateCompletion(true); // Return data - - row_futures_[1].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Verify that the last scanned row is respected. -TEST_F(TableAsyncReadRowsTest, LastScannedRowKeyIsRespected) { - auto& stream2 = AddReader([](btproto::ReadRowsRequest const& req) { - // The server has told that "r2" has been scanned. Our second request - // should use the range ("r2", ""]. This is what is under test. - EXPECT_TRUE(req.has_rows()); - auto const& rows = req.rows(); - EXPECT_EQ(1, rows.row_ranges_size()); - auto const& range = rows.row_ranges(0); - EXPECT_EQ("r2", range.start_key_open()); - }); - auto& stream1 = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream1, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - std::cout << "Second Read for stream1 " << std::endl; - btproto::ReadRowsResponse resp; - resp.set_last_scanned_row_key("r2"); - *r = resp; - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream1, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::UNAVAILABLE, "retry"); - }); - - EXPECT_CALL(stream2, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRows({"r1", "r2", "r3"}); - promises_from_user_cb_[0].set_value(true); - ReadRows(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return "r1" - - row_futures_[0].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return last_scanned_row_key = "r2" - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream1 with failure - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish timer - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -/// @test Verify proper handling of bogus responses from the service. -TEST_F(TableAsyncReadRowsTest, ParserFailure) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - // Row not in increasing order. - R"( - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r2"); - promises_from_user_cb_[0].set_value(true); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish placeholder Read() - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - row_futures_[0].get(); - - auto stream_status = stream_status_future_.get(); - ASSERT_EQ(StatusCode::kInternal, stream_status.code()); - ASSERT_EQ(0U, cq_impl_->size()); -} - -enum class CancelMode { - kFalseValue, -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - kStdExcept, - kOtherExcept, -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS -}; - -/// @test Verify canceling the stream by satisfying the futures with false -class TableAsyncReadRowsCancelMidStreamTest - : public TableAsyncReadRowsTest, - public WithParamInterface {}; - -TEST_P(TableAsyncReadRowsCancelMidStreamTest, CancelMidStream) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - row_futures_[0].get(); - - // Check that we're not asking for data unless someone is waiting for it. - ASSERT_EQ(0U, cq_impl_->size()); - - switch (GetParam()) { - case CancelMode::kFalseValue: - promises_from_user_cb_[0].set_value(false); - break; -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - case CancelMode::kStdExcept: - try { - throw std::runtime_error("user threw std::exception"); - } catch (...) { - promises_from_user_cb_[0].set_exception(std::current_exception()); - } - break; - case CancelMode::kOtherExcept: - try { - throw 5; - } catch (...) { - promises_from_user_cb_[0].set_exception(std::current_exception()); - } - break; -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - } - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_EQ(StatusCode::kCancelled, stream_status.code()); - switch (GetParam()) { - case CancelMode::kFalseValue: - ASSERT_THAT(stream_status.message(), HasSubstr("User cancelled")); - break; -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - case CancelMode::kStdExcept: - ASSERT_THAT(stream_status.message(), - HasSubstr("user threw std::exception")); - break; - case CancelMode::kOtherExcept: - ASSERT_THAT(stream_status.message(), HasSubstr("unknown exception")); - break; -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - } - - ASSERT_EQ(0U, cq_impl_->size()); -} - -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS -INSTANTIATE_TEST_SUITE_P(CancelMidStream, TableAsyncReadRowsCancelMidStreamTest, - Values(CancelMode::kFalseValue, CancelMode::kStdExcept, - CancelMode::kOtherExcept)); -#else // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS -INSTANTIATE_TEST_SUITE_P(CancelMidStream, TableAsyncReadRowsCancelMidStreamTest, - Values(CancelMode::kFalseValue)); -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - -/// @test Like CancelMidStream but after the underlying stream has finished. -TEST_F(TableAsyncReadRowsTest, CancelAfterStreamFinish) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - // First two rows are going to be processed, but third will cause the parser - // to fail (row order violation). This will result in finishing the stream - // while still keeping the two processed rows for the user. - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - chunks { - row_key: "r0" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - ExpectRow("r1"); - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - ASSERT_EQ(0U, cq_impl_->size()); - - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - auto row = row_futures_[0].get(); - - // Check that we're not asking for data unless someone is waiting for it. - ASSERT_EQ(0U, cq_impl_->size()); - promises_from_user_cb_[0].set_value(false); - - auto stream_status = stream_status_future_.get(); - ASSERT_FALSE(stream_status.ok()); - ASSERT_EQ(StatusCode::kCancelled, stream_status.code()); -} - -/// @test Verify that the recursion described in TryGiveRowToUser is bounded. -TEST_F(TableAsyncReadRowsTest, DeepStack) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - auto large_response = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "000" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - ExpectRow("000"); - for (int i = 1; i < 101; ++i) { - auto chunk = large_response.chunks(0); - std::stringstream s_idx; - s_idx << std::setfill('0') << std::setw(3) << i; - chunk.set_row_key(s_idx.str()); - ExpectRow(chunk.row_key()); - *large_response.add_chunks() = std::move(chunk); - } - - EXPECT_CALL(stream, Read) - .WillOnce([large_response](btproto::ReadRowsResponse* r, void*) { - *r = large_response; - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - for (int i = 0; i < 101; ++i) { - promises_from_user_cb_[i].set_value(true); - } - ReadRows(); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_futures_[0])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - - for (int i = 0; i < 100; ++i) { - row_futures_[i].get(); - } - ASSERT_TRUE(Unsatisfied(row_futures_[100])); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // RunAsync - row_futures_[100].get(); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(stream_status_future_)); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto stream_status = stream_status_future_.get(); - ASSERT_STATUS_OK(stream_status); - ASSERT_EQ(0U, cq_impl_->size()); -} - -TEST_F(TableAsyncReadRowsTest, ReadRowSuccess) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Read) - .WillOnce([](btproto::ReadRowsResponse* r, void*) { - *r = bigtable::testing::ReadRowsResponseFromString( - R"( - chunks { - row_key: "000" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - })"); - }) - .RetiresOnSaturation(); - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - auto row_future = table_.AsyncReadRow("000", Filter::PassAllFilter()); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - EXPECT_TRUE(Unsatisfied(row_future)); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Return data - - // We return data only after the whole stream is finished. - ASSERT_TRUE(Unsatisfied(row_future)); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto row = row_future.get(); - ASSERT_STATUS_OK(row); - ASSERT_TRUE(row->first); - ASSERT_EQ("000", row->second.row_key()); - - ASSERT_EQ(0U, cq_impl_->size()); -} - -TEST_F(TableAsyncReadRowsTest, ReadRowNotFound) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - - auto row_future = table_.AsyncReadRow("000", Filter::PassAllFilter()); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(row_future)); - - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto row = row_future.get(); - ASSERT_STATUS_OK(row); - ASSERT_FALSE(row->first); -} - -TEST_F(TableAsyncReadRowsTest, ReadRowError) { - auto& stream = AddReader([](btproto::ReadRowsRequest const&) {}); - - EXPECT_CALL(stream, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::PERMISSION_DENIED, ""); - }); - - auto row_future = table_.AsyncReadRow("000", Filter::PassAllFilter()); - - EXPECT_TRUE(reader_started_[0]); - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); // Finish Start() - - ASSERT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(false); // Finish stream - ASSERT_EQ(1U, cq_impl_->size()); - EXPECT_TRUE(Unsatisfied(row_future)); - - cq_impl_->SimulateCompletion(true); // Finish Finish() - - auto row = row_future.get(); - ASSERT_FALSE(row); - ASSERT_EQ(StatusCode::kPermissionDenied, row.status().code()); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_async_row_sampler.cc b/google/cloud/bigtable/internal/legacy_async_row_sampler.cc deleted file mode 100644 index 9ed3f3065b620..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_row_sampler.cc +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_async_row_sampler.h" -#include "google/cloud/grpc_error_delegate.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { - -namespace btproto = ::google::bigtable::v2; - -future>> LegacyAsyncRowSampler::Create( - CompletionQueue cq, std::shared_ptr client, - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - MetadataUpdatePolicy metadata_update_policy, std::string app_profile_id, - std::string table_name) { - std::shared_ptr sampler(new LegacyAsyncRowSampler( - std::move(cq), std::move(client), std::move(rpc_retry_policy), - std::move(rpc_backoff_policy), std::move(metadata_update_policy), - std::move(app_profile_id), std::move(table_name))); - sampler->StartIteration(); - return sampler->promise_.get_future(); -} - -LegacyAsyncRowSampler::LegacyAsyncRowSampler( - CompletionQueue cq, std::shared_ptr client, - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - MetadataUpdatePolicy metadata_update_policy, std::string app_profile_id, - std::string table_name) - : cq_(std::move(cq)), - client_(std::move(client)), - rpc_retry_policy_(std::move(rpc_retry_policy)), - rpc_backoff_policy_(std::move(rpc_backoff_policy)), - metadata_update_policy_(std::move(metadata_update_policy)), - app_profile_id_(std::move(app_profile_id)), - table_name_(std::move(table_name)), - promise_([this] { keep_reading_ = false; }) {} - -void LegacyAsyncRowSampler::StartIteration() { - btproto::SampleRowKeysRequest request; - request.set_app_profile_id(app_profile_id_); - request.set_table_name(table_name_); - - auto context = std::make_unique(); - rpc_retry_policy_->Setup(*context); - rpc_backoff_policy_->Setup(*context); - metadata_update_policy_.Setup(*context); - - auto& client = client_; - auto self = this->shared_from_this(); - cq_.MakeStreamingReadRpc( - [client](grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request, - grpc::CompletionQueue* cq) { - return client->PrepareAsyncSampleRowKeys(context, request, cq); - }, - request, std::move(context), - [self](btproto::SampleRowKeysResponse response) { - return self->OnRead(std::move(response)); - }, - [self](Status const& status) { self->OnFinish(status); }); -} - -future LegacyAsyncRowSampler::OnRead( - btproto::SampleRowKeysResponse response) { - RowKeySample row_sample; - row_sample.offset_bytes = response.offset_bytes(); - row_sample.row_key = std::move(*response.mutable_row_key()); - samples_.emplace_back(std::move(row_sample)); - return make_ready_future(keep_reading_.load()); -} - -void LegacyAsyncRowSampler::OnFinish(Status const& status) { - if (status.ok()) { - promise_.set_value(std::move(samples_)); - return; - } - if (!rpc_retry_policy_->OnFailure(status)) { - promise_.set_value(status); - return; - } - - using TimerFuture = future>; - - samples_.clear(); - auto self = this->shared_from_this(); - auto delay = rpc_backoff_policy_->OnCompletion(std::move(status)); - cq_.MakeRelativeTimer(delay).then([self](TimerFuture result) { - if (result.get()) { - self->StartIteration(); - } else { - self->promise_.set_value( - Status(StatusCode::kCancelled, "call cancelled")); - } - }); -} - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_async_row_sampler.h b/google/cloud/bigtable/internal/legacy_async_row_sampler.h deleted file mode 100644 index 8627501afa627..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_row_sampler.h +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_ROW_SAMPLER_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_ROW_SAMPLER_H - -#include "google/cloud/bigtable/completion_queue.h" -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/metadata_update_policy.h" -#include "google/cloud/bigtable/row_key_sample.h" -#include "google/cloud/bigtable/rpc_backoff_policy.h" -#include "google/cloud/bigtable/rpc_retry_policy.h" -#include "google/cloud/bigtable/version.h" -#include "google/cloud/future_generic.h" -#include "google/cloud/status.h" -#include "google/cloud/status_or.h" -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { - -/** - * Objects of this class represent the state of receiving row keys via - * AsyncSampleRows. - */ -class LegacyAsyncRowSampler - : public std::enable_shared_from_this { - public: - static future>> Create( - CompletionQueue cq, std::shared_ptr client, - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - MetadataUpdatePolicy metadata_update_policy, std::string app_profile_id, - std::string table_name); - - private: - LegacyAsyncRowSampler(CompletionQueue cq, std::shared_ptr client, - std::unique_ptr rpc_retry_policy, - std::unique_ptr rpc_backoff_policy, - MetadataUpdatePolicy metadata_update_policy, - std::string app_profile_id, std::string table_name); - - void StartIteration(); - future OnRead(google::bigtable::v2::SampleRowKeysResponse response); - void OnFinish(Status const& status); - - CompletionQueue cq_; - std::shared_ptr client_; - std::unique_ptr rpc_retry_policy_; - std::unique_ptr rpc_backoff_policy_; - MetadataUpdatePolicy metadata_update_policy_; - std::string app_profile_id_; - std::string table_name_; - - std::atomic keep_reading_{true}; - std::vector samples_; - promise>> promise_; -}; - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ASYNC_ROW_SAMPLER_H diff --git a/google/cloud/bigtable/internal/legacy_async_row_sampler_test.cc b/google/cloud/bigtable/internal/legacy_async_row_sampler_test.cc deleted file mode 100644 index c048d81143a74..0000000000000 --- a/google/cloud/bigtable/internal/legacy_async_row_sampler_test.cc +++ /dev/null @@ -1,462 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_async_row_sampler.h" -#include "google/cloud/bigtable/testing/mock_policies.h" -#include "google/cloud/bigtable/testing/mock_response_reader.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/testing_util/fake_completion_queue_impl.h" -#include "google/cloud/testing_util/status_matchers.h" -#include -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; - -using ::google::cloud::bigtable::testing::MockBackoffPolicy; -using ::google::cloud::bigtable::testing::MockClientAsyncReaderInterface; -using ::google::cloud::testing_util::FakeCompletionQueueImpl; -using ::google::cloud::testing_util::StatusIs; -using ::testing::ElementsAre; -using ::testing::HasSubstr; - -class AsyncSampleRowKeysTest : public bigtable::testing::TableTestFixture { - protected: - AsyncSampleRowKeysTest() - : TableTestFixture( - CompletionQueue(std::make_shared())), - rpc_retry_policy_( - bigtable::DefaultRPCRetryPolicy(internal::kBigtableLimits)), - metadata_update_policy_("my_table", MetadataParamTypes::NAME) {} - - std::shared_ptr rpc_retry_policy_; - MetadataUpdatePolicy metadata_update_policy_; -}; - -struct RowKeySampleVectors { - explicit RowKeySampleVectors(std::vector samples) { - row_keys.reserve(samples.size()); - offset_bytes.reserve(samples.size()); - for (auto& sample : samples) { - row_keys.emplace_back(std::move(sample.row_key)); - offset_bytes.emplace_back(std::move(sample.offset_bytes)); - } - } - - std::vector row_keys; - std::vector offset_bytes; -}; - -TEST_F(AsyncSampleRowKeysTest, Simple) { - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test2"); - r->set_offset_bytes(22); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse*, void*) {}); - - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - return reader; - }); - - auto samples_future = table_.AsyncSampleRows(); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response 1 - cq_impl_->SimulateCompletion(true); - // Return response 2 - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - auto status = samples_future.get(); - ASSERT_STATUS_OK(status); - - auto samples = RowKeySampleVectors(status.value()); - EXPECT_THAT(samples.row_keys, ElementsAre("test1", "test2")); - EXPECT_THAT(samples.offset_bytes, ElementsAre(11, 22)); -} - -TEST_F(AsyncSampleRowKeysTest, Retry) { - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse*, void*) {}); - - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - }); - return reader; - }) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test2"); - r->set_offset_bytes(22); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse*, void*) {}); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - return reader; - }); - - auto samples_future = table_.AsyncSampleRows(); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - // Simulate the backoff timer - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(0U, cq_impl_->size()); - - auto status = samples_future.get(); - ASSERT_STATUS_OK(status); - - auto samples = RowKeySampleVectors(status.value()); - EXPECT_THAT(samples.row_keys, ElementsAre("test2")); - EXPECT_THAT(samples.offset_bytes, ElementsAre(22)); -} - -TEST_F(AsyncSampleRowKeysTest, TooManyFailures) { - // We give up on the 3rd error. - auto constexpr kErrorCount = 2; - Table custom_table(client_, "foo_table", - LimitedErrorCountRetryPolicy(kErrorCount)); - - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .Times(kErrorCount + 1) - .WillRepeatedly([](grpc::ClientContext*, - btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - }); - return reader; - }); - - auto samples_future = custom_table.AsyncSampleRows(); - - for (int retry = 0; retry < kErrorCount; ++retry) { - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - // Simulate the backoff timer - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - } - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - auto status = samples_future.get(); - ASSERT_THAT(status, - StatusIs(StatusCode::kUnavailable, HasSubstr("try again"))); - - ASSERT_EQ(0U, cq_impl_->size()); -} - -TEST_F(AsyncSampleRowKeysTest, UsesBackoff) { - auto grpc_error = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - auto error = MakeStatusFromRpcError(grpc_error); - - std::unique_ptr mock(new MockBackoffPolicy); - EXPECT_CALL(*mock, Setup).Times(2); - EXPECT_CALL(*mock, OnCompletion(error)); - - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .WillOnce([grpc_error](grpc::ClientContext*, - btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish) - .WillOnce([grpc_error](grpc::Status* status, void*) { - *status = grpc_error; - }); - return reader; - }) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - return reader; - }); - - auto samples_future = internal::LegacyAsyncRowSampler::Create( - cq_, client_, rpc_retry_policy_->clone(), std::move(mock), - metadata_update_policy_, "my-app-profile", "my-table"); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - // Simulate the backoff timer - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(0U, cq_impl_->size()); -} - -TEST_F(AsyncSampleRowKeysTest, CancelDuringBackoff) { - auto grpc_error = grpc::Status(grpc::StatusCode::UNAVAILABLE, "try again"); - auto error = MakeStatusFromRpcError(grpc_error); - - std::unique_ptr mock(new MockBackoffPolicy); - EXPECT_CALL(*mock, Setup); - EXPECT_CALL(*mock, OnCompletion(error)); - - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .WillOnce([grpc_error](grpc::ClientContext*, - btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read).Times(2); - EXPECT_CALL(*reader, Finish) - .WillOnce([grpc_error](grpc::Status* status, void*) { - *status = grpc_error; - }); - return reader; - }); - - auto samples_future = internal::LegacyAsyncRowSampler::Create( - cq_, client_, rpc_retry_policy_->clone(), std::move(mock), - metadata_update_policy_, "my-app-profile", "my-table"); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - ASSERT_EQ(1U, cq_impl_->size()); - - // Cancel the pending operation. - samples_future.cancel(); - // Simulate the backoff timer - cq_impl_->SimulateCompletion(false); - - ASSERT_EQ(0U, cq_impl_->size()); - - auto status = samples_future.get(); - ASSERT_THAT(status, - StatusIs(StatusCode::kCancelled, HasSubstr("call cancelled"))); -} - -TEST_F(AsyncSampleRowKeysTest, CancelAfterSuccess) { - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse*, void*) {}); - - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status::OK; - }); - return reader; - }); - - auto samples_future = table_.AsyncSampleRows(); - // samples_future.cancel(); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response - cq_impl_->SimulateCompletion(true); - - // Cancel the pending operation - samples_future.cancel(); - - // End stream - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - auto status = samples_future.get(); - ASSERT_STATUS_OK(status); - - auto samples = RowKeySampleVectors(status.value()); - EXPECT_THAT(samples.row_keys, ElementsAre("test1")); - EXPECT_THAT(samples.offset_bytes, ElementsAre(11)); -} - -TEST_F(AsyncSampleRowKeysTest, CancelMidStream) { - EXPECT_CALL(*client_, PrepareAsyncSampleRowKeys) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&, - grpc::CompletionQueue*) { - auto reader = std::make_unique< - MockClientAsyncReaderInterface>(); - EXPECT_CALL(*reader, StartCall); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test2"); - r->set_offset_bytes(22); - } - }) - .WillOnce([](btproto::SampleRowKeysResponse* r, void*) { - { - r->set_row_key("test3"); - r->set_offset_bytes(33); - } - }); - EXPECT_CALL(*reader, Finish).WillOnce([](grpc::Status* status, void*) { - *status = grpc::Status(grpc::StatusCode::CANCELLED, "User cancelled"); - }); - return reader; - }); - - auto samples_future = table_.AsyncSampleRows(); - - // Start() - cq_impl_->SimulateCompletion(true); - // Return response 1 - cq_impl_->SimulateCompletion(true); - // Cancel the pending operation - samples_future.cancel(); - // Return response 2 - cq_impl_->SimulateCompletion(true); - // Return response 3 - cq_impl_->SimulateCompletion(false); - // Finish() - cq_impl_->SimulateCompletion(true); - - auto status = samples_future.get(); - EXPECT_THAT(status, - StatusIs(StatusCode::kCancelled, HasSubstr("User cancelled"))); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_bulk_mutator_test.cc b/google/cloud/bigtable/internal/legacy_bulk_mutator_test.cc deleted file mode 100644 index 5674b8aff7390..0000000000000 --- a/google/cloud/bigtable/internal/legacy_bulk_mutator_test.cc +++ /dev/null @@ -1,496 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/bulk_mutator.h" -#include "google/cloud/bigtable/testing/mock_data_client.h" -#include "google/cloud/bigtable/testing/mock_mutate_rows_reader.h" -#include "google/cloud/bigtable/testing/mock_response_reader.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/fake_completion_queue_impl.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; -using ::testing::Return; -using ::google::cloud::testing_util::chrono_literals::operator""_ms; -using ::google::cloud::bigtable::testing::MockMutateRowsReader; - -auto constexpr kTableName = "projects/blah/instances/blah2/tables/table"; - -std::unique_ptr TestContext( - std::string const& app_profile_id = "") { - auto context = std::make_unique(); - bigtable_internal::MakeMetadataUpdatePolicy(kTableName, app_profile_id) - .Setup(*context); - return context; -} - -/// @test Verify that MultipleRowsMutator handles easy cases. -TEST(MultipleRowsMutatorTest, Simple) { - // In this test we create a Mutation for two rows, which succeeds in the - // first RPC request. First create the mutation. - BulkMutation mut( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")})); - - // Prepare the mocks. The mutator should issue a RPC which must return a - // stream of responses, we prepare the stream first because it is easier than - // to create one of the fly. - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - { - auto& e = *r->add_entries(); - e.set_index(1); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*reader, Finish()).WillOnce(Return(grpc::Status::OK)); - - // Now prepare the client for the one request. - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce(reader.release()->MakeMockReturner()); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "", kTableName, *policy, std::move(mut), - std::make_shared()); - - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext(); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_TRUE(status.ok()); - auto failures = std::move(mutator).OnRetryDone(); - EXPECT_TRUE(failures.empty()); -} - -/// @test Verify that MultipleRowsMutator uses app_profile_id when set. -TEST(MultipleRowsMutatorTest, BulkApplyAppProfileId) { - namespace btproto = ::google::bigtable::v2; - - // In this test we create a Mutation for two rows, which succeeds in the - // first RPC request. First create the mutation. - BulkMutation mut( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")})); - - // Prepare the mocks. The mutator should issue a RPC which must return a - // stream of responses, we prepare the stream first because it is easier than - // to create one of the fly. - - // Now prepare the client for the one request. - std::string expected_id = "test-id"; - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce([expected_id](grpc::ClientContext*, - btproto::MutateRowsRequest const& req) { - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - { - auto& e = *r->add_entries(); - e.set_index(1); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*reader, Finish()).WillOnce(Return(grpc::Status::OK)); - EXPECT_EQ(expected_id, req.app_profile_id()); - return reader; - }); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "test-id", kTableName, *policy, std::move(mut), - std::make_shared()); - - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext("test-id"); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_TRUE(status.ok()); - auto failures = std::move(mutator).OnRetryDone(); - EXPECT_TRUE(failures.empty()); -} - -/// @test Verify that MultipleRowsMutator retries partial failures. -TEST(MultipleRowsMutatorTest, RetryPartialFailure) { - // In this test we create a Mutation for two rows, one of which will fail. - // First create the mutation. - BulkMutation mut( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")})); - - // Prepare the mocks for the request. First create a stream response which - // indicates a partial failure. - - // Setup the client to response with r1 first, and r2 next. - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce( - [](grpc::ClientContext*, btproto::MutateRowsRequest const& req) { - EXPECT_EQ(kTableName, req.table_name()); - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - // Simulate a partial (and recoverable) failure. - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - auto& e1 = *r->add_entries(); - e1.set_index(1); - e1.mutable_status()->set_code(grpc::StatusCode::OK); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish).WillOnce(Return(grpc::Status::OK)); - return r1; - }) - .WillOnce( - [](grpc::ClientContext*, btproto::MutateRowsRequest const& req) { - EXPECT_EQ(kTableName, req.table_name()); - // Prepare a second stream response, because the client should retry - // after the partial failure. - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish).WillOnce(Return(grpc::Status::OK)); - return r2; - }); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "", kTableName, *policy, std::move(mut), - std::make_shared()); - - // This work will be in BulkApply(), but this is the test for BulkMutator in - // isolation, so call MakeOneRequest() twice, for the r1, and the r2 cases. - for (int i = 0; i != 2; ++i) { - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext(); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_TRUE(status.ok()); - } - auto failures = std::move(mutator).OnRetryDone(); - EXPECT_TRUE(failures.empty()); -} - -/// @test Verify that MultipleRowsMutator handles permanent failures. -TEST(MultipleRowsMutatorTest, PermanentFailure) { - // In this test we handle a recoverable and one unrecoverable failures. - // Create a bulk mutation with two SetCell() mutations. - BulkMutation mut( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")})); - - // Make the first RPC return one recoverable and one unrecoverable failures. - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - // Simulate a partial failure, which is recoverable for this first - // element. - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - // Simulate an unrecoverable failure for the second element. - auto& e1 = *r->add_entries(); - e1.set_index(1); - e1.mutable_status()->set_code(grpc::StatusCode::OUT_OF_RANGE); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()).WillOnce(Return(grpc::Status::OK)); - - // The BulkMutator should issue a second request, which will return success - // for the remaining mutation. - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish()).WillOnce(Return(grpc::Status::OK)); - - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce(r1.release()->MakeMockReturner()) - .WillOnce(r2.release()->MakeMockReturner()); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "", kTableName, *policy, std::move(mut), - std::make_shared()); - - // This work will be in BulkApply(), but this is the test for BulkMutator in - // isolation, so call MakeOneRequest() twice, for the r1, and the r2 cases. - for (int i = 0; i != 2; ++i) { - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext(); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_TRUE(status.ok()); - } - auto failures = std::move(mutator).OnRetryDone(); - ASSERT_EQ(1UL, failures.size()); - EXPECT_EQ(1, failures[0].original_index()); - // EXPECT_EQ("bar", failures[0].mutation().row_key()); - EXPECT_EQ(google::cloud::StatusCode::kOutOfRange, - failures[0].status().code()); -} - -/// @test Verify that MultipleRowsMutator handles a stream with partial results -TEST(MultipleRowsMutatorTest, PartialStream) { - // We are going to test the case where the stream does not contain a response - // for all requests. Create a BulkMutation with two entries. - BulkMutation mut( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")})); - - // This will be the stream returned by the first request. It is missing - // information about one of the mutations. - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::OK); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()).WillOnce(Return(grpc::Status::OK)); - - // The BulkMutation should issue a second request, this is the stream returned - // by the second request, which indicates success for the missed mutation - // on r1. - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish()).WillOnce(Return(grpc::Status::OK)); - - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce(r1.release()->MakeMockReturner()) - .WillOnce(r2.release()->MakeMockReturner()); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "", kTableName, *policy, std::move(mut), - std::make_shared()); - - // This work will be in BulkApply(), but this is the test for BulkMutator in - // isolation, so call MakeOneRequest() twice: for the r1 and r2 cases. - for (int i = 0; i != 2; ++i) { - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext(); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_TRUE(status.ok()); - } - auto failures = std::move(mutator).OnRetryDone(); - EXPECT_TRUE(failures.empty()); -} - -/// @test Verify that MultipleRowsMutator only retries idempotent mutations -TEST(MultipleRowsMutatorTest, RetryOnlyIdempotent) { - // Create a BulkMutation with a non-idempotent mutation. - BulkMutation mut( - SingleRowMutation("foo", {SetCell("fam", "col", "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}), - SingleRowMutation("baz", {SetCell("fam", "col", "v")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")})); - - // We will setup the mock to return recoverable failures for idempotent - // mutations. - - // Verify that the second response has the right contents. It is easier (and - // more readable) to write these in a separate small lambda expression because - // ASSERT_EQ() has an embedded "return;" in it, which does not play well with - // the rest of the stuff here. - auto expect_r2 = [](btproto::MutateRowsRequest const& r) { - ASSERT_EQ(2, r.entries_size()); - EXPECT_EQ("bar", r.entries(0).row_key()); - }; - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce([](grpc::ClientContext*, btproto::MutateRowsRequest const& r) { - EXPECT_EQ(4, r.entries_size()); - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - // Simulate recoverable failures for both elements. - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - auto& e1 = *r->add_entries(); - e1.set_index(1); - e1.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish).WillOnce(Return(grpc::Status::OK)); - return r1; - }) - .WillOnce([expect_r2](grpc::ClientContext*, - btproto::MutateRowsRequest const& r) { - expect_r2(r); - // The BulkMutator should issue a second request, with only the - // idempotent mutations, make the mocks return success for them. - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish).WillOnce(Return(grpc::Status::OK)); - - return r2; - }); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "", kTableName, *policy, std::move(mut), - std::make_shared()); - - // This work will be in BulkApply(), but this is the test for BulkMutator in - // isolation, so call MakeOneRequest() twice, for the r1, and the r2 cases. - for (int i = 0; i != 2; ++i) { - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext(); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_TRUE(status.ok()); - } - auto failures = std::move(mutator).OnRetryDone(); - ASSERT_EQ(3UL, failures.size()); - EXPECT_EQ(0, failures[0].original_index()); - // EXPECT_EQ("foo", failures[0].mutation().row_key()); - EXPECT_EQ(google::cloud::StatusCode::kUnavailable, - failures[0].status().code()); - - EXPECT_EQ(2, failures[1].original_index()); - // EXPECT_EQ("baz", failures[1].mutation().row_key()); - EXPECT_EQ(google::cloud::StatusCode::kInternal, failures[1].status().code()); - EXPECT_EQ(google::cloud::StatusCode::kInternal, failures[2].status().code()); -} - -TEST(MultipleRowsMutatorTest, UnconfirmedAreFailed) { - // Make sure that mutations which are not confirmed are reported as UNKNOWN - // with the proper index. - BulkMutation mut(SingleRowMutation("foo", {SetCell("fam", "col", "baz")}), - // this one will be unconfirmed - SingleRowMutation("bar", {SetCell("fam", "col", "qux")}), - SingleRowMutation("baz", {SetCell("fam", "col", "v")})); - - // We will setup the mock to return recoverable failures for idempotent - // mutations. - - // The BulkMutator should not issue a second request because the error is - // PERMISSION_DENIED (not retryable). - - bigtable::testing::MockDataClient client; - EXPECT_CALL(client, MutateRows) - .WillOnce([](grpc::ClientContext*, btproto::MutateRowsRequest const& r) { - EXPECT_EQ(3, r.entries_size()); - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::OK); - auto& e1 = *r->add_entries(); - e1.set_index(2); - e1.mutable_status()->set_code(grpc::StatusCode::OK); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish) - .WillOnce( - Return(grpc::Status(grpc::StatusCode::PERMISSION_DENIED, ""))); - return r1; - }); - - auto policy = DefaultIdempotentMutationPolicy(); - bigtable_internal::BulkMutator mutator( - "", kTableName, *policy, std::move(mut), - std::make_shared()); - - EXPECT_TRUE(mutator.HasPendingMutations()); - auto context = TestContext(); - auto status = mutator.MakeOneRequest(client, *context); - EXPECT_FALSE(status.ok()); - - auto failures = std::move(mutator).OnRetryDone(); - ASSERT_EQ(1UL, failures.size()); - EXPECT_EQ(1, failures[0].original_index()); - // EXPECT_EQ("bar", failures[0].mutation().row_key()); - EXPECT_EQ(google::cloud::StatusCode::kPermissionDenied, - failures.front().status().code()); -} - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_row_reader.cc b/google/cloud/bigtable/internal/legacy_row_reader.cc deleted file mode 100644 index 62eeafff9ca3e..0000000000000 --- a/google/cloud/bigtable/internal/legacy_row_reader.cc +++ /dev/null @@ -1,200 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_row_reader.h" -#include "google/cloud/bigtable/table.h" -#include "google/cloud/grpc_error_delegate.h" -#include "google/cloud/internal/throw_delegate.h" -#include "google/cloud/log.h" -#include - -namespace google { -namespace cloud { -namespace bigtable_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -LegacyRowReader::LegacyRowReader( - std::shared_ptr client, std::string table_name, - bigtable::RowSet row_set, std::int64_t rows_limit, bigtable::Filter filter, - std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - bigtable::MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory) - : LegacyRowReader(std::move(client), std::string(""), std::move(table_name), - std::move(row_set), rows_limit, std::move(filter), - std::move(retry_policy), std::move(backoff_policy), - std::move(metadata_update_policy), - std::move(parser_factory)) {} - -LegacyRowReader::LegacyRowReader( - std::shared_ptr client, std::string app_profile_id, - std::string table_name, bigtable::RowSet row_set, std::int64_t rows_limit, - bigtable::Filter filter, - std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - bigtable::MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory) - : client_(std::move(client)), - app_profile_id_(std::move(app_profile_id)), - table_name_(std::move(table_name)), - row_set_(std::move(row_set)), - rows_limit_(rows_limit), - filter_(std::move(filter)), - retry_policy_(std::move(retry_policy)), - backoff_policy_(std::move(backoff_policy)), - metadata_update_policy_(std::move(metadata_update_policy)), - parser_factory_(std::move(parser_factory)) {} - -void LegacyRowReader::MakeRequest() { - response_ = {}; - processed_chunks_count_ = 0; - - google::bigtable::v2::ReadRowsRequest request; - request.set_table_name(table_name_); - request.set_app_profile_id(app_profile_id_); - - auto row_set_proto = row_set_.as_proto(); - request.mutable_rows()->Swap(&row_set_proto); - - auto filter_proto = filter_.as_proto(); - request.mutable_filter()->Swap(&filter_proto); - - if (rows_limit_ != bigtable::RowReader::NO_ROWS_LIMIT) { - request.set_rows_limit(rows_limit_ - rows_count_); - } - - context_ = std::make_unique(); - retry_policy_->Setup(*context_); - backoff_policy_->Setup(*context_); - metadata_update_policy_.Setup(*context_); - stream_ = client_->ReadRows(context_.get(), request); - stream_is_open_ = true; - - parser_ = parser_factory_->Create(false); -} - -bool LegacyRowReader::NextChunk() { - ++processed_chunks_count_; - while (processed_chunks_count_ >= response_.chunks_size()) { - processed_chunks_count_ = 0; - bool response_is_valid = stream_->Read(&response_); - if (!response_is_valid) { - response_ = {}; - return false; - } - if (!response_.last_scanned_row_key().empty()) { - last_read_row_key_ = std::move(*response_.mutable_last_scanned_row_key()); - } - } - return true; -} - -absl::variant LegacyRowReader::Advance() { - if (operation_cancelled_) { - return Status(StatusCode::kCancelled, "Operation cancelled."); - } - while (true) { - auto variant = AdvanceOrFail(); - if (absl::holds_alternative(variant)) { - return absl::get(std::move(variant)); - } - - auto status = absl::get(std::move(variant)); - if (status.ok()) return Status{}; - - // In the unlikely case when we have already reached the requested - // number of rows and still receive an error (the parser can throw - // an error at end of stream for example), there is no need to - // retry and we have no good value for rows_limit anyway. - if (rows_limit_ != bigtable::RowReader::NO_ROWS_LIMIT && - rows_limit_ <= rows_count_) { - return Status{}; - } - - if (!last_read_row_key_.empty()) { - // We've returned some rows and need to make sure we don't - // request them again. - row_set_ = - row_set_.Intersect(bigtable::RowRange::Open(last_read_row_key_, "")); - } - - // If we receive an error, but the retryable set is empty, stop. - if (row_set_.IsEmpty()) return Status{}; - - if (!retry_policy_->OnFailure(status)) return status; - - auto delay = backoff_policy_->OnCompletion(status); - std::this_thread::sleep_for(delay); - - // If we reach this place, we failed and need to restart the call. - MakeRequest(); - } -} - -absl::variant LegacyRowReader::AdvanceOrFail() { - grpc::Status status; - if (!stream_) { - MakeRequest(); - } - while (!parser_->HasNext()) { - if (NextChunk()) { - parser_->HandleChunk( - std::move(*(response_.mutable_chunks(processed_chunks_count_))), - status); - if (!status.ok()) return MakeStatusFromRpcError(status); - continue; - } - - // Here, there are no more chunks to look at. Close the stream, - // finalize the parser and return OK with no rows unless something - // fails during cleanup. - stream_is_open_ = false; - status = stream_->Finish(); - if (!status.ok()) return MakeStatusFromRpcError(status); - parser_->HandleEndOfStream(status); - return MakeStatusFromRpcError(status); - } - - // We have a complete row in the parser. - bigtable::Row parsed_row = parser_->Next(status); - if (!status.ok()) return MakeStatusFromRpcError(status); - - ++rows_count_; - last_read_row_key_ = parsed_row.row_key(); - return parsed_row; -} - -void LegacyRowReader::Cancel() { - operation_cancelled_ = true; - if (!stream_is_open_) return; - context_->TryCancel(); - - // Also drain any data left unread - google::bigtable::v2::ReadRowsResponse response; - while (stream_->Read(&response)) { - } - - stream_is_open_ = false; - (void)stream_->Finish(); // ignore errors -} - -LegacyRowReader::~LegacyRowReader() { - // Make sure we don't leave open streams. - Cancel(); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable_internal -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/legacy_row_reader.h b/google/cloud/bigtable/internal/legacy_row_reader.h deleted file mode 100644 index f1522eeb95819..0000000000000 --- a/google/cloud/bigtable/internal/legacy_row_reader.h +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ROW_READER_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ROW_READER_H - -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/filters.h" -#include "google/cloud/bigtable/internal/readrowsparser.h" -#include "google/cloud/bigtable/internal/row_reader_impl.h" -#include "google/cloud/bigtable/metadata_update_policy.h" -#include "google/cloud/bigtable/row.h" -#include "google/cloud/bigtable/row_set.h" -#include "google/cloud/bigtable/rpc_backoff_policy.h" -#include "google/cloud/bigtable/rpc_retry_policy.h" -#include "google/cloud/bigtable/version.h" -#include "absl/types/variant.h" -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * `RowReaderImpl` that interacts with the Bigtable service via `DataClient`. - */ -class LegacyRowReader : public RowReaderImpl { - public: - LegacyRowReader(std::shared_ptr client, - std::string table_name, bigtable::RowSet row_set, - std::int64_t rows_limit, bigtable::Filter filter, - std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - bigtable::MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr - parser_factory); - - LegacyRowReader(std::shared_ptr client, - std::string app_profile_id, std::string table_name, - bigtable::RowSet row_set, std::int64_t rows_limit, - bigtable::Filter filter, - std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - bigtable::MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr - parser_factory); - - ~LegacyRowReader() override; - - void Cancel() override; - - /** - * Read and parse the next row in the response. - * - * @param row receives the next row on success, and is reset on failure or if - * there are no more rows. - * - * This call possibly blocks waiting for data until a full row is available. - */ - absl::variant Advance() override; - - private: - /// Called by Advance(), does not handle retries. - absl::variant AdvanceOrFail(); - - /** - * Move the `processed_chunks_count_` index to the next chunk, - * reading data if needed. - * - * Returns false if no more chunks are available. - * - * This call is used internally by AdvanceOrFail to prepare data for - * parsing. When it returns true, the value of - * `response_.chunks(processed_chunks_count_)` is valid and holds - * the next chunk to parse. - */ - bool NextChunk(); - - /// Sends the ReadRows request to the stub. - void MakeRequest(); - - std::shared_ptr client_; - std::string app_profile_id_; - std::string table_name_; - bigtable::RowSet row_set_; - std::int64_t rows_limit_; - bigtable::Filter filter_; - std::unique_ptr retry_policy_; - std::unique_ptr backoff_policy_; - bigtable::MetadataUpdatePolicy metadata_update_policy_; - - std::unique_ptr context_; - - std::unique_ptr parser_factory_; - std::unique_ptr parser_; - std::unique_ptr< - grpc::ClientReaderInterface> - stream_; - bool stream_is_open_ = false; - bool operation_cancelled_ = false; - - /// The last received response, chunks are being parsed one by one from it. - google::bigtable::v2::ReadRowsResponse response_; - /// Number of chunks already parsed in response_. - int processed_chunks_count_ = 0; - - /// Number of rows read so far, used to set row_limit in retries. - std::int64_t rows_count_ = 0; - /// Holds the last read row key, for retries. - bigtable::RowKeyType last_read_row_key_; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable_internal -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LEGACY_ROW_READER_H diff --git a/google/cloud/bigtable/internal/legacy_row_reader_test.cc b/google/cloud/bigtable/internal/legacy_row_reader_test.cc deleted file mode 100644 index a3dea04f8d84b..0000000000000 --- a/google/cloud/bigtable/internal/legacy_row_reader_test.cc +++ /dev/null @@ -1,871 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/legacy_row_reader.h" -#include "google/cloud/bigtable/row_reader.h" -#include "google/cloud/bigtable/testing/mock_policies.h" -#include "google/cloud/bigtable/testing/mock_read_rows_reader.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/api_client_header.h" -#include "google/cloud/internal/throw_delegate.h" -#include "google/cloud/testing_util/scoped_log.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/testing_util/validate_metadata.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace bigtable_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::bigtable::v2::ReadRowsRequest; -using ::google::bigtable::v2::ReadRowsResponse_CellChunk; -using ::google::cloud::bigtable::Row; -using ::google::cloud::bigtable::testing::MockBackoffPolicy; -using ::google::cloud::bigtable::testing::MockReadRowsReader; -using ::google::cloud::bigtable::testing::MockRetryPolicy; -using ::google::cloud::testing_util::StatusIs; -using ::google::cloud::testing_util::ValidateMetadataFixture; -using ::testing::_; -using ::testing::An; -using ::testing::DoAll; -using ::testing::Eq; -using ::testing::Matcher; -using ::testing::NiceMock; -using ::testing::Property; -using ::testing::Return; -using ::testing::SetArgPointee; -using ::testing::SetArgReferee; - -class ReadRowsParserMock : public bigtable::internal::ReadRowsParser { - public: - explicit ReadRowsParserMock() : ReadRowsParser(false) {} - - MOCK_METHOD(void, HandleChunkHook, - (ReadRowsResponse_CellChunk chunk, grpc::Status& status)); - void HandleChunk(ReadRowsResponse_CellChunk chunk, - grpc::Status& status) override { - HandleChunkHook(chunk, status); - } - - MOCK_METHOD(void, HandleEndOfStreamHook, (grpc::Status & status)); - void HandleEndOfStream(grpc::Status& status) override { - HandleEndOfStreamHook(status); - } - - bool HasNext() const override { return !rows_.empty(); } - - Row Next(grpc::Status&) override { - Row row = rows_.front(); - rows_.pop_front(); - return row; - } - - void SetRows(std::initializer_list l) { - std::transform(l.begin(), l.end(), std::back_inserter(rows_), - [](std::string const& s) -> Row { - return Row(s, std::vector()); - }); - } - - private: - std::deque rows_; -}; - -// Returns a preconfigured set of parsers, so expectations can be set on each. -class ReadRowsParserMockFactory - : public bigtable::internal::ReadRowsParserFactory { - using ParserPtr = std::unique_ptr; - - public: - void AddParser(ParserPtr parser) { parsers_.emplace_back(std::move(parser)); } - - MOCK_METHOD(void, CreateHook, ()); - ParserPtr Create(bool reverse) override { - CreateHook(); - if (parsers_.empty()) { - return std::make_unique(reverse); - } - ParserPtr parser = std::move(parsers_.front()); - parsers_.pop_front(); - return parser; - } - - private: - std::deque parsers_; -}; - -// Match the number of expected row keys in a request in EXPECT_CALL -Matcher RequestWithRowKeysCount(int n) { - return Property( - &ReadRowsRequest::rows, - Property(&google::bigtable::v2::RowSet::row_keys_size, Eq(n))); -} - -// Match the row limit in a request -Matcher RequestWithRowsLimit(std::int64_t n) { - return Property(&ReadRowsRequest::rows_limit, Eq(n)); -} - -class LegacyRowReaderTest : public bigtable::testing::TableTestFixture { - public: - LegacyRowReaderTest() - : TableTestFixture(CompletionQueue{}), - retry_policy_(std::make_unique>()), - backoff_policy_(std::make_unique>()), - metadata_update_policy_(MakeMetadataUpdatePolicy(kTableName, "")), - parser_factory_( - std::make_unique>()) {} - - std::unique_ptr retry_policy_; - std::unique_ptr backoff_policy_; - bigtable::MetadataUpdatePolicy metadata_update_policy_; - std::unique_ptr> parser_factory_; -}; - -TEST_F(LegacyRowReaderTest, EmptyReaderHasNoRows) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish).WillOnce(Return(grpc::Status::OK)); - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - EXPECT_EQ(reader.begin(), reader.end()); -} - -TEST_F(LegacyRowReaderTest, ReadOneRow) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - EXPECT_CALL(*parser, HandleEndOfStreamHook).Times(1); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, ReadOneRowAppProfileId) { - // wrapped in unique_ptr by ReadRows - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - EXPECT_CALL(*parser, HandleEndOfStreamHook).Times(1); - EXPECT_CALL(*client_, ReadRows) - .WillOnce([](grpc::ClientContext* context, ReadRowsRequest const& req) { - ValidateMetadataFixture fixture; - fixture.IsContextMDValid( - *context, "google.bigtable.v2.Bigtable.ReadRows", req, - google::cloud::internal::HandCraftedLibClientHeader()); - EXPECT_EQ("test-app-profile-id", req.app_profile_id()); - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.ReadRows"); - ::testing::InSequence s; - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish).WillOnce(Return(grpc::Status::OK)); - return stream; - }); - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, "test-app-profile-id", kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - MakeMetadataUpdatePolicy(kTableName, "test-app-profile-id"), - std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, StreamIsDrained) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_NE(it, reader.end()); - // Do not finish the iteration. We still expect the stream to be finalized, - // and the previously setup expectations on the mock `stream` check that. -} - -TEST_F(LegacyRowReaderTest, RetryThenSuccess) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, "retry"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - // the stub will free it - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*client_, ReadRows).WillOnce(stream_retry->MakeMockReturner()); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, NoRetryOnPermanentError) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, "retry"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(false)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())).Times(0); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - EXPECT_THAT(*it, StatusIs(StatusCode::kInternal)); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, RetrySkipsAlreadyReadRows) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - { - ::testing::InSequence s; - // As a baseline, check we have two rows in the initial request - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(2))) - .WillOnce(stream->MakeMockReturner()); - - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, "retry"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - // the stub will free it - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - // First row should be removed from the retried request, leaving one row - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(1))) - .WillOnce(stream_retry->MakeMockReturner()); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet("r1", "r2"), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, RetrySkipsAlreadyScannedRows) { - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - google::bigtable::v2::ReadRowsResponse response; - response.set_last_scanned_row_key("r2"); - { - ::testing::InSequence s; - // We start our call with 3 rows in the set: "r1", "r2", "r3". - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(3))) - .WillOnce(stream->MakeMockReturner()); - - // The mock `parser` will return "r1". Next, simulate the server returning - // an empty chunk with `last_scanned_row_key` set to "r2". - EXPECT_CALL(*stream, Read) - .WillOnce(DoAll(SetArgPointee<0>(response), Return(true))); - - // The stream fails with a retry-able error - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, "retry"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - - // We retry the remaining rows. We have "r1" returned, but the service has - // also told us that "r2" was scanned. This means there is only one row - // remaining to read: "r3". - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(1))) - .WillOnce(stream_retry->MakeMockReturner()); - - // End the stream to clean up the test - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet("r1", "r2", "r3"), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, FailedParseIsRetried) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - auto response = bigtable::testing::ReadRowsResponseFromString("chunks {}"); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read) - .WillOnce(DoAll(SetArgPointee<0>(response), Return(true))); - EXPECT_CALL(*parser, HandleChunkHook) - .WillOnce(SetArgReferee<1>( - grpc::Status(grpc::StatusCode::INTERNAL, "parser exception"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - // the stub will free it - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*client_, ReadRows).WillOnce(stream_retry->MakeMockReturner()); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, FailedParseSkipsAlreadyReadRows) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - { - ::testing::InSequence s; - // As a baseline, check we have two rows in the initial request - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(2))) - .WillOnce(stream->MakeMockReturner()); - - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - EXPECT_CALL(*parser, HandleEndOfStreamHook) - .WillOnce(SetArgReferee<0>( - grpc::Status(grpc::StatusCode::INTERNAL, "InternalError"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - // the stub will free it - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - // First row should be removed from the retried request, leaving one row - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(1))) - .WillOnce(stream_retry->MakeMockReturner()); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet("r1", "r2"), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, FailedParseSkipsAlreadyScannedRows) { - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - google::bigtable::v2::ReadRowsResponse response; - response.set_last_scanned_row_key("r2"); - { - ::testing::InSequence s; - // We start our call with 3 rows in the set: "r1", "r2", "r3". - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(3))) - .WillOnce(stream->MakeMockReturner()); - - // The mock `parser` will return "r1". Next, simulate the server returning - // an empty chunk with `last_scanned_row_key` set to "r2". - EXPECT_CALL(*stream, Read) - .WillOnce(DoAll(SetArgPointee<0>(response), Return(true))); - - // The stream fails with a retry-able error - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - EXPECT_CALL(*parser, HandleEndOfStreamHook) - .WillOnce(SetArgReferee<0>( - grpc::Status(grpc::StatusCode::INTERNAL, "InternalError"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - - // We retry the remaining rows. We have "r1" returned, but the service has - // also told us that "r2" was scanned. This means there is only one row - // remaining to read: "r3". - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowKeysCount(1))) - .WillOnce(stream_retry->MakeMockReturner()); - - // End the stream to clean up the test - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet("r1", "r2", "r3"), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, FailedParseWithPermanentError) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - { - ::testing::InSequence s; - - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - EXPECT_CALL(*parser, HandleEndOfStreamHook) - .WillOnce(SetArgReferee<0>( - grpc::Status(grpc::StatusCode::INTERNAL, "InternalError"))); - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(false)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())).Times(0); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - EXPECT_THAT(*it, StatusIs(StatusCode::kInternal)); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, NoRetryOnEmptyRowSet) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r2"}); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, - "this exception must be ignored"))); - - // Note there is no expectation of a new connection, because the - // set of rows to read should become empty after reading "r2" and - // intersecting the requested ["r1", "r2"] with ("r2", "") for the - // retry. - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, - bigtable::RowSet(bigtable::RowRange::Closed("r1", "r2")), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r2"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, RowLimitIsSent) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowsLimit(442))) - .WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), 442, - bigtable::Filter::PassAllFilter(), std::move(retry_policy_), - std::move(backoff_policy_), metadata_update_policy_, - std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_EQ(it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, RowLimitIsDecreasedOnRetry) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowsLimit(42))) - .WillOnce(stream->MakeMockReturner()); - - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, "retry"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - // the stub will free it - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - // 41 instead of 42 - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowsLimit(41))) - .WillOnce(stream_retry->MakeMockReturner()); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), 42, - bigtable::Filter::PassAllFilter(), std::move(retry_policy_), - std::move(backoff_policy_), metadata_update_policy_, - std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, NoRetryIfRowLimitIsReached) { - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows(_, RequestWithRowsLimit(1))) - .WillOnce(stream->MakeMockReturner()); - - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, - "this exception must be ignored"))); - - // Note there is no expectation of a new connection, because the - // row limit reaches zero. - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), 1, - bigtable::Filter::PassAllFilter(), std::move(retry_policy_), - std::move(backoff_policy_), metadata_update_policy_, - std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, CancelDrainsStream) { - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_NE(it, reader.end()); - // Manually cancel the call. - reader.Cancel(); - it = reader.begin(); - EXPECT_NE(it, reader.end()); - EXPECT_THAT(*it, StatusIs(StatusCode::kCancelled)); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, CancelBeforeBegin) { - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - // Manually cancel the call before a stream was created. - reader.Cancel(); - reader.begin(); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - EXPECT_THAT(*it, StatusIs(StatusCode::kCancelled)); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(LegacyRowReaderTest, ConstructorDoesNotCallRpc) { - // The RowReader constructor/destructor by themselves should not - // invoke the RPC or create parsers (the latter restriction because - // parsers are per-connection and non-reusable). - EXPECT_CALL(*client_, ReadRows).Times(0); - EXPECT_CALL(*parser_factory_, CreateHook()).Times(0); - - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); -} - -TEST_F(LegacyRowReaderTest, RetryUsesNewContext) { - // Every retry should use a new ClientContext object. - // wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto parser = std::make_unique(); - parser->SetRows({"r1"}); - - void* previous_context = nullptr; - EXPECT_CALL(*retry_policy_, Setup) - .Times(2) - .WillRepeatedly([&previous_context](grpc::ClientContext& context) { - // This is a big hack, we want to make sure the context is new, - // but there is no easy way to check that, so we compare addresses. - EXPECT_NE(previous_context, &context); - previous_context = &context; - }); - - { - ::testing::InSequence s; - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::INTERNAL, "retry"))); - - EXPECT_CALL(*retry_policy_, OnFailure(An())) - .WillOnce(Return(true)); - EXPECT_CALL(*backoff_policy_, OnCompletion(An())) - .WillOnce(Return(std::chrono::milliseconds(0))); - - // the stub will free it - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*client_, ReadRows).WillOnce(stream_retry->MakeMockReturner()); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(true)); - EXPECT_CALL(*stream_retry, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - } - - parser_factory_->AddParser(std::move(parser)); - auto impl = std::make_shared( - client_, kTableName, bigtable::RowSet(), - bigtable::RowReader::NO_ROWS_LIMIT, bigtable::Filter::PassAllFilter(), - std::move(retry_policy_), std::move(backoff_policy_), - metadata_update_policy_, std::move(parser_factory_)); - auto reader = MakeRowReader(std::move(impl)); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable_internal -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/logging_data_client.cc b/google/cloud/bigtable/internal/logging_data_client.cc deleted file mode 100644 index 6ad103af673a9..0000000000000 --- a/google/cloud/bigtable/internal/logging_data_client.cc +++ /dev/null @@ -1,240 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/logging_data_client.h" -#include "google/cloud/bigtable/internal/common_client.h" -#include "google/cloud/internal/debug_string_protobuf.h" -#include "google/cloud/internal/log_wrapper.h" -#include "google/cloud/log.h" -#include "google/cloud/tracing_options.h" -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -namespace { - -using ::google::cloud::internal::DebugString; -using ::google::cloud::internal::IsUniquePtr; - -template , - std::enable_if_t::value, int> = 0> -Result LogWrapper(Functor&& functor, grpc::ClientContext* context, - Request const& request, Response* response, char const* where, - TracingOptions const& options) { - GCP_LOG(DEBUG) << where << "() << " << DebugString(request, options); - auto status = functor(context, request, response); - if (!status.ok()) { - GCP_LOG(DEBUG) << where << "() >> status=" - << DebugString(MakeStatusFromRpcError(status), options); - } else { - GCP_LOG(DEBUG) << where - << "() >> response=" << DebugString(*response, options); - } - return status; -} - -template , - std::enable_if_t::value, int> = 0> -Result LogWrapper(Functor&& functor, grpc::ClientContext* context, - Request const& request, char const* where, - TracingOptions const& options) { - GCP_LOG(DEBUG) << where << "() << " << DebugString(request, options); - auto response = functor(context, request); - GCP_LOG(DEBUG) << where << "() >> " << (response ? "not null" : "null") - << " stream"; - return response; -} - -template < - typename Functor, typename Request, - typename Result = google::cloud::internal::invoke_result_t< - Functor, grpc::ClientContext*, Request const&, grpc::CompletionQueue*>, - std::enable_if_t::value, int> = 0> -Result LogWrapper(Functor&& functor, grpc::ClientContext* context, - Request const& request, grpc::CompletionQueue* cq, - char const* where, TracingOptions const& options) { - GCP_LOG(DEBUG) << where << "() << " << DebugString(request, options); - auto response = functor(context, request, cq); - GCP_LOG(DEBUG) << where << "() >> " << (response ? "not null" : "null") - << " async response reader"; - return response; -} - -} // namespace - -namespace btproto = ::google::bigtable::v2; - -grpc::Status LoggingDataClient::MutateRow( - grpc::ClientContext* context, btproto::MutateRowRequest const& request, - btproto::MutateRowResponse* response) { - return LogWrapper( - [this](grpc::ClientContext* context, - btproto::MutateRowRequest const& request, - btproto::MutateRowResponse* response) { - return child_->MutateRow(context, request, response); - }, - context, request, response, __func__, tracing_options_); -} - -std::unique_ptr< - grpc::ClientAsyncResponseReaderInterface> -LoggingDataClient::AsyncMutateRow(grpc::ClientContext* context, - btproto::MutateRowRequest const& request, - grpc::CompletionQueue* cq) { - return child_->AsyncMutateRow(context, request, cq); -} - -grpc::Status LoggingDataClient::CheckAndMutateRow( - grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - btproto::CheckAndMutateRowResponse* response) { - return LogWrapper( - [this](grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - btproto::CheckAndMutateRowResponse* response) { - return child_->CheckAndMutateRow(context, request, response); - }, - context, request, response, __func__, tracing_options_); -} - -std::unique_ptr> -LoggingDataClient::AsyncCheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) { - return child_->AsyncCheckAndMutateRow(context, request, cq); -} - -grpc::Status LoggingDataClient::ReadModifyWriteRow( - grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - btproto::ReadModifyWriteRowResponse* response) { - return LogWrapper( - [this](grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - btproto::ReadModifyWriteRowResponse* response) { - return child_->ReadModifyWriteRow(context, request, response); - }, - context, request, response, __func__, tracing_options_); -} - -std::unique_ptr> -LoggingDataClient::AsyncReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) { - return child_->AsyncReadModifyWriteRow(context, request, cq); -} - -std::unique_ptr> -LoggingDataClient::ReadRows(grpc::ClientContext* context, - btproto::ReadRowsRequest const& request) { - return LogWrapper( - [this](grpc::ClientContext* context, - btproto::ReadRowsRequest const& request) { - return child_->ReadRows(context, request); - }, - context, request, __func__, tracing_options_); -} - -std::unique_ptr> -LoggingDataClient::AsyncReadRows( - grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request, - grpc::CompletionQueue* cq, void* tag) { - return child_->AsyncReadRows(context, request, cq, tag); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::ReadRowsResponse>> -LoggingDataClient::PrepareAsyncReadRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::ReadRowsRequest const& request, - ::grpc::CompletionQueue* cq) { - return child_->PrepareAsyncReadRows(context, request, cq); -} - -std::unique_ptr> -LoggingDataClient::SampleRowKeys(grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request) { - return LogWrapper( - [this](grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request) { - return child_->SampleRowKeys(context, request); - }, - context, request, __func__, tracing_options_); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> -LoggingDataClient::AsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) { - return child_->AsyncSampleRowKeys(context, request, cq, tag); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> -LoggingDataClient::PrepareAsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq) { - return child_->PrepareAsyncSampleRowKeys(context, request, cq); -} - -std::unique_ptr> -LoggingDataClient::MutateRows(grpc::ClientContext* context, - btproto::MutateRowsRequest const& request) { - return LogWrapper( - [this](grpc::ClientContext* context, - btproto::MutateRowsRequest const& request) { - return child_->MutateRows(context, request); - }, - context, request, __func__, tracing_options_); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> -LoggingDataClient::AsyncMutateRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) { - return child_->AsyncMutateRows(context, request, cq, tag); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> -LoggingDataClient::PrepareAsyncMutateRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq) { - return child_->PrepareAsyncMutateRows(context, request, cq); -} - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/logging_data_client.h b/google/cloud/bigtable/internal/logging_data_client.h deleted file mode 100644 index a31961cdebf22..0000000000000 --- a/google/cloud/bigtable/internal/logging_data_client.h +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LOGGING_DATA_CLIENT_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LOGGING_DATA_CLIENT_H - -#include "google/cloud/bigtable/data_client.h" -#include -#include -// TODO(#8800) - delete this class when deprecation is complete -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { - -namespace btproto = ::google::bigtable::v2; - -/** - * Implement a logging DataClient. - * - * This implementation does not support multiple threads, or refresh - * authorization tokens. In other words, it is extremely bare bones. - */ -class LoggingDataClient : public DataClient { - public: - LoggingDataClient(std::shared_ptr child, - google::cloud::TracingOptions options) - : child_(std::move(child)), tracing_options_(std::move(options)) {} - - std::string const& project_id() const override { - return child_->project_id(); - } - - std::string const& instance_id() const override { - return child_->instance_id(); - } - - std::shared_ptr Channel() override { - return child_->Channel(); - } - - void reset() override { child_->reset(); } - - grpc::Status MutateRow(grpc::ClientContext* context, - btproto::MutateRowRequest const& request, - btproto::MutateRowResponse* response) override; - - std::unique_ptr< - grpc::ClientAsyncResponseReaderInterface> - AsyncMutateRow(grpc::ClientContext* context, - btproto::MutateRowRequest const& request, - grpc::CompletionQueue* cq) override; - - grpc::Status CheckAndMutateRow( - grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - btproto::CheckAndMutateRowResponse* response) override; - - std::unique_ptr> - AsyncCheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) override; - - grpc::Status ReadModifyWriteRow( - grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - btproto::ReadModifyWriteRowResponse* response) override; - - std::unique_ptr> - AsyncReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) override; - - std::unique_ptr> - ReadRows(grpc::ClientContext* context, - btproto::ReadRowsRequest const& request) override; - - std::unique_ptr> - AsyncReadRows(grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request, - grpc::CompletionQueue* cq, void* tag) override; - - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::ReadRowsResponse>> - PrepareAsyncReadRows(::grpc::ClientContext* context, - ::google::bigtable::v2::ReadRowsRequest const& request, - ::grpc::CompletionQueue* cq) override; - - std::unique_ptr> - SampleRowKeys(grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request) override; - - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> - AsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) override; - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> - PrepareAsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq) override; - - std::unique_ptr> - MutateRows(grpc::ClientContext* context, - btproto::MutateRowsRequest const& request) override; - - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> - AsyncMutateRows(::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) override; - - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> - PrepareAsyncMutateRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq) override; - - private: - google::cloud::BackgroundThreadsFactory BackgroundThreadsFactory() override { - return child_->BackgroundThreadsFactory(); - } - - std::shared_ptr child_; - google::cloud::TracingOptions tracing_options_; -}; - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google - -// TODO(#8800) - delete this class when deprecation is complete -#include "google/cloud/internal/diagnostics_pop.inc" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_LOGGING_DATA_CLIENT_H diff --git a/google/cloud/bigtable/internal/logging_data_client_test.cc b/google/cloud/bigtable/internal/logging_data_client_test.cc deleted file mode 100644 index 23177906ab7fb..0000000000000 --- a/google/cloud/bigtable/internal/logging_data_client_test.cc +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/internal/logging_data_client.h" -#include "google/cloud/bigtable/data_client.h" -#include "google/cloud/bigtable/testing/mock_data_client.h" -#include "google/cloud/testing_util/scoped_log.h" -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::testing::Contains; -using ::testing::HasSubstr; -using ::testing::Return; - -namespace btproto = ::google::bigtable::v2; - -class LoggingDataClientTest : public ::testing::Test { - protected: - static Status TransientError() { - return Status(StatusCode::kUnavailable, "try-again"); - } - - testing_util::ScopedLog log_; -}; - -TEST_F(LoggingDataClientTest, MutateRow) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, MutateRow).WillOnce(Return(grpc::Status())); - - internal::LoggingDataClient stub( - mock, TracingOptions{}.SetOptions("single_line_mode")); - - grpc::ClientContext context; - btproto::MutateRowRequest request; - btproto::MutateRowResponse response; - - auto status = stub.MutateRow(&context, request, &response); - - EXPECT_TRUE(status.ok()); - EXPECT_THAT(log_.ExtractLines(), Contains(HasSubstr("MutateRow"))); -} - -TEST_F(LoggingDataClientTest, CheckAndMutateRow) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, CheckAndMutateRow).WillOnce(Return(grpc::Status())); - - internal::LoggingDataClient stub( - mock, TracingOptions{}.SetOptions("single_line_mode")); - - grpc::ClientContext context; - btproto::CheckAndMutateRowRequest request; - btproto::CheckAndMutateRowResponse response; - - auto status = stub.CheckAndMutateRow(&context, request, &response); - - EXPECT_TRUE(status.ok()); - EXPECT_THAT(log_.ExtractLines(), Contains(HasSubstr("CheckAndMutateRow"))); -} - -TEST_F(LoggingDataClientTest, ReadModifyWriteRow) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, ReadModifyWriteRow).WillOnce(Return(grpc::Status())); - - internal::LoggingDataClient stub( - mock, TracingOptions{}.SetOptions("single_line_mode")); - - grpc::ClientContext context; - btproto::ReadModifyWriteRowRequest request; - btproto::ReadModifyWriteRowResponse response; - - auto status = stub.ReadModifyWriteRow(&context, request, &response); - - EXPECT_TRUE(status.ok()); - EXPECT_THAT(log_.ExtractLines(), Contains(HasSubstr("ReadModifyWriteRow"))); -} - -TEST_F(LoggingDataClientTest, ReadRows) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, ReadRows) - .WillOnce([](grpc::ClientContext*, btproto::ReadRowsRequest const&) { - return std::unique_ptr< - grpc::ClientReaderInterface>{}; - }); - - internal::LoggingDataClient stub( - mock, TracingOptions{}.SetOptions("single_line_mode")); - - grpc::ClientContext context; - btproto::ReadRowsRequest request; - - stub.ReadRows(&context, request); - - EXPECT_THAT(log_.ExtractLines(), Contains(HasSubstr("ReadRows"))); -} - -TEST_F(LoggingDataClientTest, SampleRowKeys) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, SampleRowKeys) - .WillOnce([](grpc::ClientContext*, btproto::SampleRowKeysRequest const&) { - return std::unique_ptr< - grpc::ClientReaderInterface>{}; - }); - - internal::LoggingDataClient stub( - mock, TracingOptions{}.SetOptions("single_line_mode")); - - grpc::ClientContext context; - btproto::SampleRowKeysRequest request; - - stub.SampleRowKeys(&context, request); - - EXPECT_THAT(log_.ExtractLines(), Contains(HasSubstr("SampleRowKeys"))); -} - -TEST_F(LoggingDataClientTest, MutateRows) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, MutateRows) - .WillOnce([](grpc::ClientContext*, btproto::MutateRowsRequest const&) { - return std::unique_ptr< - grpc::ClientReaderInterface>{}; - }); - - internal::LoggingDataClient stub( - mock, TracingOptions{}.SetOptions("single_line_mode")); - - grpc::ClientContext context; - btproto::MutateRowsRequest request; - - stub.MutateRows(&context, request); - - EXPECT_THAT(log_.ExtractLines(), Contains(HasSubstr("MutateRows"))); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/internal/mutate_rows_limiter.h b/google/cloud/bigtable/internal/mutate_rows_limiter.h index 8cbde6f084c32..e3f251d08f621 100644 --- a/google/cloud/bigtable/internal/mutate_rows_limiter.h +++ b/google/cloud/bigtable/internal/mutate_rows_limiter.h @@ -21,7 +21,7 @@ #include "google/cloud/internal/clock.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/bigtable/v2/bigtable.pb.h" #include #include #include diff --git a/google/cloud/bigtable/internal/mutate_rows_limiter_test.cc b/google/cloud/bigtable/internal/mutate_rows_limiter_test.cc index c8636759728fd..d392d00c3ef73 100644 --- a/google/cloud/bigtable/internal/mutate_rows_limiter_test.cc +++ b/google/cloud/bigtable/internal/mutate_rows_limiter_test.cc @@ -278,7 +278,6 @@ TEST(MakeMutateRowsLimiter, LoggingDisabled) { } } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::MockCompletionQueueImpl; @@ -353,7 +352,6 @@ TEST(MakeMutateRowsLimiter, TracingDisabledAsync) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/internal/operation_context_factory.cc b/google/cloud/bigtable/internal/operation_context_factory.cc index 039cf185aa5ee..6ecdafed30795 100644 --- a/google/cloud/bigtable/internal/operation_context_factory.cc +++ b/google/cloud/bigtable/internal/operation_context_factory.cc @@ -214,15 +214,15 @@ void MetricsOperationContextFactory::InitializeProvider( auto& labels = *resource.mutable_labels(); auto const& attributes = pda.attributes.GetAttributes(); labels[kProjectLabel] = - absl::get(attributes.find(kProjectLabel)->second); + std::get(attributes.find(kProjectLabel)->second); labels[kInstanceLabel] = - absl::get(attributes.find(kInstanceLabel)->second); + std::get(attributes.find(kInstanceLabel)->second); labels[kTableLabel] = - absl::get(attributes.find(kTableLabel)->second); + std::get(attributes.find(kTableLabel)->second); labels[kClusterLabel] = - absl::get(attributes.find(kClusterLabel)->second); + std::get(attributes.find(kClusterLabel)->second); labels[kZoneLabel] = - absl::get(attributes.find(kZoneLabel)->second); + std::get(attributes.find(kZoneLabel)->second); return std::make_pair(labels[kProjectLabel], resource); }; diff --git a/google/cloud/bigtable/internal/readrowsparser.h b/google/cloud/bigtable/internal/readrowsparser.h index b558153b7e408..e35d1fde2cbb1 100644 --- a/google/cloud/bigtable/internal/readrowsparser.h +++ b/google/cloud/bigtable/internal/readrowsparser.h @@ -18,7 +18,7 @@ #include "google/cloud/bigtable/cell.h" #include "google/cloud/bigtable/row.h" #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include diff --git a/google/cloud/bigtable/internal/traced_row_reader.cc b/google/cloud/bigtable/internal/traced_row_reader.cc index 55397c63f17ff..07fbeb8b59929 100644 --- a/google/cloud/bigtable/internal/traced_row_reader.cc +++ b/google/cloud/bigtable/internal/traced_row_reader.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/bigtable/internal/traced_row_reader.h" #include "google/cloud/internal/opentelemetry.h" @@ -72,4 +71,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/bigtable/internal/traced_row_reader.h b/google/cloud/bigtable/internal/traced_row_reader.h index a423214d6dd7e..c7221b3a46ca6 100644 --- a/google/cloud/bigtable/internal/traced_row_reader.h +++ b/google/cloud/bigtable/internal/traced_row_reader.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_TRACED_ROW_READER_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_TRACED_ROW_READER_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/bigtable/row_reader.h" namespace google { @@ -36,6 +35,5 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_TRACED_ROW_READER_H diff --git a/google/cloud/bigtable/internal/traced_row_reader_test.cc b/google/cloud/bigtable/internal/traced_row_reader_test.cc index cad809b81496e..a10093febf9f0 100644 --- a/google/cloud/bigtable/internal/traced_row_reader_test.cc +++ b/google/cloud/bigtable/internal/traced_row_reader_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/bigtable/internal/traced_row_reader.h" #include "google/cloud/bigtable/mocks/mock_row_reader.h" #include "google/cloud/internal/make_status.h" @@ -151,4 +150,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/bigtable/legacy_table_test.cc b/google/cloud/bigtable/legacy_table_test.cc deleted file mode 100644 index 7a5392d530945..0000000000000 --- a/google/cloud/bigtable/legacy_table_test.cc +++ /dev/null @@ -1,409 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_async_failing_rpc_factory.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/background_threads_impl.h" -#include "google/cloud/testing_util/fake_completion_queue_impl.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; -using ::google::cloud::testing_util::FakeCompletionQueueImpl; -using ::google::cloud::testing_util::StatusIs; -using ::testing::HasSubstr; -using ::testing::MockFunction; - -Options NonEmptyOptions() { - struct TestOption { - using Type = bool; - }; - return Options{}.set(true); -} - -/// Define types and functions used in the tests. -class TableTest : public ::google::cloud::bigtable::testing::TableTestFixture { - public: - TableTest() : TableTestFixture(CompletionQueue{}) {} -}; - -TEST_F(TableTest, ClientProjectId) { - EXPECT_EQ(kProjectId, client_->project_id()); -} - -TEST_F(TableTest, ClientInstanceId) { - EXPECT_EQ(kInstanceId, client_->instance_id()); -} - -TEST_F(TableTest, StandaloneInstanceName) { - EXPECT_EQ(kInstanceName, InstanceName(client_)); -} - -TEST_F(TableTest, StandaloneTableName) { - EXPECT_EQ(kTableName, TableName(client_, kTableId)); -} - -TEST_F(TableTest, TableName) { EXPECT_EQ(kTableName, table_.table_name()); } - -TEST_F(TableTest, WithNewTarget) { - Table table(client_, "original-profile", kTableId); - EXPECT_EQ(table.project_id(), kProjectId); - EXPECT_EQ(table.instance_id(), kInstanceId); - EXPECT_EQ(table.table_id(), kTableId); - EXPECT_EQ(table.table_name(), TableName(kProjectId, kInstanceId, kTableId)); - EXPECT_EQ(table.app_profile_id(), "original-profile"); - - std::string const other_project_id = "other-project"; - std::string const other_instance_id = "other-instance"; - std::string const other_table_id = "other-table"; - auto other_table = - table.WithNewTarget(other_project_id, other_instance_id, other_table_id); - - EXPECT_EQ(other_table.project_id(), other_project_id); - EXPECT_EQ(other_table.instance_id(), other_instance_id); - EXPECT_EQ(other_table.table_id(), other_table_id); - EXPECT_EQ(other_table.table_name(), - TableName(other_project_id, other_instance_id, other_table_id)); - EXPECT_EQ(other_table.app_profile_id(), "original-profile"); -} - -TEST_F(TableTest, WithNewTargetProfile) { - Table table(client_, "original-profile", kTableId); - EXPECT_EQ(table.project_id(), kProjectId); - EXPECT_EQ(table.instance_id(), kInstanceId); - EXPECT_EQ(table.table_id(), kTableId); - EXPECT_EQ(table.table_name(), TableName(kProjectId, kInstanceId, kTableId)); - EXPECT_EQ(table.app_profile_id(), "original-profile"); - - std::string const other_project_id = "other-project"; - std::string const other_instance_id = "other-instance"; - std::string const other_table_id = "other-table"; - std::string const other_profile_id = "other-profile"; - auto other_table = table.WithNewTarget(other_project_id, other_instance_id, - other_profile_id, other_table_id); - - EXPECT_EQ(other_table.project_id(), other_project_id); - EXPECT_EQ(other_table.instance_id(), other_instance_id); - EXPECT_EQ(other_table.table_id(), other_table_id); - EXPECT_EQ(other_table.table_name(), - TableName(other_project_id, other_instance_id, other_table_id)); - EXPECT_EQ(other_table.app_profile_id(), other_profile_id); -} - -TEST_F(TableTest, TableConstructor) { - std::string const other_table_id = "my-table"; - std::string const other_table_name = TableName(client_, other_table_id); - Table table(client_, other_table_id); - EXPECT_EQ(other_table_name, table.table_name()); -} - -TEST_F(TableTest, CopyConstructor) { - Table source(client_, "my-table"); - std::string const& expected = source.table_name(); - // NOLINTNEXTLINE(performance-unnecessary-copy-initialization) - Table copy(source); - EXPECT_EQ(expected, copy.table_name()); -} - -TEST_F(TableTest, MoveConstructor) { - Table source(client_, "my-table"); - std::string expected = source.table_name(); - Table copy(std::move(source)); - EXPECT_EQ(expected, copy.table_name()); -} - -TEST_F(TableTest, CopyAssignment) { - Table source(client_, "my-table"); - std::string const& expected = source.table_name(); - Table dest(client_, "another-table"); - dest = source; - EXPECT_EQ(expected, dest.table_name()); -} - -TEST_F(TableTest, MoveAssignment) { - Table source(client_, "my-table"); - std::string expected = source.table_name(); - Table dest(client_, "another-table"); - dest = std::move(source); - EXPECT_EQ(expected, dest.table_name()); -} - -TEST_F(TableTest, ChangeOnePolicy) { - Table table(client_, "some-table", AlwaysRetryMutationPolicy()); - EXPECT_EQ("", table.app_profile_id()); - EXPECT_THAT(table.table_name(), HasSubstr("some-table")); -} - -TEST_F(TableTest, ChangePolicies) { - Table table(client_, "some-table", AlwaysRetryMutationPolicy(), - LimitedErrorCountRetryPolicy(42)); - EXPECT_EQ("", table.app_profile_id()); - EXPECT_THAT(table.table_name(), HasSubstr("some-table")); -} - -TEST_F(TableTest, ConstructorWithAppProfileAndPolicies) { - Table table(client_, "test-profile-id", "some-table", - AlwaysRetryMutationPolicy(), LimitedErrorCountRetryPolicy(42)); - EXPECT_EQ("test-profile-id", table.app_profile_id()); - EXPECT_THAT(table.table_name(), HasSubstr("some-table")); -} - -std::string const kProjectId = "the-project"; -std::string const kInstanceId = "the-instance"; -std::string const kTableId = "the-table"; - -class ValidContextMdAsyncTest : public ::testing::Test { - public: - ValidContextMdAsyncTest() - : cq_impl_(new FakeCompletionQueueImpl), - cq_(cq_impl_), - client_(new ::google::cloud::bigtable::testing::MockDataClient( - Options{}.set(cq_))) { - EXPECT_CALL(*client_, project_id()) - .WillRepeatedly(::testing::ReturnRef(kProjectId)); - EXPECT_CALL(*client_, instance_id()) - .WillRepeatedly(::testing::ReturnRef(kInstanceId)); - table_ = std::make_unique(client_, kTableId); - } - - protected: - template - void FinishTest( - ::google::cloud::future> res_future) { - EXPECT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); - EXPECT_EQ(0U, cq_impl_->size()); - auto res = res_future.get(); - EXPECT_FALSE(res); - EXPECT_EQ(::google::cloud::StatusCode::kPermissionDenied, - res.status().code()); - } - - void FinishTest(::google::cloud::future res_future) { - EXPECT_EQ(1U, cq_impl_->size()); - cq_impl_->SimulateCompletion(true); - EXPECT_EQ(0U, cq_impl_->size()); - auto res = res_future.get(); - EXPECT_EQ(::google::cloud::StatusCode::kPermissionDenied, res.code()); - } - - std::shared_ptr cq_impl_; - CompletionQueue cq_; - std::shared_ptr client_; - std::unique_ptr
table_; -}; - -TEST_F(ValidContextMdAsyncTest, AsyncApply) { - testing::MockAsyncFailingRpcFactory - rpc_factory; - EXPECT_CALL(*client_, AsyncMutateRow) - .WillOnce(rpc_factory.Create( - R"""( - table_name: "projects/the-project/instances/the-instance/tables/the-table" - row_key: "row_key" - mutations: { delete_from_row { } } - )""", - "google.bigtable.v2.Bigtable.MutateRow")); - FinishTest(table_->AsyncApply(SingleRowMutation("row_key", DeleteFromRow()))); -} - -TEST_F(ValidContextMdAsyncTest, AsyncCheckAndMutateRow) { - testing::MockAsyncFailingRpcFactory - rpc_factory; - EXPECT_CALL(*client_, AsyncCheckAndMutateRow) - .WillOnce(rpc_factory.Create( - R"""( - table_name: "projects/the-project/instances/the-instance/tables/the-table" - row_key: "row_key" - true_mutations: { delete_from_row { } } - predicate_filter: { pass_all_filter: true } - )""", - "google.bigtable.v2.Bigtable.CheckAndMutateRow")); - FinishTest(table_->AsyncCheckAndMutateRow("row_key", Filter::PassAllFilter(), - {DeleteFromRow()}, {})); -} - -TEST_F(ValidContextMdAsyncTest, AsyncReadModifyWriteRow) { - testing::MockAsyncFailingRpcFactory - rpc_factory; - EXPECT_CALL(*client_, AsyncReadModifyWriteRow) - .WillOnce(rpc_factory.Create( - R"""( - table_name: "projects/the-project/instances/the-instance/tables/the-table" - row_key: "row_key" - rules: { - family_name: "fam" - column_qualifier: "counter" - increment_amount: 1 - } - rules: { - family_name: "fam" - column_qualifier: "list" - append_value: ";element" - } - )""", - "google.bigtable.v2.Bigtable.ReadModifyWriteRow")); - FinishTest(table_->AsyncReadModifyWriteRow( - "row_key", ReadModifyWriteRule::IncrementAmount("fam", "counter", 1), - ReadModifyWriteRule::AppendValue("fam", "list", ";element"))); -} - -TEST_F(TableTest, ApplyWithOptions) { - Table table(client_, kTableId); - auto status = table.Apply(SingleRowMutation("row"), NonEmptyOptions()); - EXPECT_THAT(status, StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncApplyWithOptions) { - Table table(client_, kTableId); - auto status = table.AsyncApply(SingleRowMutation("row"), NonEmptyOptions()); - EXPECT_THAT(status.get(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, BulkApplyWithOptions) { - Table table(client_, kTableId); - auto bulk = BulkMutation(SingleRowMutation("r1"), SingleRowMutation("r2")); - auto failed = table.BulkApply(bulk, NonEmptyOptions()); - ASSERT_EQ(2, failed.size()); - EXPECT_EQ(0, failed[0].original_index()); - EXPECT_THAT(failed[0].status(), StatusIs(StatusCode::kInvalidArgument)); - EXPECT_EQ(1, failed[1].original_index()); - EXPECT_THAT(failed[1].status(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncBulkApplyWithOptions) { - Table table(client_, kTableId); - auto bulk = BulkMutation(SingleRowMutation("r1"), SingleRowMutation("r2")); - auto failed = table.AsyncBulkApply(bulk, NonEmptyOptions()).get(); - ASSERT_EQ(2, failed.size()); - EXPECT_EQ(0, failed[0].original_index()); - EXPECT_THAT(failed[0].status(), StatusIs(StatusCode::kInvalidArgument)); - EXPECT_EQ(1, failed[1].original_index()); - EXPECT_THAT(failed[1].status(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, ReadRowsWithOptions) { - Table table(client_, kTableId); - auto reader = - table.ReadRows(RowSet(), Filter::PassAllFilter(), NonEmptyOptions()); - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - EXPECT_THAT(*it, StatusIs(StatusCode::kInvalidArgument)); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(TableTest, ReadRowsWithLimitWithOptions) { - Table table(client_, kTableId); - auto reader = - table.ReadRows(RowSet(), 1, Filter::PassAllFilter(), NonEmptyOptions()); - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - EXPECT_THAT(*it, StatusIs(StatusCode::kInvalidArgument)); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(TableTest, ReadRowWithOptions) { - Table table(client_, kTableId); - auto row = table.ReadRow("row", Filter::PassAllFilter(), NonEmptyOptions()); - EXPECT_THAT(row, StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncReadRowWithOptions) { - Table table(client_, kTableId); - auto row = - table.AsyncReadRow("row", Filter::PassAllFilter(), NonEmptyOptions()); - EXPECT_THAT(row.get(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, CheckAndMutateRowWithOptions) { - Table table(client_, kTableId); - auto branch = table.CheckAndMutateRow("row", Filter::PassAllFilter(), {}, {}, - NonEmptyOptions()); - EXPECT_THAT(branch, StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncCheckAndMutateRowWithOptions) { - Table table(client_, kTableId); - auto branch = table.AsyncCheckAndMutateRow("row", Filter::PassAllFilter(), {}, - {}, NonEmptyOptions()); - EXPECT_THAT(branch.get(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, SampleRowsWithOptions) { - Table table(client_, kTableId); - auto rows = table.SampleRows(NonEmptyOptions()); - EXPECT_THAT(rows, StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncSampleRowsWithOptions) { - Table table(client_, kTableId); - auto rows = table.AsyncSampleRows(NonEmptyOptions()); - EXPECT_THAT(rows.get(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, ReadModifyWriteRowWithOptions) { - Table table(client_, kTableId); - auto r = ReadModifyWriteRule::AppendValue("cf", "cq", "v"); - auto row = table.ReadModifyWriteRow("row", r, r, NonEmptyOptions(), r); - EXPECT_THAT(row, StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncReadModifyWriteRowWithOptions) { - Table table(client_, kTableId); - auto r = ReadModifyWriteRule::AppendValue("cf", "cq", "v"); - auto row = table.AsyncReadModifyWriteRow("row", r, r, NonEmptyOptions(), r); - EXPECT_THAT(row.get(), StatusIs(StatusCode::kInvalidArgument)); -} - -TEST_F(TableTest, AsyncReadRowsWithOptions) { - MockFunction(bigtable::Row const&)> on_row; - EXPECT_CALL(on_row, Call).Times(0); - - MockFunction on_finish; - EXPECT_CALL(on_finish, Call).WillOnce([](Status const& status) { - EXPECT_THAT(status, StatusIs(StatusCode::kInvalidArgument)); - }); - - Table table(client_, kTableId); - table.AsyncReadRows(on_row.AsStdFunction(), on_finish.AsStdFunction(), - RowSet(), Filter::PassAllFilter(), NonEmptyOptions()); -} - -TEST_F(TableTest, AsyncReadRowsWithLimitWithOptions) { - MockFunction(bigtable::Row const&)> on_row; - EXPECT_CALL(on_row, Call).Times(0); - - MockFunction on_finish; - EXPECT_CALL(on_finish, Call).WillOnce([](Status const& status) { - EXPECT_THAT(status, StatusIs(StatusCode::kInvalidArgument)); - }); - - Table table(client_, kTableId); - table.AsyncReadRows(on_row.AsStdFunction(), on_finish.AsStdFunction(), - RowSet(), 1, Filter::PassAllFilter(), NonEmptyOptions()); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/metadata_update_policy_test.cc b/google/cloud/bigtable/metadata_update_policy_test.cc index edc31787ff584..e71d154cd29a3 100644 --- a/google/cloud/bigtable/metadata_update_policy_test.cc +++ b/google/cloud/bigtable/metadata_update_policy_test.cc @@ -79,7 +79,9 @@ TEST_F(MetadataUpdatePolicyTest, SimpleDefault) { } TEST_F(MetadataUpdatePolicyTest, TableAppProfileMetadata) { - auto table = Table(data_client_, "profile", kTableId); + auto table = + Table(data_connection_, TableResource(kProjectId, kInstanceId, kTableId), + Options{}.set("profile")); grpc::string expected = "table_name=" + google::cloud::internal::UrlEncode(kTableName) + "&app_profile_id=profile"; diff --git a/google/cloud/bigtable/mocks/mock_data_connection.h b/google/cloud/bigtable/mocks/mock_data_connection.h index a283af2c9e787..61f3d824a2005 100644 --- a/google/cloud/bigtable/mocks/mock_data_connection.h +++ b/google/cloud/bigtable/mocks/mock_data_connection.h @@ -16,6 +16,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_MOCKS_MOCK_DATA_CONNECTION_H #include "google/cloud/bigtable/data_connection.h" +#include "google/cloud/bigtable/options.h" +#include "google/cloud/options.h" #include "google/cloud/version.h" #include diff --git a/google/cloud/bigtable/mutation_batcher.h b/google/cloud/bigtable/mutation_batcher.h index f71b8a336e547..e3d0f5d652243 100644 --- a/google/cloud/bigtable/mutation_batcher.h +++ b/google/cloud/bigtable/mutation_batcher.h @@ -15,13 +15,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_MUTATION_BATCHER_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_MUTATION_BATCHER_H -#include "google/cloud/bigtable/client_options.h" #include "google/cloud/bigtable/completion_queue.h" #include "google/cloud/bigtable/mutations.h" #include "google/cloud/bigtable/table.h" #include "google/cloud/bigtable/version.h" #include "google/cloud/status.h" -#include +#include "google/bigtable/v2/bigtable.pb.h" #include #include #include diff --git a/google/cloud/bigtable/mutations.h b/google/cloud/bigtable/mutations.h index 0a1a3657d71b3..642fe4969e299 100644 --- a/google/cloud/bigtable/mutations.h +++ b/google/cloud/bigtable/mutations.h @@ -23,8 +23,8 @@ #include "google/cloud/status.h" #include "google/cloud/status_or.h" #include "absl/meta/type_traits.h" -#include -#include +#include "google/bigtable/v2/bigtable.pb.h" +#include "google/bigtable/v2/data.pb.h" #include #include #include diff --git a/google/cloud/bigtable/mutations_test.cc b/google/cloud/bigtable/mutations_test.cc index b368aa212e2ee..e131ad0d6ced0 100644 --- a/google/cloud/bigtable/mutations_test.cc +++ b/google/cloud/bigtable/mutations_test.cc @@ -16,7 +16,7 @@ #include "google/cloud/internal/big_endian.h" #include "google/cloud/testing_util/chrono_literals.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/rpc/error_details.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/options.h b/google/cloud/bigtable/options.h index 865d5c009547e..efc2d81ea607c 100644 --- a/google/cloud/bigtable/options.h +++ b/google/cloud/bigtable/options.h @@ -39,6 +39,7 @@ */ #include "google/cloud/bigtable/idempotent_mutation_policy.h" +#include "google/cloud/bigtable/internal/endpoint_options.h" #include "google/cloud/bigtable/retry_policy.h" #include "google/cloud/bigtable/rpc_retry_policy.h" #include "google/cloud/bigtable/version.h" @@ -99,37 +100,6 @@ struct ReverseScanOption { using Type = bool; }; -/** - * The endpoint for data operations. - * - * @deprecated Please use `google::cloud::EndpointOption` instead. - */ -struct DataEndpointOption { - using Type = std::string; -}; - -/** - * The endpoint for table admin operations. - * - * @deprecated Please use `google::cloud::EndpointOption` instead. - */ -struct AdminEndpointOption { - using Type = std::string; -}; - -/** - * The endpoint for instance admin operations. - * - * In most scenarios this should have the same value as `AdminEndpointOption`. - * The most common exception is testing, where the emulator for instance admin - * operations may be different than the emulator for admin and data operations. - * - * @deprecated Please use `google::cloud::EndpointOption` instead. - */ -struct InstanceAdminEndpointOption { - using Type = std::string; -}; - /** * Minimum time in ms to refresh connections. * @@ -207,9 +177,10 @@ struct QueryPlanRefreshFunctionRetryPolicyOption { /// The complete list of options accepted by `bigtable::*Client` using ClientOptionList = - OptionList; + OptionList<::google::cloud::bigtable_internal::DataEndpointOption, + ::google::cloud::bigtable_internal::AdminEndpointOption, + ::google::cloud::bigtable_internal::InstanceAdminEndpointOption, + MinConnectionRefreshOption, MaxConnectionRefreshOption>; /** * Option to configure the retry policy used by `Table`. diff --git a/google/cloud/bigtable/quickstart/.bazelrc b/google/cloud/bigtable/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/bigtable/quickstart/.bazelrc +++ b/google/cloud/bigtable/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/bigtable/read_modify_write_rule.h b/google/cloud/bigtable/read_modify_write_rule.h index 964eebd9af30d..ce782dc56286d 100644 --- a/google/cloud/bigtable/read_modify_write_rule.h +++ b/google/cloud/bigtable/read_modify_write_rule.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_READ_MODIFY_WRITE_RULE_H #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/v2/data.pb.h" #include #include diff --git a/google/cloud/bigtable/row_key.h b/google/cloud/bigtable/row_key.h index 5b1871253f9b7..e008e243cb4d1 100644 --- a/google/cloud/bigtable/row_key.h +++ b/google/cloud/bigtable/row_key.h @@ -17,7 +17,7 @@ #include "google/cloud/bigtable/internal/google_bytes_traits.h" #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/v2/data.pb.h" #include #include diff --git a/google/cloud/bigtable/row_range.h b/google/cloud/bigtable/row_range.h index e39ae676c3703..c948da47e419b 100644 --- a/google/cloud/bigtable/row_range.h +++ b/google/cloud/bigtable/row_range.h @@ -18,7 +18,7 @@ #include "google/cloud/bigtable/internal/prefix_range_end.h" #include "google/cloud/bigtable/row_key.h" #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/v2/data.pb.h" #include #include diff --git a/google/cloud/bigtable/row_reader.cc b/google/cloud/bigtable/row_reader.cc index 3efcf408cdfb0..aeb5960655140 100644 --- a/google/cloud/bigtable/row_reader.cc +++ b/google/cloud/bigtable/row_reader.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/bigtable/row_reader.h" -#include "google/cloud/bigtable/internal/legacy_row_reader.h" #include "google/cloud/bigtable/table.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/throw_delegate.h" @@ -65,32 +64,6 @@ RowReader::RowReader() : RowReader( std::make_shared(Status{})) {} -RowReader::RowReader( - std::shared_ptr client, std::string table_name, RowSet row_set, - std::int64_t rows_limit, Filter filter, - std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory) - : RowReader(std::make_shared( - std::move(client), std::move(table_name), std::move(row_set), - rows_limit, std::move(filter), std::move(retry_policy), - std::move(backoff_policy), std::move(metadata_update_policy), - std::move(parser_factory))) {} - -RowReader::RowReader( - std::shared_ptr client, std::string app_profile_id, - std::string table_name, RowSet row_set, std::int64_t rows_limit, - Filter filter, std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory) - : RowReader(std::make_shared( - std::move(client), std::move(app_profile_id), std::move(table_name), - std::move(row_set), rows_limit, std::move(filter), - std::move(retry_policy), std::move(backoff_policy), - std::move(metadata_update_policy), std::move(parser_factory))) {} - std::int64_t constexpr RowReader::NO_ROWS_LIMIT; // The name must be all lowercase to work with range-for loops. diff --git a/google/cloud/bigtable/row_reader.h b/google/cloud/bigtable/row_reader.h index 11ba0d202eba9..147cc2e1a4c40 100644 --- a/google/cloud/bigtable/row_reader.h +++ b/google/cloud/bigtable/row_reader.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_ROW_READER_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_ROW_READER_H -#include "google/cloud/bigtable/data_client.h" #include "google/cloud/bigtable/filters.h" #include "google/cloud/bigtable/internal/readrowsparser.h" #include "google/cloud/bigtable/internal/row_reader_impl.h" @@ -65,22 +64,6 @@ class RowReader { /// Default constructs an empty RowReader. RowReader(); - GOOGLE_CLOUD_CPP_BIGTABLE_ROW_READER_CTOR_DEPRECATED() - RowReader(std::shared_ptr client, std::string table_name, - RowSet row_set, std::int64_t rows_limit, Filter filter, - std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory); - - GOOGLE_CLOUD_CPP_BIGTABLE_ROW_READER_CTOR_DEPRECATED() - RowReader(std::shared_ptr client, std::string app_profile_id, - std::string table_name, RowSet row_set, std::int64_t rows_limit, - Filter filter, std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - MetadataUpdatePolicy metadata_update_policy, - std::unique_ptr parser_factory); - // NOLINTNEXTLINE(performance-noexcept-move-constructor) RowReader(RowReader&&) = default; diff --git a/google/cloud/bigtable/row_reader_test.cc b/google/cloud/bigtable/row_reader_test.cc index b11f897d62362..1ab61568e94c3 100644 --- a/google/cloud/bigtable/row_reader_test.cc +++ b/google/cloud/bigtable/row_reader_test.cc @@ -90,7 +90,6 @@ TEST(RowReaderTest, OptionsSpan) { } } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::IsActive; TEST(RowReader, CallSpanActiveThroughout) { @@ -121,7 +120,6 @@ TEST(RowReader, CallSpanActiveThroughout) { EXPECT_STATUS_OK(row); } } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // anonymous namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/table.cc b/google/cloud/bigtable/table.cc index 14b96ef6715d3..68b7c8016f073 100644 --- a/google/cloud/bigtable/table.cc +++ b/google/cloud/bigtable/table.cc @@ -13,14 +13,6 @@ // limitations under the License. #include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/internal/bulk_mutator.h" -#include "google/cloud/bigtable/internal/data_connection_impl.h" -#include "google/cloud/bigtable/internal/legacy_async_bulk_apply.h" -#include "google/cloud/bigtable/internal/legacy_async_row_sampler.h" -#include "google/cloud/bigtable/internal/legacy_row_reader.h" -#include "google/cloud/bigtable/internal/unary_client_utils.h" -#include "google/cloud/internal/async_retry_unary_rpc.h" -#include "google/cloud/internal/make_status.h" #include #include @@ -30,7 +22,6 @@ namespace cloud { namespace bigtable { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -using ::google::cloud::Idempotency; using ::google::cloud::internal::MergeOptions; using ::google::cloud::internal::OptionsSpan; @@ -44,175 +35,28 @@ void SetCommonTableOperationRequest(Request& request, } } // namespace -using ClientUtils = bigtable::internal::UnaryClientUtils; - static_assert(std::is_copy_assignable::value, "bigtable::Table must be CopyAssignable"); Status Table::Apply(SingleRowMutation mut, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->Apply(table_name_, std::move(mut)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()); - } - - // Copy the policies in effect for this operation. Many policy classes change - // their state as the operation makes progress (or fails to make progress), so - // we need fresh instances. - auto rpc_policy = clone_rpc_retry_policy(); - auto backoff_policy = clone_rpc_backoff_policy(); - auto idempotent_policy = clone_idempotent_mutation_policy(); - - // Build the RPC request, try to minimize copying. - btproto::MutateRowRequest request; - SetCommonTableOperationRequest( - request, app_profile_id(), table_name_); - mut.MoveTo(request); - - bool const is_idempotent = - std::all_of(request.mutations().begin(), request.mutations().end(), - [&idempotent_policy](btproto::Mutation const& m) { - return idempotent_policy->is_idempotent(m); - }); - - btproto::MutateRowResponse response; - grpc::Status status; - while (true) { - grpc::ClientContext client_context; - rpc_policy->Setup(client_context); - backoff_policy->Setup(client_context); - metadata_update_policy_.Setup(client_context); - status = client_->MutateRow(&client_context, request, &response); - - if (status.ok()) { - return google::cloud::Status{}; - } - // It is up to the policy to terminate this loop, it could run - // forever, but that would be a bad policy (pun intended). - if (!rpc_policy->OnFailure(status) || !is_idempotent) { - return MakeStatusFromRpcError(status); - } - auto delay = backoff_policy->OnCompletion(status); - std::this_thread::sleep_for(delay); - } + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->Apply(table_name_, std::move(mut)); } future Table::AsyncApply(SingleRowMutation mut, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->AsyncApply(table_name_, std::move(mut)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return make_ready_future(google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO())); - } - - google::bigtable::v2::MutateRowRequest request; - SetCommonTableOperationRequest( - request, app_profile_id(), table_name_); - mut.MoveTo(request); - - // Determine if all the mutations are idempotent. The idempotency of the - // mutations won't change as the retry loop executes, so we can just compute - // it once and use a constant value for the loop. - auto idempotent_mutation_policy = clone_idempotent_mutation_policy(); - auto const is_idempotent = std::all_of( - request.mutations().begin(), request.mutations().end(), - [&idempotent_mutation_policy](google::bigtable::v2::Mutation const& m) { - return idempotent_mutation_policy->is_idempotent(m); - }); - - auto const idempotency = - is_idempotent ? Idempotency::kIdempotent : Idempotency::kNonIdempotent; - - auto cq = background_threads_->cq(); - auto& client = client_; - auto metadata_update_policy = clone_metadata_update_policy(); - return google::cloud::internal::StartRetryAsyncUnaryRpc( - cq, __func__, clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - idempotency, - [client, metadata_update_policy]( - grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - grpc::CompletionQueue* cq) { - metadata_update_policy.Setup(*context); - return client->AsyncMutateRow(context, request, cq); - }, - std::move(request)) - .then([](future> r) { - return r.get().status(); - }); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->AsyncApply(table_name_, std::move(mut)); } std::vector Table::BulkApply(BulkMutation mut, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->BulkApply(table_name_, std::move(mut)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return bigtable_internal::MakeFailedMutations( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()), - mut.size()); - } - - if (mut.empty()) return {}; - grpc::Status status; - - // Copy the policies in effect for this operation. Many policy classes change - // their state as the operation makes progress (or fails to make progress), so - // we need fresh instances. - auto backoff_policy = clone_rpc_backoff_policy(); - auto retry_policy = clone_rpc_retry_policy(); - auto idempotent_policy = clone_idempotent_mutation_policy(); - - bigtable_internal::BulkMutator mutator( - app_profile_id(), table_name_, *idempotent_policy, std::move(mut), - std::make_shared()); - while (true) { - grpc::ClientContext client_context; - backoff_policy->Setup(client_context); - retry_policy->Setup(client_context); - metadata_update_policy_.Setup(client_context); - status = mutator.MakeOneRequest(*client_, client_context); - if (!mutator.HasPendingMutations()) break; - if (!retry_policy->OnFailure(status)) break; - auto delay = backoff_policy->OnCompletion(status); - std::this_thread::sleep_for(delay); - } - return std::move(mutator).OnRetryDone(); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->BulkApply(table_name_, std::move(mut)); } future> Table::AsyncBulkApply(BulkMutation mut, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->AsyncBulkApply(table_name_, std::move(mut)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return make_ready_future(bigtable_internal::MakeFailedMutations( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()), - mut.size())); - } - - auto cq = background_threads_->cq(); - auto mutation_policy = clone_idempotent_mutation_policy(); - return internal::AsyncRetryBulkApply::Create( - cq, clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - *mutation_policy, clone_metadata_update_policy(), client_, - app_profile_id(), table_name_, std::move(mut)); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->AsyncBulkApply(table_name_, std::move(mut)); } RowReader Table::ReadRows(RowSet row_set, Filter filter, Options opts) { @@ -222,162 +66,34 @@ RowReader Table::ReadRows(RowSet row_set, Filter filter, Options opts) { RowReader Table::ReadRows(RowSet row_set, std::int64_t rows_limit, Filter filter, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->ReadRows(table_name_, std::move(row_set), rows_limit, - std::move(filter)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return MakeRowReader( - std::make_shared( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()))); - } - - auto impl = std::make_shared( - client_, app_profile_id(), table_name_, std::move(row_set), rows_limit, - std::move(filter), clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - metadata_update_policy_, - std::make_unique()); - return bigtable_internal::MakeRowReader(std::move(impl)); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->ReadRows(table_name_, std::move(row_set), rows_limit, + std::move(filter)); } StatusOr> Table::ReadRow(std::string row_key, Filter filter, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->ReadRow(table_name_, std::move(row_key), - std::move(filter)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()); - } - - RowSet row_set(std::move(row_key)); - std::int64_t const rows_limit = 1; - RowReader reader = - ReadRows(std::move(row_set), rows_limit, std::move(filter)); - - auto it = reader.begin(); - if (it == reader.end()) { - return std::make_pair(false, Row("", {})); - } - if (!*it) { - return it->status(); - } - auto result = std::make_pair(true, std::move(**it)); - if (++it != reader.end()) { - return google::cloud::internal::InternalError( - "internal error - RowReader returned more than one row in ReadRow(, " - "GCP_ERROR_INFO())"); - } - return result; + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->ReadRow(table_name_, std::move(row_key), + std::move(filter)); } StatusOr Table::CheckAndMutateRow( std::string row_key, Filter filter, std::vector true_mutations, std::vector false_mutations, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->CheckAndMutateRow( - table_name_, std::move(row_key), std::move(filter), - std::move(true_mutations), std::move(false_mutations)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()); - } - - grpc::Status status; - btproto::CheckAndMutateRowRequest request; - request.set_row_key(std::move(row_key)); - SetCommonTableOperationRequest( - request, app_profile_id(), table_name_); - *request.mutable_predicate_filter() = std::move(filter).as_proto(); - for (auto& m : true_mutations) { - *request.add_true_mutations() = std::move(m.op); - } - for (auto& m : false_mutations) { - *request.add_false_mutations() = std::move(m.op); - } - auto const idempotency = idempotent_mutation_policy_->is_idempotent(request) - ? Idempotency::kIdempotent - : Idempotency::kNonIdempotent; - auto response = ClientUtils::MakeCall( - *client_, clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - metadata_update_policy_, &DataClient::CheckAndMutateRow, request, - "Table::CheckAndMutateRow", status, idempotency); - - if (!status.ok()) { - return MakeStatusFromRpcError(status); - } - return response.predicate_matched() ? MutationBranch::kPredicateMatched - : MutationBranch::kPredicateNotMatched; + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->CheckAndMutateRow( + table_name_, std::move(row_key), std::move(filter), + std::move(true_mutations), std::move(false_mutations)); } future> Table::AsyncCheckAndMutateRow( std::string row_key, Filter filter, std::vector true_mutations, std::vector false_mutations, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->AsyncCheckAndMutateRow( - table_name_, std::move(row_key), std::move(filter), - std::move(true_mutations), std::move(false_mutations)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return make_ready_future>( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO())); - } - - btproto::CheckAndMutateRowRequest request; - request.set_row_key(std::move(row_key)); - SetCommonTableOperationRequest( - request, app_profile_id(), table_name_); - *request.mutable_predicate_filter() = std::move(filter).as_proto(); - for (auto& m : true_mutations) { - *request.add_true_mutations() = std::move(m.op); - } - for (auto& m : false_mutations) { - *request.add_false_mutations() = std::move(m.op); - } - auto const idempotency = idempotent_mutation_policy_->is_idempotent(request) - ? Idempotency::kIdempotent - : Idempotency::kNonIdempotent; - - auto cq = background_threads_->cq(); - auto& client = client_; - auto metadata_update_policy = clone_metadata_update_policy(); - return google::cloud::internal::StartRetryAsyncUnaryRpc( - cq, __func__, clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - idempotency, - [client, metadata_update_policy]( - grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) { - metadata_update_policy.Setup(*context); - return client->AsyncCheckAndMutateRow(context, request, cq); - }, - std::move(request)) - .then([](future> f) - -> StatusOr { - auto response = f.get(); - if (!response) { - return response.status(); - } - return response->predicate_matched() - ? MutationBranch::kPredicateMatched - : MutationBranch::kPredicateNotMatched; - }); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->AsyncCheckAndMutateRow( + table_name_, std::move(row_key), std::move(filter), + std::move(true_mutations), std::move(false_mutations)); } // Call the `google.bigtable.v2.Bigtable.SampleRowKeys` RPC until @@ -386,75 +102,14 @@ future> Table::AsyncCheckAndMutateRow( // policies in effect tell us to stop. Note that each retry must clear the // samples otherwise the result is an inconsistent set of sample row keys. StatusOr> Table::SampleRows(Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->SampleRows(table_name_); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()); - } - - // Copy the policies in effect for this operation. - auto backoff_policy = clone_rpc_backoff_policy(); - auto retry_policy = clone_rpc_retry_policy(); - std::vector samples; - - // Build the RPC request for SampleRowKeys - btproto::SampleRowKeysRequest request; - btproto::SampleRowKeysResponse response; - SetCommonTableOperationRequest( - request, app_profile_id(), table_name_); - - while (true) { - grpc::ClientContext client_context; - backoff_policy->Setup(client_context); - retry_policy->Setup(client_context); - clone_metadata_update_policy().Setup(client_context); - - auto stream = client_->SampleRowKeys(&client_context, request); - while (stream->Read(&response)) { - bigtable::RowKeySample row_sample; - row_sample.offset_bytes = response.offset_bytes(); - row_sample.row_key = std::move(*response.mutable_row_key()); - samples.emplace_back(std::move(row_sample)); - } - auto status = stream->Finish(); - if (status.ok()) { - break; - } - if (!retry_policy->OnFailure(status)) { - return MakeStatusFromRpcError( - status.error_code(), - "Retry policy exhausted: " + status.error_message()); - } - samples.clear(); - auto delay = backoff_policy->OnCompletion(status); - std::this_thread::sleep_for(delay); - } - return samples; + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->SampleRows(table_name_); } future>> Table::AsyncSampleRows( Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->AsyncSampleRows(table_name_); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return make_ready_future>>( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO())); - } - - auto cq = background_threads_->cq(); - return internal::LegacyAsyncRowSampler::Create( - cq, client_, clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - metadata_update_policy_, app_profile_id(), table_name_); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->AsyncSampleRows(table_name_); } StatusOr Table::ReadModifyWriteRowImpl( @@ -462,27 +117,8 @@ StatusOr Table::ReadModifyWriteRowImpl( SetCommonTableOperationRequest< ::google::bigtable::v2::ReadModifyWriteRowRequest>( request, app_profile_id(), table_name_); - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->ReadModifyWriteRow(std::move(request)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO()); - } - - grpc::Status status; - auto response = ClientUtils::MakeNonIdempotentCall( - *(client_), clone_rpc_retry_policy(), clone_metadata_update_policy(), - &DataClient::ReadModifyWriteRow, request, "ReadModifyWriteRowRequest", - status); - if (!status.ok()) { - return MakeStatusFromRpcError(status); - } - return bigtable_internal::TransformReadModifyWriteRowResponse( - std::move(response)); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->ReadModifyWriteRow(std::move(request)); } future> Table::AsyncReadModifyWriteRowImpl( @@ -490,107 +126,16 @@ future> Table::AsyncReadModifyWriteRowImpl( SetCommonTableOperationRequest< ::google::bigtable::v2::ReadModifyWriteRowRequest>( request, app_profile_id(), table_name_); - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->AsyncReadModifyWriteRow(std::move(request)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return make_ready_future>( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO())); - } - - auto cq = background_threads_->cq(); - auto& client = client_; - auto metadata_update_policy = clone_metadata_update_policy(); - return google::cloud::internal::StartRetryAsyncUnaryRpc( - cq, __func__, clone_rpc_retry_policy(), clone_rpc_backoff_policy(), - Idempotency::kNonIdempotent, - [client, metadata_update_policy]( - grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) { - metadata_update_policy.Setup(*context); - return client->AsyncReadModifyWriteRow(context, request, cq); - }, - std::move(request)) - .then([](future> fut) - -> StatusOr { - auto result = fut.get(); - if (!result) return std::move(result).status(); - return bigtable_internal::TransformReadModifyWriteRowResponse( - *std::move(result)); - }); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->AsyncReadModifyWriteRow(std::move(request)); } future>> Table::AsyncReadRow(std::string row_key, Filter filter, Options opts) { - if (connection_) { - OptionsSpan span(MergeOptions(std::move(opts), options_)); - return connection_->AsyncReadRow(table_name_, std::move(row_key), - std::move(filter)); - } - if (!google::cloud::internal::IsEmpty(opts)) { - return make_ready_future>>( - google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO())); - } - - class AsyncReadRowHandler { - public: - AsyncReadRowHandler() : row_("", {}) {} - - future>> GetFuture() { - return row_promise_.get_future(); - } - - future OnRow(Row row) { - // assert(!row_received_); - row_ = std::move(row); - row_received_ = true; - // Don't satisfy the promise before `OnStreamFinished`. - // - // The `CompletionQueue`, which this object holds a reference to, should - // not be shut down before `OnStreamFinished` is called. In order to make - // sure of that, satisying the `promise<>` is deferred until then - the - // user shouldn't shutdown the `CompletionQueue` before this whole - // operation is done. - return make_ready_future(false); - } - - void OnStreamFinished(Status status) { - if (row_received_) { - // If we got a row we don't need to care about the stream status. - row_promise_.set_value(std::make_pair(true, std::move(row_))); - return; - } - if (status.ok()) { - row_promise_.set_value(std::make_pair(false, Row("", {}))); - } else { - row_promise_.set_value(std::move(status)); - } - } - - private: - Row row_; - bool row_received_{}; - promise>> row_promise_; - }; - - RowSet row_set(std::move(row_key)); - std::int64_t const rows_limit = 1; - auto handler = std::make_shared(); - AsyncReadRows([handler](Row row) { return handler->OnRow(std::move(row)); }, - [handler](Status status) { - handler->OnStreamFinished(std::move(status)); - }, - std::move(row_set), rows_limit, std::move(filter)); - return handler->GetFuture(); + OptionsSpan span(MergeOptions(std::move(opts), options_)); + return connection_->AsyncReadRow(table_name_, std::move(row_key), + std::move(filter)); } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/table.h b/google/cloud/bigtable/table.h index 00b16e69098ac..a91af05f74251 100644 --- a/google/cloud/bigtable/table.h +++ b/google/cloud/bigtable/table.h @@ -16,12 +16,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TABLE_H #include "google/cloud/bigtable/completion_queue.h" -#include "google/cloud/bigtable/data_client.h" #include "google/cloud/bigtable/data_connection.h" #include "google/cloud/bigtable/filters.h" #include "google/cloud/bigtable/idempotent_mutation_policy.h" #include "google/cloud/bigtable/internal/defaults.h" -#include "google/cloud/bigtable/internal/legacy_async_row_reader.h" #include "google/cloud/bigtable/mutation_branch.h" #include "google/cloud/bigtable/mutations.h" #include "google/cloud/bigtable/options.h" @@ -34,6 +32,7 @@ #include "google/cloud/bigtable/rpc_retry_policy.h" #include "google/cloud/bigtable/table_resource.h" #include "google/cloud/bigtable/version.h" +#include "google/cloud/background_threads.h" #include "google/cloud/future.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/group_options.h" @@ -52,20 +51,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class MutationBatcher; -/** - * Return the full table name. - * - * The full table name is: - * - * `projects//instances//tables/` - * - * Where the project id and instance id come from the @p client parameter. - */ -inline std::string TableName(std::shared_ptr const& client, - std::string const& table_id) { - return InstanceName(client) + "/tables/" + table_id; -} - /** * The main interface to interact with data in a Cloud Bigtable table. * @@ -775,28 +760,11 @@ class Table { return (*on_finish_ptr)(std::move(status)); }; - if (connection_) { - google::cloud::internal::OptionsSpan span( - google::cloud::internal::MergeOptions(std::move(opts), options_)); - connection_->AsyncReadRows(table_name_, std::move(on_row_fn), - std::move(on_finish_fn), std::move(row_set), - rows_limit, std::move(filter)); - return; - } - if (!google::cloud::internal::IsEmpty(opts)) { - on_finish_fn(google::cloud::internal::InvalidArgumentError( - "Per-operation options only apply to `Table`s constructed " - "with a `DataConnection`.", - GCP_ERROR_INFO())); - return; - } - - bigtable_internal::LegacyAsyncRowReader::Create( - background_threads_->cq(), client_, app_profile_id(), table_name_, - std::move(on_row_fn), std::move(on_finish_fn), std::move(row_set), - rows_limit, std::move(filter), clone_rpc_retry_policy(), - clone_rpc_backoff_policy(), metadata_update_policy_, - std::make_unique()); + google::cloud::internal::OptionsSpan span( + google::cloud::internal::MergeOptions(std::move(opts), options_)); + connection_->AsyncReadRows(table_name_, std::move(on_row_fn), + std::move(on_finish_fn), std::move(row_set), + rows_limit, std::move(filter)); } /** @@ -830,176 +798,6 @@ class Table { Filter filter, Options opts = {}); - /** - * Constructor with default policies. - * - * @param client how to communicate with Cloud Bigtable, including - * credentials, the project id, and the instance id. - * @param table_id the table id within the instance defined by client. The - * full table name is `client->instance_name() + "/tables/" + table_id`. - * - * @deprecated #google::cloud::bigtable::DataConnection is the preferred way - * to communicate with the Bigtable Data API. To migrate existing code, - * see @ref migrating-from-dataclient "Migrating from DataClient". - */ - Table(std::shared_ptr client, std::string const& table_id) - : Table(std::move(client), std::string{}, table_id) {} - - /** - * Constructor with default policies. - * - * @param client how to communicate with Cloud Bigtable, including - * credentials, the project id, and the instance id. - * @param app_profile_id the app_profile_id needed for using the replication - * API. - * @param table_id the table id within the instance defined by client. The - * full table name is `client->instance_name() + "/tables/" + table_id`. - * - * @deprecated #google::cloud::bigtable::DataConnection is the preferred way - * to communicate with the Bigtable Data API. To migrate existing code, - * see @ref migrating-from-dataclient "Migrating from DataClient". - */ - Table(std::shared_ptr client, std::string app_profile_id, - std::string const& table_id) - : client_(std::move(client)), - table_(client_->project_id(), client_->instance_id(), table_id), - table_name_(table_.FullName()), - rpc_retry_policy_prototype_( - bigtable::DefaultRPCRetryPolicy(internal::kBigtableLimits)), - rpc_backoff_policy_prototype_( - bigtable::DefaultRPCBackoffPolicy(internal::kBigtableLimits)), - idempotent_mutation_policy_( - bigtable::DefaultIdempotentMutationPolicy()), - background_threads_(client_->BackgroundThreadsFactory()()), - options_(Options{}.set(std::move(app_profile_id))), - metadata_update_policy_(bigtable_internal::MakeMetadataUpdatePolicy( - table_name_, this->app_profile_id())) {} - - /** - * Constructor with explicit policies. - * - * The policies are passed by value, because this makes it easy for - * applications to create them. - * - * @par Example - * @code - * using namespace std::chrono_literals; // assuming C++14. - * auto client = bigtable::MakeClient(...); // details omitted - * bigtable::Table table(client, "my-table", - * // Allow up to 20 minutes to retry operations - * bigtable::LimitedTimeRetryPolicy(20min), - * // Start with 50 milliseconds backoff, grow - * // exponentially to 5 minutes. - * bigtable::ExponentialBackoffPolicy(50ms, 5min), - * // Only retry idempotent mutations. - * bigtable::SafeIdempotentMutationPolicy()); - * @endcode - * - * @param client how to communicate with Cloud Bigtable, including - * credentials, the project id, and the instance id. - * @param table_id the table id within the instance defined by client. The - * full table name is `client->instance_name() + "/tables/" + table_id`. - * @param policies the set of policy overrides for this object. - * @tparam Policies the types of the policies to override, the types must - * derive from one of the following types: - * - * - `IdempotentMutationPolicy` which mutations are retried. Use - * `SafeIdempotentMutationPolicy` to only retry idempotent operations, - * use `AlwaysRetryMutationPolicy` to retry all operations. Read the - * caveats in the class definition to understand the downsides of the - * latter. You can also create your own policies that decide which - * mutations to retry. - * - `RPCBackoffPolicy` how to backoff from a failed RPC. Currently only - * `ExponentialBackoffPolicy` is implemented. You can also create your - * own policies that backoff using a different algorithm. - * - `RPCRetryPolicy` for how long to retry failed RPCs. Use - * `LimitedErrorCountRetryPolicy` to limit the number of failures - * allowed. Use `LimitedTimeRetryPolicy` to bound the time for any - * request. You can also create your own policies that combine time and - * error counts. - * - * @see SafeIdempotentMutationPolicy, AlwaysRetryMutationPolicy, - * ExponentialBackoffPolicy, LimitedErrorCountRetryPolicy, - * LimitedTimeRetryPolicy. - * - * @deprecated #google::cloud::bigtable::DataConnection is the preferred way - * to communicate with the Bigtable Data API. To migrate existing code, - * see @ref migrating-from-dataclient "Migrating from DataClient". - */ - template ::value, int> = 0 - /// @endcond - > - Table(std::shared_ptr client, std::string const& table_id, - Policies&&... policies) - : Table(std::move(client), table_id) { - ChangePolicies(std::forward(policies)...); - } - - /** - * Constructor with explicit policies. - * - * The policies are passed by value, because this makes it easy for - * applications to create them. - * - * @par Example - * @code - * using namespace std::chrono_literals; // assuming C++14. - * auto client = bigtable::MakeClient(...); // details omitted - * bigtable::Table table(client, "app_id", "my-table", - * // Allow up to 20 minutes to retry operations - * bigtable::LimitedTimeRetryPolicy(20min), - * // Start with 50 milliseconds backoff, grow - * // exponentially to 5 minutes. - * bigtable::ExponentialBackoffPolicy(50ms, 5min), - * // Only retry idempotent mutations. - * bigtable::SafeIdempotentMutationPolicy()); - * @endcode - * - * @param client how to communicate with Cloud Bigtable, including - * credentials, the project id, and the instance id. - * @param app_profile_id the app_profile_id needed for using the replication - * API. - * @param table_id the table id within the instance defined by client. The - * full table name is `client->instance_name() + "/tables/" + table_id`. - * @param policies the set of policy overrides for this object. - * @tparam Policies the types of the policies to override, the types must - * derive from one of the following types: - * - `IdempotentMutationPolicy` which mutations are retried. Use - * `SafeIdempotentMutationPolicy` to only retry idempotent operations, - * use `AlwaysRetryMutationPolicy` to retry all operations. Read the - * caveats in the class definition to understand the downsides of the - * latter. You can also create your own policies that decide which - * mutations to retry. - * - `RPCBackoffPolicy` how to backoff from a failed RPC. Currently only - * `ExponentialBackoffPolicy` is implemented. You can also create your - * own policies that backoff using a different algorithm. - * - `RPCRetryPolicy` for how long to retry failed RPCs. Use - * `LimitedErrorCountRetryPolicy` to limit the number of failures - * allowed. Use `LimitedTimeRetryPolicy` to bound the time for any - * request. You can also create your own policies that combine time and - * error counts. - * - * @see SafeIdempotentMutationPolicy, AlwaysRetryMutationPolicy, - * ExponentialBackoffPolicy, LimitedErrorCountRetryPolicy, - * LimitedTimeRetryPolicy. - * - * @deprecated #google::cloud::bigtable::DataConnection is the preferred way - * to communicate with the Bigtable Data API. To migrate existing code, - * see @ref migrating-from-dataclient "Migrating from DataClient". - */ - template ::value, int> = 0 - /// @endcond - > - Table(std::shared_ptr client, std::string app_profile_id, - std::string const& table_id, Policies&&... policies) - : Table(std::move(client), std::move(app_profile_id), table_id) { - ChangePolicies(std::forward(policies)...); - } - private: /** * Send request ReadModifyWriteRowRequest to modify the row and get it back @@ -1066,13 +864,11 @@ class Table { ///@} friend class MutationBatcher; - std::shared_ptr client_; TableResource table_; std::string table_name_; std::shared_ptr rpc_retry_policy_prototype_; std::shared_ptr rpc_backoff_policy_prototype_; std::shared_ptr idempotent_mutation_policy_; - std::shared_ptr background_threads_; std::shared_ptr connection_; Options options_; MetadataUpdatePolicy metadata_update_policy_; diff --git a/google/cloud/bigtable/table_admin.cc b/google/cloud/bigtable/table_admin.cc index 50686fb9f0452..fb7758553c062 100644 --- a/google/cloud/bigtable/table_admin.cc +++ b/google/cloud/bigtable/table_admin.cc @@ -16,7 +16,7 @@ #include "google/cloud/bigtable/admin/bigtable_table_admin_client.h" #include "google/cloud/bigtable/wait_for_consistency.h" #include "google/cloud/internal/time_utils.h" -#include +#include "google/protobuf/duration.pb.h" #include namespace btadmin = ::google::bigtable::admin::v2; diff --git a/google/cloud/bigtable/table_apply_test.cc b/google/cloud/bigtable/table_apply_test.cc deleted file mode 100644 index acbf38761b2c6..0000000000000 --- a/google/cloud/bigtable/table_apply_test.cc +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/api_client_header.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/testing_util/validate_metadata.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace bigtable = ::google::cloud::bigtable; -using ::google::cloud::testing_util::StatusIs; -using ::google::cloud::testing_util::ValidateMetadataFixture; -using ::google::cloud::testing_util::chrono_literals::operator""_ms; - -class TableApplyTest : public bigtable::testing::TableTestFixture { - protected: - TableApplyTest() : TableTestFixture(CompletionQueue{}) {} - - void IsContextMDValid(grpc::ClientContext& context, std::string const& method, - google::protobuf::Message const& request) { - return validate_metadata_fixture_.IsContextMDValid( - context, method, request, - google::cloud::internal::HandCraftedLibClientHeader()); - } - - std::function - CreateMutateRowMock(grpc::Status const& status) { - return [this, status](grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - google::bigtable::v2::MutateRowResponse*) { - IsContextMDValid(*context, "google.bigtable.v2.Bigtable.MutateRow", - request); - return status; - }; - } - - private: - ValidateMetadataFixture validate_metadata_fixture_; -}; - -/// @test Verify that Table::Apply() works in a simplest case. -TEST_F(TableApplyTest, Simple) { - EXPECT_CALL(*client_, MutateRow) - .WillOnce(CreateMutateRowMock(grpc::Status::OK)); - - auto status = table_.Apply(bigtable::SingleRowMutation( - "bar", {bigtable::SetCell("fam", "col", 0_ms, "val")})); - ASSERT_STATUS_OK(status); -} - -/// @test Verify that Table::Apply() raises an exception on permanent failures. -TEST_F(TableApplyTest, Failure) { - EXPECT_CALL(*client_, MutateRow) - .WillRepeatedly(CreateMutateRowMock( - grpc::Status(grpc::StatusCode::FAILED_PRECONDITION, "uh-oh"))); - - auto status = table_.Apply(bigtable::SingleRowMutation( - "bar", {bigtable::SetCell("fam", "col", 0_ms, "val")})); - EXPECT_THAT(status, StatusIs(StatusCode::kFailedPrecondition)); -} - -/// @test Verify that Table::Apply() retries on partial failures. -TEST_F(TableApplyTest, Retry) { - EXPECT_CALL(*client_, MutateRow) - .WillOnce(CreateMutateRowMock( - grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))) - .WillOnce(CreateMutateRowMock( - grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))) - .WillOnce(CreateMutateRowMock( - grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))) - .WillOnce(CreateMutateRowMock((grpc::Status::OK))); - - auto status = table_.Apply(bigtable::SingleRowMutation( - "bar", {bigtable::SetCell("fam", "col", 0_ms, "val")})); - ASSERT_STATUS_OK(status); -} - -/// @test Verify that Table::Apply() retries only idempotent mutations. -TEST_F(TableApplyTest, RetryIdempotent) { - EXPECT_CALL(*client_, MutateRow) - .WillRepeatedly(CreateMutateRowMock( - grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))); - - auto status = table_.Apply(bigtable::SingleRowMutation( - "not-idempotent", {bigtable::SetCell("fam", "col", "val")})); - EXPECT_THAT(status, StatusIs(StatusCode::kUnavailable)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_bulk_apply_test.cc b/google/cloud/bigtable/table_bulk_apply_test.cc deleted file mode 100644 index d991309977d62..0000000000000 --- a/google/cloud/bigtable/table_bulk_apply_test.cc +++ /dev/null @@ -1,391 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_mutate_rows_reader.h" -#include "google/cloud/bigtable/testing/mock_policies.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/status_matchers.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; - -using ::google::cloud::bigtable::testing::MockBackoffPolicy; -using ::google::cloud::testing_util::IsOk; -using ::google::cloud::testing_util::chrono_literals::operator""_ms; -using ::google::cloud::testing_util::chrono_literals::operator""_us; -using ::testing::An; -using ::testing::Not; -using ::testing::Return; - -/// Define types and functions used in the tests. -class TableBulkApplyTest - : public ::google::cloud::bigtable::testing::TableTestFixture { - public: - TableBulkApplyTest() : TableTestFixture(CompletionQueue{}) {} -}; -using ::google::cloud::bigtable::testing::MockMutateRowsReader; - -TEST_F(TableBulkApplyTest, Empty) { - auto failures = table_.BulkApply(BulkMutation()); - EXPECT_TRUE(failures.empty()); -} - -/// @test Verify that Table::BulkApply() works in the easy case. -TEST_F(TableBulkApplyTest, Simple) { - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - { - auto& e = *r->add_entries(); - e.set_index(1); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*reader, Finish()).WillOnce(Return(grpc::Status::OK)); - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(reader.release()->MakeMockReturner()); - - auto failures = table_.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - ASSERT_TRUE(failures.empty()); - SUCCEED(); -} - -/// @test Verify that Table::BulkApply() retries partial failures. -TEST_F(TableBulkApplyTest, RetryPartialFailure) { - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - // Simulate a partial (recoverable) failure. - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - auto& e1 = *r->add_entries(); - e1.set_index(1); - e1.mutable_status()->set_code(grpc::StatusCode::OK); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()).WillOnce(Return(grpc::Status::OK)); - - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish()).WillOnce(Return(grpc::Status::OK)); - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(r1.release()->MakeMockReturner()) - .WillOnce(r2.release()->MakeMockReturner()); - - auto failures = table_.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - ASSERT_TRUE(failures.empty()); - SUCCEED(); -} - -/// @test Verify that Table::BulkApply() handles permanent failures. -TEST_F(TableBulkApplyTest, PermanentFailure) { - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - { - auto& e = *r->add_entries(); - e.set_index(1); - e.mutable_status()->set_code(grpc::StatusCode::OUT_OF_RANGE); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()).WillOnce(Return(grpc::Status::OK)); - - EXPECT_CALL(*client_, MutateRows).WillOnce(r1.release()->MakeMockReturner()); - - auto failures = table_.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - EXPECT_FALSE(failures.empty()); -} - -/// @test Verify that Table::BulkApply() handles a terminated stream. -TEST_F(TableBulkApplyTest, CanceledStream) { - // Simulate a stream that returns one success and then terminates. We expect - // the BulkApply() operation to retry the request, because the mutation is in - // an undetermined state. Well, it should retry assuming it is idempotent, - // which happens to be the case in this test. - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()).WillOnce(Return(grpc::Status::OK)); - - // Create a second stream returned by the mocks when the client retries. - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish()).WillOnce(Return(grpc::Status::OK)); - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(r1.release()->MakeMockReturner()) - .WillOnce(r2.release()->MakeMockReturner()); - - auto failures = table_.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - ASSERT_TRUE(failures.empty()); - SUCCEED(); -} - -/// @test Verify that Table::BulkApply() reports correctly on too many errors. -TEST_F(TableBulkApplyTest, TooManyFailures) { - // Create a table with specific policies so we can test the behavior - // without having to depend on timers expiring. In this case tolerate only - // 3 failures. - Table custom_table( - client_, "foo_table", - // Configure the Table to stop at 3 failures. - LimitedErrorCountRetryPolicy(2), - // Use much shorter backoff than the default to test faster. - ExponentialBackoffPolicy(10_us, 40_us)); - - // Setup the mocks to fail more than 3 times. - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::ABORTED, ""))); - - auto create_cancelled_stream = [&](grpc::ClientContext*, - btproto::MutateRowsRequest const&) { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::ABORTED, ""))); - return stream; - }; - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(r1.release()->MakeMockReturner()) - .WillOnce(create_cancelled_stream) - .WillOnce(create_cancelled_stream); - - auto failures = custom_table.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - EXPECT_FALSE(failures.empty()); - EXPECT_EQ(google::cloud::StatusCode::kAborted, - failures.front().status().code()); -} - -TEST_F(TableBulkApplyTest, RetryPolicyUsedForOkStreamWithFailedMutations) { - // Create a table with specific policies so we can test the behavior - // without having to depend on timers expiring. In this case tolerate only - // 3 failures. - Table custom_table( - client_, "foo_table", - // Configure the Table to stop at 3 failures. - LimitedErrorCountRetryPolicy(2), - // Use much shorter backoff than the default to test faster. - ExponentialBackoffPolicy(10_us, 40_us)); - - auto create_stream = [&](grpc::ClientContext*, - btproto::MutateRowsRequest const&) { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*stream, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - auto& e0 = *r->add_entries(); - e0.set_index(0); - e0.mutable_status()->set_code(grpc::StatusCode::UNAVAILABLE); - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - return stream; - }; - - EXPECT_CALL(*client_, MutateRows).Times(3).WillRepeatedly(create_stream); - - auto failures = custom_table.BulkApply(BulkMutation( - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - EXPECT_FALSE(failures.empty()); - EXPECT_EQ(StatusCode::kUnavailable, failures.front().status().code()); -} - -/// @test Verify that Table::BulkApply() retries only idempotent mutations. -TEST_F(TableBulkApplyTest, RetryOnlyIdempotent) { - // We will send both idempotent and non-idempotent mutations. We prepare the - // mocks to return an empty stream in the first RPC request. That will force - // the client to only retry the idempotent mutations. - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r1, Read).WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish()).WillOnce(Return(grpc::Status::OK)); - - auto r2 = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*r2, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r2, Finish()).WillOnce(Return(grpc::Status::OK)); - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(r1.release()->MakeMockReturner()) - .WillOnce(r2.release()->MakeMockReturner()); - - auto failures = table_.BulkApply(BulkMutation( - SingleRowMutation("is-idempotent", {SetCell("fam", "col", 0_ms, "qux")}), - SingleRowMutation("not-idempotent", {SetCell("fam", "col", "baz")}))); - EXPECT_EQ(1UL, failures.size()); - EXPECT_EQ(1, failures.front().original_index()); - EXPECT_THAT(failures.front().status(), Not(IsOk())); - EXPECT_FALSE(failures.empty()); -} - -/// @test Verify that Table::BulkApply() works when the RPC fails. -TEST_F(TableBulkApplyTest, FailedRPC) { - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*reader, Read).WillOnce(Return(false)); - EXPECT_CALL(*reader, Finish()) - .WillOnce(Return(grpc::Status(grpc::StatusCode::FAILED_PRECONDITION, - "no such table"))); - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(reader.release()->MakeMockReturner()); - - auto failures = table_.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); - EXPECT_EQ(2UL, failures.size()); - EXPECT_THAT(failures.front().status(), Not(IsOk())); - EXPECT_FALSE(failures.empty()); - EXPECT_EQ(google::cloud::StatusCode::kFailedPrecondition, - failures.front().status().code()); -} - -TEST_F(TableBulkApplyTest, NoSleepIfNoPendingMutations) { - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.MutateRows"); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::MutateRowsResponse* r) { - { - auto& e = *r->add_entries(); - e.set_index(0); - e.mutable_status()->set_code(grpc::StatusCode::OK); - } - { - auto& e = *r->add_entries(); - e.set_index(1); - e.mutable_status()->set_code(grpc::StatusCode::PERMISSION_DENIED); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*reader, Finish()).WillOnce(Return(grpc::Status::OK)); - - EXPECT_CALL(*client_, MutateRows) - .WillOnce(reader.release()->MakeMockReturner()); - - // The backoff policy is cloned once in the Table constructor, and once before - // the start of the `BulkApply` call. We set expectations on the second clone. - auto b1 = std::make_unique(); - EXPECT_CALL(*b1, clone).WillOnce([]() { - auto b2 = std::make_unique(); - EXPECT_CALL(*b2, clone).WillOnce([]() { - auto mock = std::make_unique(); - EXPECT_CALL(*mock, Setup).Times(1); - EXPECT_CALL(*mock, OnCompletion(An())).Times(0); - return mock; - }); - return b2; - }); - auto table = Table(client_, kTableId, std::move(*b1)); - (void)table.BulkApply(BulkMutation( - SingleRowMutation("foo", {SetCell("fam", "col", 0_ms, "baz")}), - SingleRowMutation("bar", {SetCell("fam", "col", 0_ms, "qux")}))); -} - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_check_and_mutate_row_test.cc b/google/cloud/bigtable/table_check_and_mutate_row_test.cc deleted file mode 100644 index df0f029de5e25..0000000000000 --- a/google/cloud/bigtable/table_check_and_mutate_row_test.cc +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/api_client_header.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/testing_util/validate_metadata.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::cloud::testing_util::ValidateMetadataFixture; -using ::google::cloud::testing_util::chrono_literals::operator""_ms; - -class TableCheckAndMutateRowTest : public bigtable::testing::TableTestFixture { - protected: - TableCheckAndMutateRowTest() : TableTestFixture(CompletionQueue{}) {} - - void IsContextMDValid(grpc::ClientContext& context, std::string const& method, - google::protobuf::Message const& request) { - return validate_metadata_fixture_.IsContextMDValid( - context, method, request, - google::cloud::internal::HandCraftedLibClientHeader()); - } - - std::function< - grpc::Status(grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const&, - google::bigtable::v2::CheckAndMutateRowResponse*)> - CreateCheckAndMutateMock(grpc::Status const& status) { - return [this, status]( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - google::bigtable::v2::CheckAndMutateRowResponse*) { - IsContextMDValid( - *context, "google.bigtable.v2.Bigtable.CheckAndMutateRow", request); - return status; - }; - } - - private: - ValidateMetadataFixture validate_metadata_fixture_; -}; - -/// @test Verify that Table::CheckAndMutateRow() works in a simplest case. -TEST_F(TableCheckAndMutateRowTest, Simple) { - EXPECT_CALL(*client_, CheckAndMutateRow) - .WillOnce(CreateCheckAndMutateMock(grpc::Status::OK)); - - auto mut = table_.CheckAndMutateRow( - "foo", bigtable::Filter::PassAllFilter(), - {bigtable::SetCell("fam", "col", 0_ms, "it was true")}, - {bigtable::SetCell("fam", "col", 0_ms, "it was false")}); - - ASSERT_STATUS_OK(mut); -} - -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS -/// @test Verify that Table::CheckAndMutateRow() raises an on failures. -TEST_F(TableCheckAndMutateRowTest, Failure) { - EXPECT_CALL(*client_, CheckAndMutateRow) - .WillRepeatedly(CreateCheckAndMutateMock( - grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))); - - EXPECT_FALSE(table_.CheckAndMutateRow( - "foo", bigtable::Filter::PassAllFilter(), - {bigtable::SetCell("fam", "col", 0_ms, "it was true")}, - {bigtable::SetCell("fam", "col", 0_ms, "it was false")})); -} -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_config.h b/google/cloud/bigtable/table_config.h index 9216ca3798bbd..64ab811a3e6b7 100644 --- a/google/cloud/bigtable/table_config.h +++ b/google/cloud/bigtable/table_config.h @@ -17,7 +17,7 @@ #include "google/cloud/bigtable/column_family.h" #include "google/cloud/bigtable/version.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.pb.h" #include #include #include diff --git a/google/cloud/bigtable/table_readmodifywriterow_test.cc b/google/cloud/bigtable/table_readmodifywriterow_test.cc deleted file mode 100644 index 8bd0b22e2f2db..0000000000000 --- a/google/cloud/bigtable/table_readmodifywriterow_test.cc +++ /dev/null @@ -1,295 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/api_client_header.h" -#include "google/cloud/testing_util/is_proto_equal.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/testing_util/validate_metadata.h" -#include -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; - -using ::google::cloud::testing_util::IsProtoEqual; -using ::google::cloud::testing_util::ValidateMetadataFixture; - -/// Define helper types and functions for this test. -class TableReadModifyWriteTest : public bigtable::testing::TableTestFixture { - public: - TableReadModifyWriteTest() : TableTestFixture(CompletionQueue{}) {} - - std::function - CreateRules(std::string const& expected_request_string, - std::string const& generated_response_string) { - return [this, expected_request_string, generated_response_string]( - grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - btproto::ReadModifyWriteRowResponse* response) { - validate_metadata_fixture_.IsContextMDValid( - *context, "google.bigtable.v2.Bigtable.ReadModifyWriteRow", request, - google::cloud::internal::HandCraftedLibClientHeader()); - btproto::ReadModifyWriteRowRequest expected_request; - EXPECT_TRUE(::google::protobuf::TextFormat::ParseFromString( - expected_request_string, &expected_request)); - EXPECT_THAT(expected_request, IsProtoEqual(request)); - - EXPECT_TRUE(::google::protobuf::TextFormat::ParseFromString( - generated_response_string, response)); - - return grpc::Status::OK; - }; - } - - private: - ValidateMetadataFixture validate_metadata_fixture_; -}; - -TEST_F(TableReadModifyWriteTest, MultipleAppendValueTest) { - std::string const row_key = "row-key"; - std::string const family1 = "family1"; - std::string const column_id1 = "colid1"; - std::string const request_text = R"""( -table_name: "projects/foo-project/instances/bar-instance/tables/baz-table" -row_key: "row-key" -rules { - family_name: "family1" - column_qualifier: "colid1" - append_value: "value1" -} -rules { - family_name: "family1" - column_qualifier: "colid1" - append_value: "-value2" -} -)"""; - - std::string const response_text = R"""( -row { - key: "response-row-key" - families { - name: "response-family1" - columns { - qualifier: "response-colid1" - cells { - value: "value1-value2" - } - } - } -} -)"""; - - auto mock_read_modify_write_row = CreateRules(request_text, response_text); - - EXPECT_CALL(*client_, ReadModifyWriteRow) - .WillOnce(mock_read_modify_write_row); - - auto row = table_.ReadModifyWriteRow( - row_key, - bigtable::ReadModifyWriteRule::AppendValue(family1, column_id1, "value1"), - bigtable::ReadModifyWriteRule::AppendValue(family1, column_id1, - "-value2")); - - ASSERT_STATUS_OK(row); - EXPECT_EQ("response-row-key", row->row_key()); - EXPECT_EQ("response-family1", row->cells().at(0).family_name()); - EXPECT_EQ("response-colid1", row->cells().at(0).column_qualifier()); - EXPECT_EQ(1, (int)row->cells().size()); - EXPECT_EQ("value1-value2", row->cells().at(0).value()); -} - -TEST_F(TableReadModifyWriteTest, MultipleIncrementAmountTest) { - std::string const row_key = "row-key"; - std::string const family1 = "family1"; - std::string const family2 = "family2"; - std::string const column_id1 = "colid1"; - std::string const column_id2 = "colid2"; - std::string const request_text = R"""( - table_name: "projects/foo-project/instances/bar-instance/tables/baz-table" - row_key: "row-key" - rules { - family_name: "family1" - column_qualifier: "colid1" - increment_amount: 1000 - } - rules { - family_name: "family1" - column_qualifier: "colid2" - increment_amount: 200 - } - rules { - family_name: "family2" - column_qualifier: "colid2" - increment_amount: 400 - } - )"""; - - std::string const response_text = R"""( - row { - key: "response-row-key" - families { - name: "response-family1" - columns { - qualifier: "response-colid1" - cells { - value: "1200" - } - } - } - families { - name: "response-family2" - columns { - qualifier: "response-colid2" - cells { - value: "400" - } - } - } - } - )"""; - - auto mock_read_modify_write_row = CreateRules(request_text, response_text); - - EXPECT_CALL(*client_, ReadModifyWriteRow) - .WillOnce(mock_read_modify_write_row); - - auto row = table_.ReadModifyWriteRow( - row_key, - bigtable::ReadModifyWriteRule::IncrementAmount(family1, column_id1, 1000), - bigtable::ReadModifyWriteRule::IncrementAmount(family1, column_id2, 200), - bigtable::ReadModifyWriteRule::IncrementAmount(family2, column_id2, 400)); - - ASSERT_STATUS_OK(row); - EXPECT_EQ("response-row-key", row->row_key()); - EXPECT_EQ("response-family1", row->cells().at(0).family_name()); - EXPECT_EQ("response-colid1", row->cells().at(0).column_qualifier()); - EXPECT_EQ(2, (int)row->cells().size()); - EXPECT_EQ("1200", row->cells().at(0).value()); - - EXPECT_EQ("response-family2", row->cells().at(1).family_name()); - EXPECT_EQ("response-colid2", row->cells().at(1).column_qualifier()); - EXPECT_EQ("400", row->cells().at(1).value()); -} - -TEST_F(TableReadModifyWriteTest, MultipleMixedRuleTest) { - std::string const row_key = "row-key"; - std::string const family1 = "family1"; - std::string const family2 = "family2"; - std::string const column_id1 = "colid1"; - std::string const column_id2 = "colid2"; - std::string const request_text = R"""( - table_name: "projects/foo-project/instances/bar-instance/tables/baz-table" - row_key: "row-key" - rules { - family_name: "family1" - column_qualifier: "colid1" - increment_amount: 1000 - } - rules { - family_name: "family1" - column_qualifier: "colid2" - append_value: "value_string" - } - rules { - family_name: "family2" - column_qualifier: "colid2" - increment_amount: 400 - } - )"""; - - std::string const response_text = R"""( - row { - key: "response-row-key" - families { - name: "response-family1" - columns { - qualifier: "response-colid1" - cells { - value: "1200" - } - } - } - families { - name: "response-family2" - columns { - qualifier: "response-colid2" - cells { - value: "value_string" - } - } - } - } - )"""; - - auto mock_read_modify_write_row = CreateRules(request_text, response_text); - - EXPECT_CALL(*client_, ReadModifyWriteRow) - .WillOnce(mock_read_modify_write_row); - - auto row = table_.ReadModifyWriteRow( - row_key, - bigtable::ReadModifyWriteRule::IncrementAmount(family1, column_id1, 1000), - bigtable::ReadModifyWriteRule::AppendValue(family1, column_id2, - "value_string"), - bigtable::ReadModifyWriteRule::IncrementAmount(family2, column_id2, 400)); - - ASSERT_STATUS_OK(row); - EXPECT_EQ("response-row-key", row->row_key()); - EXPECT_EQ("response-family1", row->cells().at(0).family_name()); - EXPECT_EQ("response-colid1", row->cells().at(0).column_qualifier()); - EXPECT_EQ(2, (int)row->cells().size()); - EXPECT_EQ("1200", row->cells().at(0).value()); - - EXPECT_EQ("response-family2", row->cells().at(1).family_name()); - EXPECT_EQ("response-colid2", row->cells().at(1).column_qualifier()); - EXPECT_EQ("value_string", row->cells().at(1).value()); -} - -TEST_F(TableReadModifyWriteTest, UnrecoverableFailureTest) { - std::string const row_key = "row-key"; - std::string const family1 = "family1"; - std::string const column_id1 = "colid1"; - - EXPECT_CALL(*client_, ReadModifyWriteRow) - .WillRepeatedly( - [](grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - google::bigtable::v2::ReadModifyWriteRowResponse*) { - ::google::cloud::testing_util::ValidateMetadataFixture fixture; - fixture.IsContextMDValid( - *context, "google.bigtable.v2.Bigtable.ReadModifyWriteRow", - request, google::cloud::internal::HandCraftedLibClientHeader()); - return grpc::Status(grpc::StatusCode::PERMISSION_DENIED, "uh oh"); - }); - - EXPECT_FALSE(table_.ReadModifyWriteRow( - row_key, - bigtable::ReadModifyWriteRule::AppendValue(family1, column_id1, "value1"), - bigtable::ReadModifyWriteRule::AppendValue(family1, column_id1, - "-value2"))); -} - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_readrow_test.cc b/google/cloud/bigtable/table_readrow_test.cc deleted file mode 100644 index f9478e030f833..0000000000000 --- a/google/cloud/bigtable/table_readrow_test.cc +++ /dev/null @@ -1,132 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_read_rows_reader.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/testing_util/status_matchers.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace btproto = ::google::bigtable::v2; -using ::google::cloud::bigtable::testing::MockReadRowsReader; -using ::google::cloud::testing_util::ValidateMetadataFixture; -using ::testing::Return; - -class TableReadRowTest : public bigtable::testing::TableTestFixture { - protected: - TableReadRowTest() : TableTestFixture(CompletionQueue{}) {} - - void IsContextMDValid(grpc::ClientContext& context, std::string const& method, - google::protobuf::Message const& request) { - return validate_metadata_fixture_.IsContextMDValid( - context, method, request, - google::cloud::internal::HandCraftedLibClientHeader()); - } - - private: - ValidateMetadataFixture validate_metadata_fixture_; -}; - -TEST_F(TableReadRowTest, ReadRowSimple) { - auto const response = bigtable::testing::ReadRowsResponseFromString(R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "col" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } -)"); - - EXPECT_CALL(*client_, ReadRows) - .WillOnce([&response, this](grpc::ClientContext* context, - btproto::ReadRowsRequest const& req) { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*stream, Read) - .WillOnce([response](btproto::ReadRowsResponse* r) { - *r = response; - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish).WillOnce(Return(grpc::Status::OK)); - - IsContextMDValid(*context, "google.bigtable.v2.Bigtable.ReadRows", req); - EXPECT_EQ(1, req.rows().row_keys_size()); - EXPECT_EQ("r1", req.rows().row_keys(0)); - EXPECT_EQ(1, req.rows_limit()); - EXPECT_EQ(table_.table_name(), req.table_name()); - return stream; - }); - - auto result = table_.ReadRow("r1", bigtable::Filter::PassAllFilter()); - ASSERT_STATUS_OK(result); - EXPECT_TRUE(std::get<0>(*result)); - auto row = std::get<1>(*result); - EXPECT_EQ("r1", row.row_key()); -} - -TEST_F(TableReadRowTest, ReadRowMissing) { - EXPECT_CALL(*client_, ReadRows) - .WillOnce([this](grpc::ClientContext* context, - btproto::ReadRowsRequest const& req) { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish).WillOnce(Return(grpc::Status::OK)); - - IsContextMDValid(*context, "google.bigtable.v2.Bigtable.ReadRows", req); - EXPECT_EQ(1, req.rows().row_keys_size()); - EXPECT_EQ("r1", req.rows().row_keys(0)); - EXPECT_EQ(1, req.rows_limit()); - EXPECT_EQ(table_.table_name(), req.table_name()); - return stream; - }); - - auto result = table_.ReadRow("r1", bigtable::Filter::PassAllFilter()); - ASSERT_STATUS_OK(result); - EXPECT_FALSE(std::get<0>(*result)); -} - -TEST_F(TableReadRowTest, UnrecoverableFailure) { - EXPECT_CALL(*client_, ReadRows) - .WillRepeatedly([this](grpc::ClientContext* context, - btproto::ReadRowsRequest const& request) { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*stream, Read).WillRepeatedly(Return(false)); - EXPECT_CALL(*stream, Finish) - .WillRepeatedly(Return( - grpc::Status(grpc::StatusCode::PERMISSION_DENIED, "uh oh"))); - - IsContextMDValid(*context, "google.bigtable.v2.Bigtable.ReadRows", - request); - return stream; - }); - - auto row = table_.ReadRow("r1", bigtable::Filter::PassAllFilter()); - EXPECT_FALSE(row); -} - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_readrows_test.cc b/google/cloud/bigtable/table_readrows_test.cc deleted file mode 100644 index 1b9427d47c303..0000000000000 --- a/google/cloud/bigtable/table_readrows_test.cc +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_read_rows_reader.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/testing_util/status_matchers.h" - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::cloud::bigtable::testing::MockReadRowsReader; -using ::testing::DoAll; -using ::testing::Return; -using ::testing::SetArgPointee; -using ::testing::WithoutArgs; - -class TableReadRowsTest : public bigtable::testing::TableTestFixture { - public: - TableReadRowsTest() : TableTestFixture(CompletionQueue{}) {} -}; - -TEST_F(TableReadRowsTest, ReadRowsCanReadOneRow) { - auto response = bigtable::testing::ReadRowsResponseFromString(R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "qual" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - )"); - - // must be a new pointer, it is wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*stream, Read) - .WillOnce(DoAll(SetArgPointee<0>(response), Return(true))) - .WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()).WillOnce(Return(grpc::Status::OK)); - EXPECT_CALL(*client_, ReadRows).WillOnce(stream->MakeMockReturner()); - - auto reader = - table_.ReadRows(bigtable::RowSet(), bigtable::Filter::PassAllFilter()); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(TableReadRowsTest, ReadRowsCanReadWithRetries) { - auto response = bigtable::testing::ReadRowsResponseFromString(R"( - chunks { - row_key: "r1" - family_name { value: "fam" } - qualifier { value: "qual" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - )"); - - auto response_retry = bigtable::testing::ReadRowsResponseFromString(R"( - chunks { - row_key: "r2" - family_name { value: "fam" } - qualifier { value: "qual" } - timestamp_micros: 42000 - value: "value" - commit_row: true - } - )"); - - // must be a new pointer, it is wrapped in unique_ptr by ReadRows - auto* stream = new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - auto* stream_retry = - new MockReadRowsReader("google.bigtable.v2.Bigtable.ReadRows"); - - EXPECT_CALL(*client_, ReadRows) - .WillOnce(stream->MakeMockReturner()) - .WillOnce(stream_retry->MakeMockReturner()); - - EXPECT_CALL(*stream, Read) - .WillOnce(DoAll(SetArgPointee<0>(response), Return(true))) - .WillOnce(Return(false)); - - EXPECT_CALL(*stream, Finish()) - .WillOnce( - Return(grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))); - - EXPECT_CALL(*stream_retry, Read) - .WillOnce(DoAll(SetArgPointee<0>(response_retry), Return(true))) - .WillOnce(Return(false)); - - EXPECT_CALL(*stream_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - - auto reader = - table_.ReadRows(bigtable::RowSet(), bigtable::Filter::PassAllFilter()); - - auto it = reader.begin(); - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r1"); - ++it; - EXPECT_NE(it, reader.end()); - ASSERT_STATUS_OK(*it); - EXPECT_EQ((*it)->row_key(), "r2"); - EXPECT_EQ(++it, reader.end()); -} - -TEST_F(TableReadRowsTest, ReadRowsThrowsWhenTooManyErrors) { - EXPECT_CALL(*client_, ReadRows).WillRepeatedly(WithoutArgs([] { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.ReadRows"); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish()) - .WillOnce( - Return(grpc::Status(grpc::StatusCode::UNAVAILABLE, "broken"))); - return stream; - })); - - auto table = bigtable::Table( - client_, "table_id", bigtable::LimitedErrorCountRetryPolicy(3), - bigtable::ExponentialBackoffPolicy(std::chrono::seconds(0), - std::chrono::seconds(0)), - bigtable::SafeIdempotentMutationPolicy()); - auto reader = - table.ReadRows(bigtable::RowSet(), bigtable::Filter::PassAllFilter()); - - auto it = reader.begin(); - ASSERT_NE(reader.end(), it); - ASSERT_FALSE(*it); - ++it; - ASSERT_EQ(reader.end(), it); -} - -} // anonymous namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_sample_row_keys_test.cc b/google/cloud/bigtable/table_sample_row_keys_test.cc deleted file mode 100644 index 77cb019d3ee2f..0000000000000 --- a/google/cloud/bigtable/table_sample_row_keys_test.cc +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_sample_row_keys_reader.h" -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/testing_util/chrono_literals.h" -#include "google/cloud/testing_util/status_matchers.h" -#include - -namespace google { -namespace cloud { -namespace bigtable { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::cloud::testing_util::chrono_literals::operator""_us; -using ::google::cloud::bigtable::testing::MockSampleRowKeysReader; -using ::testing::Return; -using ::testing::Unused; - -class TableSampleRowKeysTest - : public ::google::cloud::bigtable::testing::TableTestFixture { - public: - TableSampleRowKeysTest() : TableTestFixture(CompletionQueue{}) {} -}; - -/// @test Verify that Table::SampleRows() works. -TEST_F(TableSampleRowKeysTest, SampleRowKeysTest) { - namespace btproto = ::google::bigtable::v2; - - EXPECT_CALL(*client_, SampleRowKeys).WillOnce([](Unused, Unused) { - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.SampleRowKeys"); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*reader, Finish).WillOnce(Return(grpc::Status::OK)); - return reader; - }); - auto result = table_.SampleRows(); - ASSERT_STATUS_OK(result); - auto it = result->begin(); - EXPECT_NE(it, result->end()); - EXPECT_EQ(it->row_key, "test1"); - EXPECT_EQ(it->offset_bytes, 11); - EXPECT_EQ(++it, result->end()); -} - -/// @test Verify that Table::SampleRows() retries when unavailable. -TEST_F(TableSampleRowKeysTest, SampleRowKeysRetryTest) { - namespace btproto = ::google::bigtable::v2; - - EXPECT_CALL(*client_, SampleRowKeys) - .WillOnce([](Unused, Unused) { - auto reader = std::make_unique( - "google.bigtable.v2.Bigtable.SampleRowKeys"); - EXPECT_CALL(*reader, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - return true; - }) - .WillOnce(Return(false)); - - EXPECT_CALL(*reader, Finish()) - .WillOnce(Return( - grpc::Status(grpc::StatusCode::UNAVAILABLE, "try-again"))); - return reader; - }) - .WillOnce([](Unused, Unused) { - auto reader_retry = std::make_unique( - "google.bigtable.v2.Bigtable.SampleRowKeys"); - EXPECT_CALL(*reader_retry, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r) { - { - r->set_row_key("test2"); - r->set_offset_bytes(123); - } - return true; - }) - .WillOnce([](btproto::SampleRowKeysResponse* r) { - { - r->set_row_key("test3"); - r->set_offset_bytes(1234); - } - return true; - }) - .WillOnce(Return(false)); - - EXPECT_CALL(*reader_retry, Finish()).WillOnce(Return(grpc::Status::OK)); - return reader_retry; - }); - - auto results = table_.SampleRows(); - ASSERT_STATUS_OK(results); - - auto it = results->begin(); - EXPECT_NE(it, results->end()); - EXPECT_EQ("test2", it->row_key); - ++it; - EXPECT_NE(it, results->end()); - EXPECT_EQ("test3", it->row_key); - EXPECT_EQ(++it, results->end()); -} - -#if GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS -/// @test Verify that Table::SampleRows() reports correctly on too many errors. -TEST_F(TableSampleRowKeysTest, TooManyFailures) { - namespace btproto = ::google::bigtable::v2; - - // Create a table with specific policies so we can test the behavior - // without having to depend on timers expiring. In this case tolerate only - // 3 failures. - Table custom_table( - client_, "foo_table", - // Configure the Table to stop at 3 failures. - LimitedErrorCountRetryPolicy(2), - // Use much shorter backoff than the default to test faster. - ExponentialBackoffPolicy(10_us, 40_us), SafeIdempotentMutationPolicy()); - - // Setup the mocks to fail more than 3 times. - auto create_cancelled_stream = [](Unused, Unused) { - auto stream = std::make_unique( - "google.bigtable.v2.Bigtable.SampleRowKeys"); - EXPECT_CALL(*stream, Read).WillOnce(Return(false)); - EXPECT_CALL(*stream, Finish) - .WillOnce(Return(grpc::Status(grpc::StatusCode::ABORTED, ""))); - return stream; - }; - - EXPECT_CALL(*client_, SampleRowKeys) - .WillOnce([](Unused, Unused) { - auto r1 = std::make_unique( - "google.bigtable.v2.Bigtable.SampleRowKeys"); - EXPECT_CALL(*r1, Read) - .WillOnce([](btproto::SampleRowKeysResponse* r) { - { - r->set_row_key("test1"); - r->set_offset_bytes(11); - } - return true; - }) - .WillOnce(Return(false)); - EXPECT_CALL(*r1, Finish) - .WillOnce(Return(grpc::Status(grpc::StatusCode::ABORTED, ""))); - return r1; - }) - .WillOnce(create_cancelled_stream) - .WillOnce(create_cancelled_stream); - - EXPECT_FALSE(custom_table.SampleRows()); -} -#endif // GOOGLE_CLOUD_CPP_HAVE_EXCEPTIONS - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/table_test.cc b/google/cloud/bigtable/table_test.cc index 70c578b16fbdf..965e239e4481b 100644 --- a/google/cloud/bigtable/table_test.cc +++ b/google/cloud/bigtable/table_test.cc @@ -178,6 +178,55 @@ TEST(TableTest, AppProfileId) { EXPECT_EQ(kAppProfileId, table.app_profile_id()); } +TEST(TableTest, WithNewTarget) { + auto conn = std::make_shared(); + Table table(conn, TableResource(kProjectId, kInstanceId, kTableId), + Options{}.set(kAppProfileId)); + EXPECT_EQ(table.project_id(), kProjectId); + EXPECT_EQ(table.instance_id(), kInstanceId); + EXPECT_EQ(table.table_id(), kTableId); + EXPECT_EQ(table.table_name(), kTableName); + EXPECT_EQ(table.app_profile_id(), kAppProfileId); + + std::string const other_project_id = "other-project"; + std::string const other_instance_id = "other-instance"; + std::string const other_table_id = "other-table"; + auto other_table = + table.WithNewTarget(other_project_id, other_instance_id, other_table_id); + + EXPECT_EQ(other_table.project_id(), other_project_id); + EXPECT_EQ(other_table.instance_id(), other_instance_id); + EXPECT_EQ(other_table.table_id(), other_table_id); + EXPECT_EQ(other_table.table_name(), + TableName(other_project_id, other_instance_id, other_table_id)); + EXPECT_EQ(other_table.app_profile_id(), kAppProfileId); +} + +TEST(TableTest, WithNewTargetProfile) { + auto conn = std::make_shared(); + Table table(conn, TableResource(kProjectId, kInstanceId, kTableId), + Options{}.set(kAppProfileId)); + EXPECT_EQ(table.project_id(), kProjectId); + EXPECT_EQ(table.instance_id(), kInstanceId); + EXPECT_EQ(table.table_id(), kTableId); + EXPECT_EQ(table.table_name(), kTableName); + EXPECT_EQ(table.app_profile_id(), kAppProfileId); + + std::string const other_project_id = "other-project"; + std::string const other_instance_id = "other-instance"; + std::string const other_table_id = "other-table"; + std::string const other_profile_id = "other-profile"; + auto other_table = table.WithNewTarget(other_project_id, other_instance_id, + other_profile_id, other_table_id); + + EXPECT_EQ(other_table.project_id(), other_project_id); + EXPECT_EQ(other_table.instance_id(), other_instance_id); + EXPECT_EQ(other_table.table_id(), other_table_id); + EXPECT_EQ(other_table.table_name(), + TableName(other_project_id, other_instance_id, other_table_id)); + EXPECT_EQ(other_table.app_profile_id(), other_profile_id); +} + TEST(TableTest, Apply) { auto mock = std::make_shared(); EXPECT_CALL(*mock, Apply) diff --git a/google/cloud/bigtable/test_proxy/BUILD.bazel b/google/cloud/bigtable/test_proxy/BUILD.bazel index c3b6490e7da97..a2edf7ee5f91c 100644 --- a/google/cloud/bigtable/test_proxy/BUILD.bazel +++ b/google/cloud/bigtable/test_proxy/BUILD.bazel @@ -24,7 +24,7 @@ cc_library( hdrs = ["cbt_test_proxy.h"], deps = [ "//:bigtable", - "//protos:system_includes", + # "//protos:system_includes", "//protos/google/cloud/bigtable/test_proxy:test_proxy_cc_grpc", "//protos/google/cloud/bigtable/test_proxy:test_proxy_cc_proto", ], diff --git a/google/cloud/bigtable/test_proxy/cbt_test_proxy.h b/google/cloud/bigtable/test_proxy/cbt_test_proxy.h index 31295b29fdf52..6d3bc39fed60f 100644 --- a/google/cloud/bigtable/test_proxy/cbt_test_proxy.h +++ b/google/cloud/bigtable/test_proxy/cbt_test_proxy.h @@ -17,8 +17,9 @@ #include "google/cloud/bigtable/data_connection.h" #include "google/cloud/bigtable/table.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/version.h" -#include +#include "protos/google/cloud/bigtable/test_proxy/test_proxy.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/testing/embedded_server_test_fixture.cc b/google/cloud/bigtable/testing/embedded_server_test_fixture.cc index 5186db9eabcb1..3d8967ae186e3 100644 --- a/google/cloud/bigtable/testing/embedded_server_test_fixture.cc +++ b/google/cloud/bigtable/testing/embedded_server_test_fixture.cc @@ -13,7 +13,14 @@ // limitations under the License. #include "google/cloud/bigtable/testing/embedded_server_test_fixture.h" +#include "google/cloud/bigtable/internal/bigtable_metadata_decorator.h" +#include "google/cloud/bigtable/internal/bigtable_stub.h" +#include "google/cloud/bigtable/internal/data_connection_impl.h" +#include "google/cloud/bigtable/internal/mutate_rows_limiter.h" +#include "google/cloud/bigtable/options.h" +#include "google/cloud/bigtable/retry_policy.h" #include "google/cloud/grpc_error_delegate.h" +#include "google/cloud/internal/background_threads_impl.h" #include "google/cloud/internal/build_info.h" #include "google/cloud/internal/user_agent_prefix.h" #include @@ -53,9 +60,34 @@ void EmbeddedServerTestFixture::SetUp() { std::shared_ptr data_channel = server_->InProcessChannel(channel_arguments); - data_client_ = std::make_shared(kProjectId, kInstanceId, - std::move(data_channel)); - table_ = std::make_shared(data_client_, kTableId); + std::unique_ptr grpc_stub = + google::bigtable::v2::Bigtable::NewStub(data_channel); + std::shared_ptr stub = + std::make_shared( + std::make_shared( + std::move(grpc_stub)), + std::multimap{}, + google::cloud::internal::UserAgentPrefix()); + auto opts = + Options{} + .set( + google::cloud::bigtable::DataLimitedErrorCountRetryPolicy(7) + .clone()) + .set( + google::cloud::ExponentialBackoffPolicy( + /*initial_delay=*/std::chrono::milliseconds(200), + /*maximum_delay=*/std::chrono::seconds(45), + /*scaling=*/2.0) + .clone()); + data_connection_ = std::make_shared( + std::make_unique< + google::cloud::internal::AutomaticallyCreatedBackgroundThreads>(), + stub, std::make_shared(), + std::move(opts)); + + table_ = std::make_shared( + data_connection_, + bigtable::TableResource(kProjectId, kInstanceId, kTableId)); } void EmbeddedServerTestFixture::TearDown() { diff --git a/google/cloud/bigtable/testing/embedded_server_test_fixture.h b/google/cloud/bigtable/testing/embedded_server_test_fixture.h index 850da273b7991..1d2a4403089f8 100644 --- a/google/cloud/bigtable/testing/embedded_server_test_fixture.h +++ b/google/cloud/bigtable/testing/embedded_server_test_fixture.h @@ -17,8 +17,7 @@ #include "google/cloud/bigtable/table.h" #include "google/cloud/bigtable/table_admin.h" -#include "google/cloud/bigtable/testing/inprocess_data_client.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include #include #include @@ -79,7 +78,7 @@ class EmbeddedServerTestFixture : public ::testing::Test { std::string project_id_ = kProjectId; std::string instance_id_ = kInstanceId; - std::shared_ptr data_client_; + std::shared_ptr data_connection_; std::shared_ptr table_; std::thread wait_thread_; BigtableImpl bigtable_service_; diff --git a/google/cloud/bigtable/testing/inprocess_data_client.cc b/google/cloud/bigtable/testing/inprocess_data_client.cc deleted file mode 100644 index 2b40012ec8ae4..0000000000000 --- a/google/cloud/bigtable/testing/inprocess_data_client.cc +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/testing/inprocess_data_client.h" - -namespace google { -namespace cloud { -namespace bigtable { -namespace testing { - -namespace btproto = ::google::bigtable::v2; - -grpc::Status InProcessDataClient::MutateRow( - grpc::ClientContext* context, btproto::MutateRowRequest const& request, - btproto::MutateRowResponse* response) { - return Stub()->MutateRow(context, request, response); -} - -std::unique_ptr> -InProcessDataClient::AsyncMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - grpc::CompletionQueue* cq) { - auto result = Stub()->AsyncMutateRow(context, request, cq); - return std::unique_ptr>(result.release()); -} - -grpc::Status InProcessDataClient::CheckAndMutateRow( - grpc::ClientContext* context, - btproto::CheckAndMutateRowRequest const& request, - btproto::CheckAndMutateRowResponse* response) { - return Stub()->CheckAndMutateRow(context, request, response); -} - -std::unique_ptr> -InProcessDataClient::AsyncCheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) { - auto result = Stub()->AsyncCheckAndMutateRow(context, request, cq); - return std::unique_ptr>(result.release()); -} - -grpc::Status InProcessDataClient::ReadModifyWriteRow( - grpc::ClientContext* context, - btproto::ReadModifyWriteRowRequest const& request, - btproto::ReadModifyWriteRowResponse* response) { - return Stub()->ReadModifyWriteRow(context, request, response); -} - -std::unique_ptr> -InProcessDataClient::AsyncReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) { - auto result = Stub()->AsyncReadModifyWriteRow(context, request, cq); - return std::unique_ptr>(result.release()); -} - -std::unique_ptr> -InProcessDataClient::ReadRows(grpc::ClientContext* context, - btproto::ReadRowsRequest const& request) { - return Stub()->ReadRows(context, request); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface> -InProcessDataClient::AsyncReadRows(::grpc::ClientContext* context, - btproto::ReadRowsRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) { - return Stub()->AsyncReadRows(context, request, cq, tag); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::ReadRowsResponse>> -InProcessDataClient::PrepareAsyncReadRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::ReadRowsRequest const& request, - ::grpc::CompletionQueue* cq) { - return Stub()->PrepareAsyncReadRows(context, request, cq); -} - -std::unique_ptr> -InProcessDataClient::SampleRowKeys( - grpc::ClientContext* context, - btproto::SampleRowKeysRequest const& request) { - return Stub()->SampleRowKeys(context, request); -} - -std::unique_ptr> -InProcessDataClient::MutateRows(grpc::ClientContext* context, - btproto::MutateRowsRequest const& request) { - return Stub()->MutateRows(context, request); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> -InProcessDataClient::AsyncMutateRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) { - return Stub()->AsyncMutateRows(context, request, cq, tag); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> -InProcessDataClient::PrepareAsyncMutateRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq) { - return Stub()->PrepareAsyncMutateRows(context, request, cq); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> -InProcessDataClient::AsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) { - return Stub()->AsyncSampleRowKeys(context, request, cq, tag); -} - -std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> -InProcessDataClient::PrepareAsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq) { - return Stub()->PrepareAsyncSampleRowKeys(context, request, cq); -} - -} // namespace testing -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/testing/inprocess_data_client.h b/google/cloud/bigtable/testing/inprocess_data_client.h deleted file mode 100644 index fd122d2f96489..0000000000000 --- a/google/cloud/bigtable/testing/inprocess_data_client.h +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_INPROCESS_DATA_CLIENT_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_INPROCESS_DATA_CLIENT_H - -#include "google/cloud/bigtable/data_client.h" -#include -#include -// TODO(#8800) - delete this class when deprecation is complete -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace bigtable { -namespace testing { - -/** - * Connect to an embedded Cloud Bigtable server implementing the data - * manipulation APIs. - * - * This class is mainly for testing purpose, it enable use of a single embedded - * server for multiple test cases. This dataclient uses a pre-defined channel. - */ -class InProcessDataClient : public bigtable::DataClient { - public: - InProcessDataClient(std::string project, std::string instance, - std::shared_ptr channel) - : project_(std::move(project)), - instance_(std::move(instance)), - channel_(std::move(channel)) {} - - using BigtableStubPtr = - std::shared_ptr; - - std::string const& project_id() const override { return project_; } - std::string const& instance_id() const override { return instance_; } - std::shared_ptr Channel() override { return channel_; } - void reset() override {} - - std::unique_ptr Stub() { - return google::bigtable::v2::Bigtable::NewStub(Channel()); - } - - ///@{ - /// @name the google.bigtable.v2.Bigtable operations. - grpc::Status MutateRow( - grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - google::bigtable::v2::MutateRowResponse* response) override; - std::unique_ptr> - AsyncMutateRow(grpc::ClientContext* context, - google::bigtable::v2::MutateRowRequest const& request, - grpc::CompletionQueue* cq) override; - grpc::Status CheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - google::bigtable::v2::CheckAndMutateRowResponse* response) override; - std::unique_ptr> - AsyncCheckAndMutateRow( - grpc::ClientContext* context, - google::bigtable::v2::CheckAndMutateRowRequest const& request, - grpc::CompletionQueue* cq) override; - grpc::Status ReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - google::bigtable::v2::ReadModifyWriteRowResponse* response) override; - std::unique_ptr> - AsyncReadModifyWriteRow( - grpc::ClientContext* context, - google::bigtable::v2::ReadModifyWriteRowRequest const& request, - grpc::CompletionQueue* cq) override; - std::unique_ptr< - grpc::ClientReaderInterface> - ReadRows(grpc::ClientContext* context, - google::bigtable::v2::ReadRowsRequest const& request) override; - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::ReadRowsResponse>> - AsyncReadRows(::grpc::ClientContext* context, - ::google::bigtable::v2::ReadRowsRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) override; - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::ReadRowsResponse>> - PrepareAsyncReadRows(::grpc::ClientContext* context, - ::google::bigtable::v2::ReadRowsRequest const& request, - ::grpc::CompletionQueue* cq) override; - std::unique_ptr< - grpc::ClientReaderInterface> - SampleRowKeys( - grpc::ClientContext* context, - google::bigtable::v2::SampleRowKeysRequest const& request) override; - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> - AsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) override; - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::SampleRowKeysResponse>> - PrepareAsyncSampleRowKeys( - ::grpc::ClientContext* context, - ::google::bigtable::v2::SampleRowKeysRequest const& request, - ::grpc::CompletionQueue* cq) override; - std::unique_ptr< - grpc::ClientReaderInterface> - MutateRows(grpc::ClientContext* context, - google::bigtable::v2::MutateRowsRequest const& request) override; - - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> - AsyncMutateRows(::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq, void* tag) override; - - std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::MutateRowsResponse>> - PrepareAsyncMutateRows( - ::grpc::ClientContext* context, - ::google::bigtable::v2::MutateRowsRequest const& request, - ::grpc::CompletionQueue* cq) override; - ///@} - - private: - google::cloud::BackgroundThreadsFactory BackgroundThreadsFactory() override { - return google::cloud::internal::MakeBackgroundThreadsFactory(); - } - - std::string project_; - std::string instance_; - std::shared_ptr channel_; -}; - -} // namespace testing -} // namespace bigtable -} // namespace cloud -} // namespace google - -// TODO(#8800) - delete this class when deprecation is complete -#include "google/cloud/internal/diagnostics_pop.inc" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_INPROCESS_DATA_CLIENT_H diff --git a/google/cloud/bigtable/testing/mock_data_client.h b/google/cloud/bigtable/testing/mock_data_client.h deleted file mode 100644 index 0a53659246428..0000000000000 --- a/google/cloud/bigtable/testing/mock_data_client.h +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_MOCK_DATA_CLIENT_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_MOCK_DATA_CLIENT_H - -#include "google/cloud/bigtable/table.h" -#include -#include -// TODO(#8800) - delete this class when deprecation is complete -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace bigtable { -namespace testing { - -class MockDataClient : public bigtable::DataClient { - public: - MockDataClient() = default; - - explicit MockDataClient(Options options) : options_(std::move(options)) {} - - /// @deprecated use constructor that takes `google::cloud::Options` - explicit MockDataClient(ClientOptions options) - : options_(internal::MakeOptions(std::move(options))) {} - - MOCK_METHOD(std::string const&, project_id, (), (const, override)); - MOCK_METHOD(std::string const&, instance_id, (), (const, override)); - MOCK_METHOD(std::shared_ptr, Channel, (), (override)); - MOCK_METHOD(void, reset, (), (override)); - - MOCK_METHOD(grpc::Status, MutateRow, - (grpc::ClientContext*, - google::bigtable::v2::MutateRowRequest const&, - google::bigtable::v2::MutateRowResponse*), - (override)); - MOCK_METHOD(std::unique_ptr>, - AsyncMutateRow, - (grpc::ClientContext*, - google::bigtable::v2::MutateRowRequest const&, - grpc::CompletionQueue*), - (override)); - MOCK_METHOD(grpc::Status, CheckAndMutateRow, - (grpc::ClientContext*, - google::bigtable::v2::CheckAndMutateRowRequest const&, - google::bigtable::v2::CheckAndMutateRowResponse*), - (override)); - MOCK_METHOD(std::unique_ptr>, - AsyncCheckAndMutateRow, - (grpc::ClientContext*, - google::bigtable::v2::CheckAndMutateRowRequest const&, - grpc::CompletionQueue*), - (override)); - MOCK_METHOD(grpc::Status, ReadModifyWriteRow, - (grpc::ClientContext*, - google::bigtable::v2::ReadModifyWriteRowRequest const&, - google::bigtable::v2::ReadModifyWriteRowResponse*), - (override)); - MOCK_METHOD(std::unique_ptr>, - AsyncReadModifyWriteRow, - (grpc::ClientContext*, - google::bigtable::v2::ReadModifyWriteRowRequest const&, - grpc::CompletionQueue*), - (override)); - MOCK_METHOD( - std::unique_ptr< - grpc::ClientReaderInterface>, - ReadRows, - (grpc::ClientContext*, google::bigtable::v2::ReadRowsRequest const&), - (override)); - MOCK_METHOD(std::unique_ptr>, - AsyncReadRows, - (grpc::ClientContext*, - google::bigtable::v2::ReadRowsRequest const&, - grpc::CompletionQueue*, void*), - (override)); - MOCK_METHOD(std::unique_ptr<::grpc::ClientAsyncReaderInterface< - ::google::bigtable::v2::ReadRowsResponse>>, - PrepareAsyncReadRows, - (::grpc::ClientContext*, - ::google::bigtable::v2::ReadRowsRequest const&, - ::grpc::CompletionQueue*), - (override)); - MOCK_METHOD(std::unique_ptr>, - SampleRowKeys, - (grpc::ClientContext*, - google::bigtable::v2::SampleRowKeysRequest const&), - (override)); - MOCK_METHOD(std::unique_ptr>, - AsyncSampleRowKeys, - (grpc::ClientContext*, - google::bigtable::v2::SampleRowKeysRequest const&, - grpc::CompletionQueue*, void*), - (override)); - MOCK_METHOD(std::unique_ptr>, - PrepareAsyncSampleRowKeys, - (grpc::ClientContext*, - google::bigtable::v2::SampleRowKeysRequest const&, - grpc::CompletionQueue*), - (override)); - MOCK_METHOD(std::unique_ptr>, - MutateRows, - (grpc::ClientContext*, - google::bigtable::v2::MutateRowsRequest const&), - (override)); - MOCK_METHOD(std::unique_ptr>, - AsyncMutateRows, - (grpc::ClientContext*, - google::bigtable::v2::MutateRowsRequest const&, - grpc::CompletionQueue*, void*), - (override)); - MOCK_METHOD(std::unique_ptr>, - PrepareAsyncMutateRows, - (grpc::ClientContext*, - google::bigtable::v2::MutateRowsRequest const&, - grpc::CompletionQueue*), - (override)); - - private: - google::cloud::BackgroundThreadsFactory BackgroundThreadsFactory() override { - return google::cloud::internal::MakeBackgroundThreadsFactory(options_); - } - - Options options_; -}; - -} // namespace testing -} // namespace bigtable -} // namespace cloud -} // namespace google - -// TODO(#8800) - delete this class when deprecation is complete -#include "google/cloud/internal/diagnostics_pop.inc" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_MOCK_DATA_CLIENT_H diff --git a/google/cloud/bigtable/testing/mock_mutate_rows_limiter.h b/google/cloud/bigtable/testing/mock_mutate_rows_limiter.h index c074cf3699cc5..b24c91c381b6d 100644 --- a/google/cloud/bigtable/testing/mock_mutate_rows_limiter.h +++ b/google/cloud/bigtable/testing/mock_mutate_rows_limiter.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_MOCK_MUTATE_ROWS_LIMITER_H #include "google/cloud/bigtable/internal/mutate_rows_limiter.h" -#include +#include "google/bigtable/v2/bigtable.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/testing/mock_mutate_rows_reader.h b/google/cloud/bigtable/testing/mock_mutate_rows_reader.h index f91b3cbe807c0..d48201616b17e 100644 --- a/google/cloud/bigtable/testing/mock_mutate_rows_reader.h +++ b/google/cloud/bigtable/testing/mock_mutate_rows_reader.h @@ -17,7 +17,7 @@ #include "google/cloud/bigtable/testing/mock_response_reader.h" #include "google/cloud/testing_util/mock_async_response_reader.h" -#include +#include "google/bigtable/v2/bigtable.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/testing/mock_read_rows_reader.h b/google/cloud/bigtable/testing/mock_read_rows_reader.h index 3915ceb5abe0d..b97d258cc79ac 100644 --- a/google/cloud/bigtable/testing/mock_read_rows_reader.h +++ b/google/cloud/bigtable/testing/mock_read_rows_reader.h @@ -17,7 +17,7 @@ #include "google/cloud/bigtable/testing/mock_response_reader.h" #include "google/cloud/testing_util/mock_async_response_reader.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/testing/mock_sample_row_keys_reader.h b/google/cloud/bigtable/testing/mock_sample_row_keys_reader.h index 334579441d58e..0488a48ced270 100644 --- a/google/cloud/bigtable/testing/mock_sample_row_keys_reader.h +++ b/google/cloud/bigtable/testing/mock_sample_row_keys_reader.h @@ -16,7 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_MOCK_SAMPLE_ROW_KEYS_READER_H #include "google/cloud/bigtable/testing/mock_response_reader.h" -#include +#include "google/bigtable/v2/bigtable.grpc.pb.h" #include namespace google { diff --git a/google/cloud/bigtable/testing/table_integration_test.cc b/google/cloud/bigtable/testing/table_integration_test.cc index d9f8156437f7b..6a09bacf62018 100644 --- a/google/cloud/bigtable/testing/table_integration_test.cc +++ b/google/cloud/bigtable/testing/table_integration_test.cc @@ -123,8 +123,6 @@ void TableAdminTestEnvironment::TearDown() { void TableIntegrationTest::SetUp() { data_connection_ = MakeDataConnection(); - data_client_ = bigtable::MakeDataClient(TableTestEnvironment::project_id(), - TableTestEnvironment::instance_id()); // In production, we cannot use `DropAllRows()` to cleanup the table because // the integration tests sometimes consume all the 'DropRowRangeGroup' quota. @@ -164,15 +162,11 @@ void TableIntegrationTest::SetUp() { } } -bigtable::Table TableIntegrationTest::GetTable( - std::string const& implementation) { - if (implementation == "with-data-connection") { - return Table(data_connection_, - TableResource(TableTestEnvironment::project_id(), - TableTestEnvironment::instance_id(), - TableTestEnvironment::table_id())); - } - return bigtable::Table(data_client_, TableTestEnvironment::table_id()); +bigtable::Table TableIntegrationTest::GetTable() { + return Table(data_connection_, + TableResource(TableTestEnvironment::project_id(), + TableTestEnvironment::instance_id(), + TableTestEnvironment::table_id())); } std::vector TableIntegrationTest::ReadRows( @@ -188,12 +182,6 @@ std::vector TableIntegrationTest::ReadRows( return result; } -std::vector TableIntegrationTest::ReadRows( - std::string const& table_name, bigtable::Filter filter) { - bigtable::Table table(data_client_, table_name); - return ReadRows(table, std::move(filter)); -} - std::vector TableIntegrationTest::ReadRows( bigtable::Table& table, std::int64_t rows_limit, bigtable::Filter filter) { auto reader = diff --git a/google/cloud/bigtable/testing/table_integration_test.h b/google/cloud/bigtable/testing/table_integration_test.h index 8c360b5374db1..c6bbb3574f442 100644 --- a/google/cloud/bigtable/testing/table_integration_test.h +++ b/google/cloud/bigtable/testing/table_integration_test.h @@ -17,7 +17,6 @@ #include "google/cloud/bigtable/admin/bigtable_table_admin_client.h" #include "google/cloud/bigtable/cell.h" -#include "google/cloud/bigtable/data_client.h" #include "google/cloud/bigtable/table.h" #include "google/cloud/internal/random.h" #include "google/cloud/testing_util/integration_test.h" @@ -94,19 +93,12 @@ class TableIntegrationTest : public ::google::cloud::testing_util::IntegrationTest { protected: void SetUp() override; - - /// Gets a Table object for the current test. - bigtable::Table GetTable( - std::string const& implementation = "with-data-client"); + bigtable::Table GetTable(); /// Return all the cells in @p table that pass @p filter. static std::vector ReadRows(bigtable::Table& table, bigtable::Filter filter); - /// Return all the cells in @p table that pass @p filter. - std::vector ReadRows(std::string const& table_name, - bigtable::Filter filter); - static std::vector ReadRows(bigtable::Table& table, std::int64_t rows_limit, bigtable::Filter filter); @@ -179,7 +171,6 @@ class TableIntegrationTest return names; } - std::shared_ptr data_client_; std::shared_ptr data_connection_; }; diff --git a/google/cloud/bigtable/testing/table_test_fixture.cc b/google/cloud/bigtable/testing/table_test_fixture.cc deleted file mode 100644 index 9491d9409b998..0000000000000 --- a/google/cloud/bigtable/testing/table_test_fixture.cc +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/bigtable/testing/table_test_fixture.h" -#include "google/cloud/internal/background_threads_impl.h" -#include "google/cloud/internal/throw_delegate.h" -#include - -namespace google { -namespace cloud { -namespace bigtable { -namespace testing { - -char const TableTestFixture::kProjectId[] = "foo-project"; -char const TableTestFixture::kInstanceId[] = "bar-instance"; -char const TableTestFixture::kTableId[] = "baz-table"; - -// These are hardcoded, and not computed, because we want to test the -// computation. -char const TableTestFixture::kInstanceName[] = - "projects/foo-project/instances/bar-instance"; -char const TableTestFixture::kTableName[] = - "projects/foo-project/instances/bar-instance/tables/baz-table"; - -google::bigtable::v2::ReadRowsResponse ReadRowsResponseFromString( - std::string const& repr) { - google::bigtable::v2::ReadRowsResponse response; - if (!google::protobuf::TextFormat::ParseFromString(repr, &response)) { - google::cloud::internal::ThrowRuntimeError("Failed to parse " + repr); - } - return response; -} - -std::shared_ptr TableTestFixture::SetupMockClient() { - auto client = std::make_shared( - Options{}.set(cq_)); - EXPECT_CALL(*client, project_id()) - .WillRepeatedly(::testing::ReturnRef(project_id_)); - EXPECT_CALL(*client, instance_id()) - .WillRepeatedly(::testing::ReturnRef(instance_id_)); - return client; -} - -TableTestFixture::TableTestFixture(CompletionQueue const& cq) - : cq_impl_(std::dynamic_pointer_cast< - ::google::cloud::testing_util::FakeCompletionQueueImpl>( - google::cloud::internal::GetCompletionQueueImpl(cq))), - cq_(cq), - client_(SetupMockClient()) {} - -} // namespace testing -} // namespace bigtable -} // namespace cloud -} // namespace google diff --git a/google/cloud/bigtable/testing/table_test_fixture.h b/google/cloud/bigtable/testing/table_test_fixture.h deleted file mode 100644 index 72fd4c5924898..0000000000000 --- a/google/cloud/bigtable/testing/table_test_fixture.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_TABLE_TEST_FIXTURE_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_TABLE_TEST_FIXTURE_H - -#include "google/cloud/bigtable/table.h" -#include "google/cloud/bigtable/testing/mock_data_client.h" -#include "google/cloud/testing_util/fake_completion_queue_impl.h" -#include - -namespace google { -namespace cloud { -namespace bigtable { -namespace testing { - -/// Common fixture for the bigtable::Table tests. -class TableTestFixture : public ::testing::Test { - protected: - explicit TableTestFixture(CompletionQueue const& cq); - std::shared_ptr SetupMockClient(); - - static char const kProjectId[]; - static char const kInstanceId[]; - static char const kTableId[]; - static char const kInstanceName[]; - static char const kTableName[]; - - std::string project_id_ = kProjectId; - std::string instance_id_ = kInstanceId; - std::shared_ptr<::google::cloud::testing_util::FakeCompletionQueueImpl> - cq_impl_; - CompletionQueue cq_; - std::shared_ptr client_; - bigtable::Table table_ = bigtable::Table(client_, kTableId); -}; - -google::bigtable::v2::ReadRowsResponse ReadRowsResponseFromString( - std::string const& repr); - -} // namespace testing -} // namespace bigtable -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_TESTING_TABLE_TEST_FIXTURE_H diff --git a/google/cloud/bigtable/tests/BUILD.bazel b/google/cloud/bigtable/tests/BUILD.bazel index 72d44baed557d..c4974a2b00849 100644 --- a/google/cloud/bigtable/tests/BUILD.bazel +++ b/google/cloud/bigtable/tests/BUILD.bazel @@ -34,7 +34,7 @@ licenses(["notice"]) # Apache 2.0 "//:grpc_utils", "//google/cloud/bigtable:bigtable_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in bigtable_client_integration_tests] diff --git a/google/cloud/bigtable/tests/admin_integration_test.cc b/google/cloud/bigtable/tests/admin_integration_test.cc index fd056d5382c2f..456343334b381 100644 --- a/google/cloud/bigtable/tests/admin_integration_test.cc +++ b/google/cloud/bigtable/tests/admin_integration_test.cc @@ -155,7 +155,8 @@ TEST_F(AdminIntegrationTest, CreateListGetDeleteTable) { // Create table ASSERT_STATUS_OK(table_admin_->CreateTable(table_id, table_config)); - bigtable::Table table(data_client_, table_id); + bigtable::Table table(MakeDataConnection(), + TableResource(project_id(), instance_id(), table_id)); // List tables auto tables = table_admin_->ListTables(btadmin::Table::NAME_ONLY); @@ -258,7 +259,6 @@ TEST_F(AdminIntegrationTest, WaitForConsistencyCheck) { // to propagate to both clusters. First create a `bigtable::Table` object. auto table = Table(MakeDataConnection(), TableResource(project_id(), id, random_table_id)); - // Insert some cells into the table. std::string const row_key1 = "check-consistency-row1"; std::string const row_key2 = "check-consistency-row2"; @@ -318,7 +318,8 @@ TEST_F(AdminIntegrationTest, CreateListGetDeleteTableWithLogging) { // Create table ASSERT_STATUS_OK(table_admin->CreateTable(table_id, table_config)); - bigtable::Table table(data_client_, table_id); + bigtable::Table table(MakeDataConnection(), + TableResource(project_id(), instance_id(), table_id)); // List tables auto tables = table_admin->ListTables(btadmin::Table::NAME_ONLY); diff --git a/google/cloud/bigtable/tests/data_async_future_integration_test.cc b/google/cloud/bigtable/tests/data_async_future_integration_test.cc index c884c571e405b..56defb4862194 100644 --- a/google/cloud/bigtable/tests/data_async_future_integration_test.cc +++ b/google/cloud/bigtable/tests/data_async_future_integration_test.cc @@ -25,18 +25,12 @@ namespace { using ::google::cloud::bigtable::testing::TableIntegrationTest; using ::google::cloud::testing_util::chrono_literals::operator""_ms; -class DataAsyncIntegrationTest - : public TableIntegrationTest, - public ::testing::WithParamInterface {}; - -INSTANTIATE_TEST_SUITE_P(, DataAsyncIntegrationTest, - ::testing::Values("with-data-connection", - "with-data-client")); +class DataAsyncIntegrationTest : public TableIntegrationTest {}; std::string const kFamily = "family1"; -TEST_P(DataAsyncIntegrationTest, TableAsyncApply) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncApply) { + auto table = GetTable(); std::string const row_key = "key-000010"; std::vector created{{row_key, kFamily, "cc1", 1000, "v1000"}, @@ -67,8 +61,8 @@ TEST_P(DataAsyncIntegrationTest, TableAsyncApply) { CheckEqualUnordered(expected, actual); } -TEST_P(DataAsyncIntegrationTest, TableAsyncBulkApply) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncBulkApply) { + auto table = GetTable(); std::string const row_key1 = "key-000010"; std::string const row_key2 = "key-000020"; @@ -115,8 +109,8 @@ TEST_P(DataAsyncIntegrationTest, TableAsyncBulkApply) { CheckEqualUnordered(expected, actual); } -TEST_P(DataAsyncIntegrationTest, TableAsyncCheckAndMutateRowPass) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncCheckAndMutateRowPass) { + auto table = GetTable(); std::string const key = "row-key"; @@ -142,8 +136,8 @@ TEST_P(DataAsyncIntegrationTest, TableAsyncCheckAndMutateRowPass) { CheckEqualUnordered(expected, actual); } -TEST_P(DataAsyncIntegrationTest, TableAsyncCheckAndMutateRowFail) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncCheckAndMutateRowFail) { + auto table = GetTable(); std::string const key = "row-key"; @@ -169,8 +163,8 @@ TEST_P(DataAsyncIntegrationTest, TableAsyncCheckAndMutateRowFail) { CheckEqualUnordered(expected, actual); } -TEST_P(DataAsyncIntegrationTest, TableAsyncReadModifyWriteAppendValueTest) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncReadModifyWriteAppendValueTest) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; std::string const add_suffix1 = "-suffix"; @@ -225,8 +219,8 @@ TEST_P(DataAsyncIntegrationTest, TableAsyncReadModifyWriteAppendValueTest) { actual_cells_ignore_timestamp); } -TEST_P(DataAsyncIntegrationTest, TableAsyncReadRowsAllRows) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncReadRowsAllRows) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; @@ -264,8 +258,8 @@ TEST_P(DataAsyncIntegrationTest, TableAsyncReadRowsAllRows) { CheckEqualUnordered(created, actual); } -TEST_P(DataAsyncIntegrationTest, TableAsyncReadRowTest) { - auto table = GetTable(GetParam()); +TEST_F(DataAsyncIntegrationTest, TableAsyncReadRowTest) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; diff --git a/google/cloud/bigtable/tests/data_integration_test.cc b/google/cloud/bigtable/tests/data_integration_test.cc index 9a835f61176e3..2146f75342b85 100644 --- a/google/cloud/bigtable/tests/data_integration_test.cc +++ b/google/cloud/bigtable/tests/data_integration_test.cc @@ -17,12 +17,14 @@ #include "google/cloud/bigtable/options.h" #include "google/cloud/bigtable/retry_policy.h" #include "google/cloud/bigtable/testing/table_integration_test.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/log.h" #include "google/cloud/testing_util/chrono_literals.h" #include "google/cloud/testing_util/scoped_environment.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" #include "absl/strings/str_format.h" +#include "absl/strings/str_split.h" #include namespace google { @@ -43,13 +45,7 @@ using ::testing::HasSubstr; using ::testing::UnorderedElementsAre; using ms = std::chrono::milliseconds; -class DataIntegrationTest : public TableIntegrationTest, - public ::testing::WithParamInterface { -}; - -INSTANTIATE_TEST_SUITE_P(, DataIntegrationTest, - ::testing::Values("with-data-connection", - "with-data-client")); +class DataIntegrationTest : public TableIntegrationTest {}; /// Use Table::Apply() to insert a single row. void Apply(Table& table, std::string const& row_key, @@ -90,8 +86,8 @@ std::string const kFamily2 = "family2"; std::string const kFamily3 = "family3"; std::string const kFamily4 = "family4"; -TEST_P(DataIntegrationTest, TableApply) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableApply) { + auto table = GetTable(); std::string const row_key = "row-key-1"; std::vector created{{row_key, kFamily4, "c0", 1000, "v1000"}, @@ -104,8 +100,8 @@ TEST_P(DataIntegrationTest, TableApply) { CheckEqualUnordered(expected, actual); } -TEST_P(DataIntegrationTest, TableBulkApply) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableBulkApply) { + auto table = GetTable(); std::vector created{{"row-key-1", kFamily4, "c0", 1000, "v1000"}, {"row-key-1", kFamily4, "c1", 2000, "v2000"}, @@ -129,9 +125,7 @@ TEST_P(DataIntegrationTest, TableBulkApply) { CheckEqualUnordered(expected, actual); } -TEST_P(DataIntegrationTest, TableBulkApplyThrottling) { - if (GetParam() == "with-data-client") GTEST_SKIP(); - +TEST_F(DataIntegrationTest, TableBulkApplyThrottling) { // Make a custom table with throttling enabled. auto table = Table(MakeDataConnection( @@ -158,9 +152,9 @@ TEST_P(DataIntegrationTest, TableBulkApplyThrottling) { CheckEqualUnordered({expected}, actual); } -TEST_P(DataIntegrationTest, TableSingleRow) { +TEST_F(DataIntegrationTest, TableSingleRow) { std::string const row_key = "row-key-1"; - auto table = GetTable(GetParam()); + auto table = GetTable(); auto mutation = SingleRowMutation(row_key, SetCell(kFamily4, "c1", 1_ms, "V1000"), @@ -175,8 +169,8 @@ TEST_P(DataIntegrationTest, TableSingleRow) { CheckEqualUnordered(expected, actual); } -TEST_P(DataIntegrationTest, TableReadRowTest) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadRowTest) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; @@ -192,8 +186,8 @@ TEST_P(DataIntegrationTest, TableReadRowTest) { CheckEqualUnordered(expected, actual); } -TEST_P(DataIntegrationTest, TableReadRowNotExistTest) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadRowNotExistTest) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; @@ -205,8 +199,8 @@ TEST_P(DataIntegrationTest, TableReadRowNotExistTest) { EXPECT_FALSE(row_cell->first); } -TEST_P(DataIntegrationTest, TableReadRowsAllRows) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadRowsAllRows) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; std::string const row_key3(1024, '3'); // a long key @@ -237,8 +231,8 @@ TEST_P(DataIntegrationTest, TableReadRowsAllRows) { CheckEqualUnordered(created, MoveCellsFromReader(read4)); } -TEST_P(DataIntegrationTest, TableReadRowsPartialRows) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadRowsPartialRows) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; std::string const row_key3 = "row-key-3"; @@ -279,11 +273,10 @@ TEST_P(DataIntegrationTest, TableReadRowsPartialRows) { } } -TEST_P(DataIntegrationTest, TableReadRowsReverseScan) { - if (GetParam() == "with-data-client") GTEST_SKIP(); +TEST_F(DataIntegrationTest, TableReadRowsReverseScan) { // The emulator does not yet support reverse scans. if (UsingCloudBigtableEmulator()) GTEST_SKIP(); - auto table = GetTable(GetParam()); + auto table = GetTable(); std::vector created{{"row-key-1", kFamily4, "c1", 1000, "a"}, {"row-key-1", kFamily4, "c2", 2000, "b"}, @@ -303,8 +296,8 @@ TEST_P(DataIntegrationTest, TableReadRowsReverseScan) { ElementsAre("row-key-3", "row-key-2", "row-key-1", "row-key-1")); } -TEST_P(DataIntegrationTest, TableReadRowsNoRows) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadRowsNoRows) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; std::string const row_key3 = "row-key-3"; @@ -329,8 +322,8 @@ TEST_P(DataIntegrationTest, TableReadRowsNoRows) { CheckEqualUnordered(expected, MoveCellsFromReader(read3)); } -TEST_P(DataIntegrationTest, TableReadRowsWrongTable) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadRowsWrongTable) { + auto table = GetTable(); auto other_table = table.WithNewTarget(table.project_id(), table.instance_id(), RandomTableId()); @@ -343,8 +336,8 @@ TEST_P(DataIntegrationTest, TableReadRowsWrongTable) { EXPECT_EQ(read1.end(), it); } -TEST_P(DataIntegrationTest, TableCheckAndMutateRowPass) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableCheckAndMutateRowPass) { + auto table = GetTable(); std::string const key = "row-key"; std::vector created{{key, kFamily4, "c1", 0, "v1000"}}; @@ -361,8 +354,8 @@ TEST_P(DataIntegrationTest, TableCheckAndMutateRowPass) { CheckEqualUnordered(expected, actual); } -TEST_P(DataIntegrationTest, TableCheckAndMutateRowFail) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableCheckAndMutateRowFail) { + auto table = GetTable(); std::string const key = "row-key"; std::vector created{{key, kFamily4, "c1", 0, "v1000"}}; @@ -379,8 +372,8 @@ TEST_P(DataIntegrationTest, TableCheckAndMutateRowFail) { CheckEqualUnordered(expected, actual); } -TEST_P(DataIntegrationTest, TableReadModifyWriteAppendValueTest) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadModifyWriteAppendValueTest) { + auto table = GetTable(); std::string const row_key1 = "row-key-1"; std::string const row_key2 = "row-key-2"; std::string const add_suffix1 = "-suffix"; @@ -415,8 +408,8 @@ TEST_P(DataIntegrationTest, TableReadModifyWriteAppendValueTest) { actual_cells_ignore_timestamp); } -TEST_P(DataIntegrationTest, TableReadModifyWriteRowIncrementAmountTest) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadModifyWriteRowIncrementAmountTest) { + auto table = GetTable(); std::string const key = "row-key"; // An initial; big-endian int64 number with value 0. @@ -442,8 +435,8 @@ TEST_P(DataIntegrationTest, TableReadModifyWriteRowIncrementAmountTest) { CheckEqualUnordered(expected_ignore_timestamp, actual_ignore_timestamp); } -TEST_P(DataIntegrationTest, TableReadModifyWriteRowMultipleTest) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadModifyWriteRowMultipleTest) { + auto table = GetTable(); std::string const key = "row-key"; std::string v1("\x00\x00\x00\x00\x00\x00\x00\x00", 8); @@ -486,8 +479,8 @@ TEST_P(DataIntegrationTest, TableReadModifyWriteRowMultipleTest) { CheckEqualUnordered(expected_ignore_timestamp, actual_ignore_timestamp); } -TEST_P(DataIntegrationTest, TableCellValueInt64Test) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableCellValueInt64Test) { + auto table = GetTable(); std::string const key = "row-key"; std::vector created{{key, kFamily1, "c1", 0, 42}, @@ -521,8 +514,8 @@ TEST_P(DataIntegrationTest, TableCellValueInt64Test) { CheckEqualUnordered(expected_ignore_timestamp, actual_ignore_timestamp); } -TEST_P(DataIntegrationTest, TableReadMultipleCellsBigValue) { - auto table = GetTable(GetParam()); +TEST_F(DataIntegrationTest, TableReadMultipleCellsBigValue) { + auto table = GetTable(); std::string const row_key = "row-key-1"; // cell vector contains 4 cells of 32 MiB each, or 128 MiB (without @@ -573,7 +566,7 @@ TEST_P(DataIntegrationTest, TableReadMultipleCellsBigValue) { CheckEqualUnordered(expected_ignore_timestamp, actual_ignore_timestamp); } -TEST_P(DataIntegrationTest, TableApplyWithLogging) { +TEST_F(DataIntegrationTest, TableApplyWithLogging) { // In our ci builds, we set GOOGLE_CLOUD_CPP_ENABLE_TRACING to log our tests, // by default. We should unset this variable and create a fresh client in // order to have a conclusive test. @@ -585,13 +578,9 @@ TEST_P(DataIntegrationTest, TableApplyWithLogging) { // Make a `Table` with an implementation that depends on the test's value // parameter. auto make_table = [&](Options const& options) { - if (GetParam() == "with-data-connection") { - auto conn = MakeDataConnection(options); - return Table(std::move(conn), - TableResource(project_id(), instance_id(), table_id)); - } - auto data_client = MakeDataClient(project_id(), instance_id(), options); - return Table(std::move(data_client), table_id); + auto conn = MakeDataConnection(options); + return Table(std::move(conn), + TableResource(project_id(), instance_id(), table_id)); }; std::string const row_key = "row-key-1"; @@ -610,7 +599,7 @@ TEST_P(DataIntegrationTest, TableApplyWithLogging) { EXPECT_THAT(log.ExtractLines(), Not(Contains(HasSubstr("MutateRow")))); } -TEST_P(DataIntegrationTest, ClientQueryColumnFamily) { +TEST_F(DataIntegrationTest, ClientQueryColumnFamily) { if (UsingCloudBigtableEmulator()) GTEST_SKIP(); auto const table_id = testing::TableTestEnvironment::table_id(); auto retry_policy_option = DataLimitedErrorCountRetryPolicy(0).clone(); @@ -676,7 +665,7 @@ TEST_P(DataIntegrationTest, ClientQueryColumnFamily) { {Bytes(column2), Bytes(value2)}})); } -TEST_P(DataIntegrationTest, ClientQueryColumnFamilyWithHistory) { +TEST_F(DataIntegrationTest, ClientQueryColumnFamilyWithHistory) { if (UsingCloudBigtableEmulator()) GTEST_SKIP(); auto const table_id = testing::TableTestEnvironment::table_id(); auto retry_policy_option = DataLimitedErrorCountRetryPolicy(0).clone(); @@ -820,76 +809,7 @@ TEST_P(DataIntegrationTest, ClientQueryColumnFamilyWithHistory) { column_2_value_old); } -// TODO(#8800) - remove after deprecation is complete -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -TEST(ConnectionRefresh, Disabled) { - auto data_client = bigtable::MakeDataClient( - testing::TableTestEnvironment::project_id(), - testing::TableTestEnvironment::instance_id(), - Options{}.set(std::chrono::seconds(0))); - // In general, it is hard to show that something has *not* happened, at best - // we can show that its side-effects have not happened. In this case we want - // to show that the channels have not been refreshed. A side-effect of - // refreshing a channel is that it enters the `READY` state, so we check that - // this has not taken place and take that as evidence that no refresh has - // taken place. - // - // After the `CompletionQueue` argument is removed from the `Bigtable` API, we - // will have an option to provide a mock `CompletionQueue` to the `DataClient` - // for test purposes and verify that no timers are created, which will be a - // superior way to write this test. - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - - for (int i = 0; i < internal::DefaultConnectionPoolSize(); ++i) { - auto channel = data_client->Channel(); - EXPECT_EQ(GRPC_CHANNEL_IDLE, channel->GetState(false)); - } - // Make sure things still work. - bigtable::Table table(data_client, testing::TableTestEnvironment::table_id()); - std::string const row_key = "row-key-1"; - std::vector created{{row_key, kFamily4, "c0", 1000, "v1000"}, - {row_key, kFamily4, "c1", 2000, "v2000"}}; - Apply(table, row_key, created); - // After performing some operations, some of the channels should be in ready - // state. - auto check_if_some_channel_is_ready = [&] { - for (int i = 0; i < internal::DefaultConnectionPoolSize(); ++i) { - if (data_client->Channel()->GetState(false) == GRPC_CHANNEL_READY) { - return true; - } - } - return false; - }; - EXPECT_TRUE(check_if_some_channel_is_ready()); -} - -TEST(ConnectionRefresh, Frequent) { - auto data_client = bigtable::MakeDataClient( - testing::TableTestEnvironment::project_id(), - testing::TableTestEnvironment::instance_id(), - Options{} - .set(std::chrono::milliseconds(100)) - .set(std::chrono::milliseconds(100))); - - for (;;) { - if (data_client->Channel()->GetState(false) == GRPC_CHANNEL_READY) { - // We've found a channel which changed its state from IDLE to READY, - // which means that our refreshing mechanism works. - break; - } - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - - // Make sure things still work. - bigtable::Table table(data_client, testing::TableTestEnvironment::table_id()); - std::string const row_key = "row-key-1"; - std::vector created{{row_key, kFamily4, "c0", 1000, "v1000"}, - {row_key, kFamily4, "c1", 2000, "v2000"}}; - Apply(table, row_key, created); -} - -TEST_P(DataIntegrationTest, SingleColumnQuery) { +TEST_F(DataIntegrationTest, SingleColumnQuery) { if (UsingCloudBigtableEmulator()) GTEST_SKIP(); auto const table_id = testing::TableTestEnvironment::table_id(); auto retry_policy_option = DataLimitedErrorCountRetryPolicy(0).clone(); @@ -952,7 +872,7 @@ TEST_P(DataIntegrationTest, SingleColumnQuery) { EXPECT_EQ(*value, value1); } -TEST_P(DataIntegrationTest, SingleColumnQueryWithHistory) { +TEST_F(DataIntegrationTest, SingleColumnQueryWithHistory) { if (UsingCloudBigtableEmulator()) GTEST_SKIP(); auto const table_id = testing::TableTestEnvironment::table_id(); auto retry_policy_option = DataLimitedErrorCountRetryPolicy(0).clone(); @@ -1056,7 +976,7 @@ TEST_P(DataIntegrationTest, SingleColumnQueryWithHistory) { EXPECT_EQ(std::get<1>(entry1), value_old); } -TEST_P(DataIntegrationTest, MultiColumnQuery) { +TEST_F(DataIntegrationTest, MultiColumnQuery) { if (UsingCloudBigtableEmulator()) GTEST_SKIP(); auto const table_id = testing::TableTestEnvironment::table_id(); auto retry_policy_option = DataLimitedErrorCountRetryPolicy(0).clone(); @@ -1123,7 +1043,7 @@ TEST_P(DataIntegrationTest, MultiColumnQuery) { RowType("multi-column-query-row-2", "v21", "v22"))); } -TEST_P(DataIntegrationTest, QueryWithNulls) { +TEST_F(DataIntegrationTest, QueryWithNulls) { if (UsingCloudBigtableEmulator()) GTEST_SKIP(); auto const table_id = testing::TableTestEnvironment::table_id(); auto retry_policy_option = DataLimitedErrorCountRetryPolicy(0).clone(); @@ -1193,9 +1113,6 @@ TEST_P(DataIntegrationTest, QueryWithNulls) { std::make_tuple(row_key3, absl::optional(value3)))); } -// TODO(#8800) - remove after deprecation is complete -#include "google/cloud/internal/diagnostics_pop.inc" - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable diff --git a/google/cloud/bigtable/tests/filters_integration_test.cc b/google/cloud/bigtable/tests/filters_integration_test.cc index aeea0834efb22..6f485da04b451 100644 --- a/google/cloud/bigtable/tests/filters_integration_test.cc +++ b/google/cloud/bigtable/tests/filters_integration_test.cc @@ -95,7 +95,7 @@ void CreateComplexRows(Table& table, std::string const& prefix) { }; TEST_F(FilterIntegrationTest, PassAll) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "pass-all-row-key"; std::vector expected{ {row_key, "family1", "c", 0, "v-c-0-0"}, @@ -112,7 +112,7 @@ TEST_F(FilterIntegrationTest, PassAll) { } TEST_F(FilterIntegrationTest, BlockAll) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "block-all-row-key"; std::vector created{ {row_key, "family1", "c", 0, "v-c-0-0"}, @@ -130,7 +130,7 @@ TEST_F(FilterIntegrationTest, BlockAll) { } TEST_F(FilterIntegrationTest, Latest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "latest-row-key"; std::vector created{ {row_key, "family1", "c", 0, "v-c-0-0"}, @@ -155,7 +155,7 @@ TEST_F(FilterIntegrationTest, Latest) { } TEST_F(FilterIntegrationTest, FamilyRegex) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "family-regex-row-key"; std::vector created{ {row_key, "family1", "c2", 0, "bar"}, @@ -178,7 +178,7 @@ TEST_F(FilterIntegrationTest, FamilyRegex) { } TEST_F(FilterIntegrationTest, ColumnRegex) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "column-regex-row-key"; std::vector created{ {row_key, "family1", "abc", 0, "bar"}, @@ -201,7 +201,7 @@ TEST_F(FilterIntegrationTest, ColumnRegex) { } TEST_F(FilterIntegrationTest, ColumnRange) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "column-range-row-key"; std::vector created{ {row_key, "family1", "a00", 0, "bar"}, @@ -223,7 +223,7 @@ TEST_F(FilterIntegrationTest, ColumnRange) { } TEST_F(FilterIntegrationTest, TimestampRange) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "timestamp-range-row-key"; std::vector created{ {row_key, "family1", "c0", 1000, "v1000"}, @@ -247,7 +247,7 @@ TEST_F(FilterIntegrationTest, TimestampRange) { } TEST_F(FilterIntegrationTest, RowKeysRegex) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const row_key = "row-key-regex-row-key"; std::vector created{ {row_key + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -267,7 +267,7 @@ TEST_F(FilterIntegrationTest, RowKeysRegex) { } TEST_F(FilterIntegrationTest, ValueRegex) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "value-regex-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -288,7 +288,7 @@ TEST_F(FilterIntegrationTest, ValueRegex) { } TEST_F(FilterIntegrationTest, ValueRange) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "value-range-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -311,7 +311,7 @@ TEST_F(FilterIntegrationTest, ValueRange) { } TEST_F(FilterIntegrationTest, CellsRowLimit) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "cell-row-limit-prefix"; ASSERT_NO_FATAL_FAILURE(CreateComplexRows(table, prefix)); @@ -332,7 +332,7 @@ TEST_F(FilterIntegrationTest, CellsRowLimit) { } TEST_F(FilterIntegrationTest, CellsRowOffset) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "cell-row-offset-prefix"; ASSERT_NO_FATAL_FAILURE(CreateComplexRows(table, prefix)); @@ -353,7 +353,7 @@ TEST_F(FilterIntegrationTest, CellsRowOffset) { } TEST_F(FilterIntegrationTest, RowSample) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "row-sample-prefix"; int constexpr kRowCount = 20000; @@ -408,7 +408,7 @@ TEST_F(FilterIntegrationTest, RowSample) { } TEST_F(FilterIntegrationTest, StripValueTransformer) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "strip-value-transformer-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -433,7 +433,7 @@ TEST_F(FilterIntegrationTest, StripValueTransformer) { } TEST_F(FilterIntegrationTest, ApplyLabelTransformer) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "apply-label-transformer-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -458,7 +458,7 @@ TEST_F(FilterIntegrationTest, ApplyLabelTransformer) { } TEST_F(FilterIntegrationTest, Condition) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "condition-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -486,7 +486,7 @@ TEST_F(FilterIntegrationTest, Condition) { } TEST_F(FilterIntegrationTest, Chain) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "chain-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -510,7 +510,7 @@ TEST_F(FilterIntegrationTest, Chain) { } TEST_F(FilterIntegrationTest, ChainFromRange) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "chain-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -534,7 +534,7 @@ TEST_F(FilterIntegrationTest, ChainFromRange) { } TEST_F(FilterIntegrationTest, Interleave) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "interleave-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, @@ -562,7 +562,7 @@ TEST_F(FilterIntegrationTest, Interleave) { } TEST_F(FilterIntegrationTest, InterleaveFromRange) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); std::string const prefix = "interleave-prefix"; std::vector created{ {prefix + "/abc0", "family1", "c0", 1000, "v1000"}, diff --git a/google/cloud/bigtable/tests/instance_admin_emulator.cc b/google/cloud/bigtable/tests/instance_admin_emulator.cc index 21f746c928382..40bde479f2cb8 100644 --- a/google/cloud/bigtable/tests/instance_admin_emulator.cc +++ b/google/cloud/bigtable/tests/instance_admin_emulator.cc @@ -14,8 +14,8 @@ #include "google/cloud/bigtable/internal/prefix_range_end.h" #include "absl/strings/match.h" -#include -#include +#include "google/bigtable/admin/v2/bigtable_instance_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/bigtable/tests/instance_admin_integration_test.cc b/google/cloud/bigtable/tests/instance_admin_integration_test.cc index 20980eb782c04..9e47f51ff6196 100644 --- a/google/cloud/bigtable/tests/instance_admin_integration_test.cc +++ b/google/cloud/bigtable/tests/instance_admin_integration_test.cc @@ -14,6 +14,7 @@ #include "google/cloud/bigtable/instance_admin.h" #include "google/cloud/bigtable/testing/random_names.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/internal/algorithm.h" #include "google/cloud/internal/background_threads_impl.h" #include "google/cloud/internal/getenv.h" diff --git a/google/cloud/bigtable/tests/mutations_integration_test.cc b/google/cloud/bigtable/tests/mutations_integration_test.cc index ccd9e7ad3c574..6efaf27f79a85 100644 --- a/google/cloud/bigtable/tests/mutations_integration_test.cc +++ b/google/cloud/bigtable/tests/mutations_integration_test.cc @@ -62,7 +62,7 @@ std::string const kColumnFamily3 = "family3"; * Cloud Bigtable */ TEST_F(MutationIntegrationTest, SetCellTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cells which will be inserted into bigtable std::string const row_key = "SetCellRowKey"; @@ -86,7 +86,7 @@ TEST_F(MutationIntegrationTest, SetCellTest) { * correctly inserted into Cloud Bigtable */ TEST_F(MutationIntegrationTest, SetCellNumericValueTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cells which will be inserted into bigtable std::string const row_key = "SetCellNumRowKey"; @@ -129,7 +129,7 @@ TEST_F(MutationIntegrationTest, SetCellNumericValueErrorTest) { * correctly inserted into Cloud Bigtable. */ TEST_F(MutationIntegrationTest, SetCellIgnoreTimestampTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const row_key = "SetCellRowKey"; @@ -167,7 +167,7 @@ TEST_F(MutationIntegrationTest, SetCellIgnoreTimestampTest) { * Bigtable. */ TEST_F(MutationIntegrationTest, DeleteFromColumnForTimestampRangeTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const row_key = "DeleteColumn-Key"; @@ -212,7 +212,7 @@ TEST_F(MutationIntegrationTest, DeleteFromColumnForTimestampRangeTest) { * We expect the server (and not the client library) to reject invalid ranges. */ TEST_F(MutationIntegrationTest, DeleteFromColumnForReversedTimestampRangeTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const key = "row"; @@ -245,7 +245,7 @@ TEST_F(MutationIntegrationTest, DeleteFromColumnForReversedTimestampRangeTest) { * We expect the server (and not the client library) to reject invalid ranges. */ TEST_F(MutationIntegrationTest, DeleteFromColumnForEmptyTimestampRangeTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const key = "row"; @@ -270,7 +270,7 @@ TEST_F(MutationIntegrationTest, DeleteFromColumnForEmptyTimestampRangeTest) { * is deleting all records only for that column_identifier. */ TEST_F(MutationIntegrationTest, DeleteFromColumnForAllTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const row_key = "DeleteColumnForAll-Key"; @@ -304,7 +304,7 @@ TEST_F(MutationIntegrationTest, DeleteFromColumnForAllTest) { * timestamp only. */ TEST_F(MutationIntegrationTest, DeleteFromColumnStartingFromTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const row_key = "DeleteColumnStartingFrom-Key"; @@ -341,7 +341,7 @@ TEST_F(MutationIntegrationTest, DeleteFromColumnStartingFromTest) { * timestamp only. end_timestamp is not inclusive. */ TEST_F(MutationIntegrationTest, DeleteFromColumnEndingAtTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable cloud std::string const row_key = "DeleteColumnEndingAt-Key"; @@ -379,7 +379,7 @@ TEST_F(MutationIntegrationTest, DeleteFromColumnEndingAtTest) { * records for that family only */ TEST_F(MutationIntegrationTest, DeleteFromFamilyTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const row_key = "DeleteFamily-Key"; @@ -411,7 +411,7 @@ TEST_F(MutationIntegrationTest, DeleteFromFamilyTest) { * records for that row only */ TEST_F(MutationIntegrationTest, DeleteFromRowTest) { - auto table = GetTable("with-data-connection"); + auto table = GetTable(); // Create a vector of cell which will be inserted into bigtable std::string const row_key1 = "DeleteRowKey1"; diff --git a/google/cloud/bigtable/tests/table_sample_rows_integration_test.cc b/google/cloud/bigtable/tests/table_sample_rows_integration_test.cc index bdb78871a410c..30388be60523a 100644 --- a/google/cloud/bigtable/tests/table_sample_rows_integration_test.cc +++ b/google/cloud/bigtable/tests/table_sample_rows_integration_test.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "google/cloud/bigtable/client_options.h" -#include "google/cloud/bigtable/data_client.h" #include "google/cloud/bigtable/mutations.h" #include "google/cloud/bigtable/row_key_sample.h" #include "google/cloud/bigtable/table.h" #include "google/cloud/bigtable/testing/table_integration_test.h" +#include "google/cloud/grpc_options.h" #include "google/cloud/testing_util/integration_test.h" #include "google/cloud/testing_util/status_matchers.h" #include @@ -38,12 +37,6 @@ namespace { using ::google::cloud::bigtable::testing::TableTestEnvironment; using ::testing::IsEmpty; -Table GetTable() { - return Table(MakeDataClient(TableTestEnvironment::project_id(), - TableTestEnvironment::instance_id()), - TableTestEnvironment::table_id()); -} - void VerifySamples(StatusOr> samples) { ASSERT_STATUS_OK(samples); @@ -135,21 +128,6 @@ TEST_F(SampleRowsIntegrationTest, AsyncWithDataConnection) { VerifySamples(fut.get()); }; -TEST_F(SampleRowsIntegrationTest, SyncWithDataClient) { - auto table = GetTable(); - VerifySamples(table.SampleRows()); -}; - -TEST_F(SampleRowsIntegrationTest, AsyncWithDataClient) { - auto table = GetTable(); - auto fut = table.AsyncSampleRows(); - - // Block until the asynchronous operation completes. This is not what one - // would do in a real application (the synchronous API is better in that - // case), but we need to wait before checking the results. - VerifySamples(fut.get()); -}; - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace bigtable diff --git a/google/cloud/bigtable/tools/run_emulator_utils.sh b/google/cloud/bigtable/tools/run_emulator_utils.sh index 807ae6efb41a9..dc91f71083889 100755 --- a/google/cloud/bigtable/tools/run_emulator_utils.sh +++ b/google/cloud/bigtable/tools/run_emulator_utils.sh @@ -25,12 +25,12 @@ INSTANCE_ADMIN_EMULATOR_PID=0 function kill_emulators() { io::log "Killing Bigtable Emulators..." echo -n "EMULATOR_PID=${EMULATOR_PID} " - kill "${EMULATOR_PID}" || echo -n "-" + kill -9 "${EMULATOR_PID}" || echo -n "-" echo -n "." wait "${EMULATOR_PID}" >/dev/null 2>&1 || echo -n "+" echo "." echo -n "INSTANCE_ADMIN_EMULATOR_PID=${INSTANCE_ADMIN_EMULATOR_PID} " - kill "${INSTANCE_ADMIN_EMULATOR_PID}" || echo -n "-" + kill -9 "${INSTANCE_ADMIN_EMULATOR_PID}" || echo -n "-" echo -n "." wait "${INSTANCE_ADMIN_EMULATOR_PID}" >/dev/null 2>&1 || echo -n "+" echo "." diff --git a/google/cloud/billing/BUILD.bazel b/google/cloud/billing/BUILD.bazel index f5f10cc56d4dd..69172d552ab62 100644 --- a/google/cloud/billing/BUILD.bazel +++ b/google/cloud/billing/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/billing/budgets/v1:budgets_cc_grpc", - "@com_google_googleapis//google/cloud/billing/v1:billing_cc_grpc", + "@googleapis//google/cloud/billing/budgets/v1:budgets_cc_grpc", + "@googleapis//google/cloud/billing/v1:billing_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/billing/budgets/v1/budget_connection.h b/google/cloud/billing/budgets/v1/budget_connection.h index 043e149ecd36b..60ccefce4e0e9 100644 --- a/google/cloud/billing/budgets/v1/budget_connection.h +++ b/google/cloud/billing/budgets/v1/budget_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGETS_V1_BUDGET_CONNECTION_H #include "google/cloud/billing/budgets/v1/budget_connection_idempotency_policy.h" +#include "google/cloud/billing/budgets/v1/budget_service.pb.h" #include "google/cloud/billing/budgets/v1/internal/budget_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/billing/budgets/v1/budget_connection_idempotency_policy.h b/google/cloud/billing/budgets/v1/budget_connection_idempotency_policy.h index 5930d2f00ebf8..b52f4d91cc9e0 100644 --- a/google/cloud/billing/budgets/v1/budget_connection_idempotency_policy.h +++ b/google/cloud/billing/budgets/v1/budget_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGETS_V1_BUDGET_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGETS_V1_BUDGET_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/billing/budgets/v1/budget_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/billing/budgets/v1/internal/budget_auth_decorator.cc b/google/cloud/billing/budgets/v1/internal/budget_auth_decorator.cc index d8d9f3868b6e4..abd15dab379b8 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_auth_decorator.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/billing/budgets/v1/budget_service.proto #include "google/cloud/billing/budgets/v1/internal/budget_auth_decorator.h" -#include +#include "google/cloud/billing/budgets/v1/budget_service.grpc.pb.h" #include #include diff --git a/google/cloud/billing/budgets/v1/internal/budget_logging_decorator.cc b/google/cloud/billing/budgets/v1/internal/budget_logging_decorator.cc index 03088ae08bdf7..a604ff5074f2c 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_logging_decorator.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/billing/budgets/v1/budget_service.proto #include "google/cloud/billing/budgets/v1/internal/budget_logging_decorator.h" +#include "google/cloud/billing/budgets/v1/budget_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/billing/budgets/v1/internal/budget_metadata_decorator.cc b/google/cloud/billing/budgets/v1/internal/budget_metadata_decorator.cc index 71b804e70cfba..0635ab9736978 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_metadata_decorator.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/billing/budgets/v1/budget_service.proto #include "google/cloud/billing/budgets/v1/internal/budget_metadata_decorator.h" +#include "google/cloud/billing/budgets/v1/budget_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 #include #include #include diff --git a/google/cloud/billing/budgets/v1/internal/budget_stub.cc b/google/cloud/billing/budgets/v1/internal/budget_stub.cc index b99b6b7487a1b..86c58ae3975c7 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_stub.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/billing/budgets/v1/budget_service.proto #include "google/cloud/billing/budgets/v1/internal/budget_stub.h" +#include "google/cloud/billing/budgets/v1/budget_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/billing/budgets/v1/internal/budget_stub.h b/google/cloud/billing/budgets/v1/internal/budget_stub.h index acf344a7cf429..a4faead2bd81a 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_stub.h +++ b/google/cloud/billing/budgets/v1/internal/budget_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGETS_V1_INTERNAL_BUDGET_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGETS_V1_INTERNAL_BUDGET_STUB_H +#include "google/cloud/billing/budgets/v1/budget_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/billing/budgets/v1/internal/budget_stub_factory.cc b/google/cloud/billing/budgets/v1/internal/budget_stub_factory.cc index b06308ef63468..5040963d950e2 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_stub_factory.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/billing/budgets/v1/budget_service.proto #include "google/cloud/billing/budgets/v1/internal/budget_stub_factory.h" +#include "google/cloud/billing/budgets/v1/budget_service.grpc.pb.h" #include "google/cloud/billing/budgets/v1/internal/budget_auth_decorator.h" #include "google/cloud/billing/budgets/v1/internal/budget_logging_decorator.h" #include "google/cloud/billing/budgets/v1/internal/budget_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc b/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc index fdd952f33222f..f8122667a4440 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace billing_budgets_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BudgetServiceTracingConnection::BudgetServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -80,16 +78,12 @@ Status BudgetServiceTracingConnection::DeleteBudget( return internal::EndSpan(*span, child_->DeleteBudget(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBudgetServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.h b/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.h index 544be106f22e3..4b95e09584d3a 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.h +++ b/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace billing_budgets_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BudgetServiceTracingConnection : public billing_budgets_v1::BudgetServiceConnection { public: @@ -63,8 +61,6 @@ class BudgetServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.cc b/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.cc index f5610b88a13f4..6efad01701053 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace billing_budgets_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BudgetServiceTracingStub::BudgetServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -91,15 +89,9 @@ Status BudgetServiceTracingStub::DeleteBudget( child_->DeleteBudget(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBudgetServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.h b/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.h index 7517c9f52277d..b6fe8376d9d3e 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.h +++ b/google/cloud/billing/budgets/v1/internal/budget_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace billing_budgets_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BudgetServiceTracingStub : public BudgetServiceStub { public: ~BudgetServiceTracingStub() override = default; @@ -69,8 +67,6 @@ class BudgetServiceTracingStub : public BudgetServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/billing/quickstart/.bazelrc b/google/cloud/billing/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/billing/quickstart/.bazelrc +++ b/google/cloud/billing/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/billing/v1/cloud_billing_connection.h b/google/cloud/billing/v1/cloud_billing_connection.h index 99cbf66c45ac7..92aa0deccfa89 100644 --- a/google/cloud/billing/v1/cloud_billing_connection.h +++ b/google/cloud/billing/v1/cloud_billing_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_BILLING_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_BILLING_CONNECTION_H +#include "google/cloud/billing/v1/cloud_billing.pb.h" #include "google/cloud/billing/v1/cloud_billing_connection_idempotency_policy.h" #include "google/cloud/billing/v1/internal/cloud_billing_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/billing/v1/cloud_billing_connection_idempotency_policy.h b/google/cloud/billing/v1/cloud_billing_connection_idempotency_policy.h index 9eb734842d37d..aaf4f98af893e 100644 --- a/google/cloud/billing/v1/cloud_billing_connection_idempotency_policy.h +++ b/google/cloud/billing/v1/cloud_billing_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_BILLING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_BILLING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/billing/v1/cloud_billing.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/billing/v1/cloud_catalog_connection.h b/google/cloud/billing/v1/cloud_catalog_connection.h index 3f7af5098a5b4..585518d2c7bd7 100644 --- a/google/cloud/billing/v1/cloud_catalog_connection.h +++ b/google/cloud/billing/v1/cloud_catalog_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_CATALOG_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_CATALOG_CONNECTION_H +#include "google/cloud/billing/v1/cloud_catalog.pb.h" #include "google/cloud/billing/v1/cloud_catalog_connection_idempotency_policy.h" #include "google/cloud/billing/v1/internal/cloud_catalog_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/billing/v1/cloud_catalog_connection_idempotency_policy.h b/google/cloud/billing/v1/cloud_catalog_connection_idempotency_policy.h index dbdd33ab9bff7..14409cc176b94 100644 --- a/google/cloud/billing/v1/cloud_catalog_connection_idempotency_policy.h +++ b/google/cloud/billing/v1/cloud_catalog_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_CLOUD_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/billing/v1/cloud_catalog.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/billing/v1/internal/cloud_billing_auth_decorator.cc b/google/cloud/billing/v1/internal/cloud_billing_auth_decorator.cc index 947f22c6f7d62..e4ab0ab075ec6 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_auth_decorator.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/billing/v1/cloud_billing.proto #include "google/cloud/billing/v1/internal/cloud_billing_auth_decorator.h" -#include +#include "google/cloud/billing/v1/cloud_billing.grpc.pb.h" #include #include diff --git a/google/cloud/billing/v1/internal/cloud_billing_logging_decorator.cc b/google/cloud/billing/v1/internal/cloud_billing_logging_decorator.cc index 4f9588e60fc33..76313c5baf135 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_logging_decorator.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/billing/v1/cloud_billing.proto #include "google/cloud/billing/v1/internal/cloud_billing_logging_decorator.h" +#include "google/cloud/billing/v1/cloud_billing.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_billing_metadata_decorator.cc b/google/cloud/billing/v1/internal/cloud_billing_metadata_decorator.cc index fff950a9da849..6335837398f35 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_metadata_decorator.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/billing/v1/cloud_billing.proto #include "google/cloud/billing/v1/internal/cloud_billing_metadata_decorator.h" +#include "google/cloud/billing/v1/cloud_billing.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 #include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_billing_stub.cc b/google/cloud/billing/v1/internal/cloud_billing_stub.cc index 248dfd811e702..20023f50c3c84 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_stub.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/billing/v1/cloud_billing.proto #include "google/cloud/billing/v1/internal/cloud_billing_stub.h" +#include "google/cloud/billing/v1/cloud_billing.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_billing_stub.h b/google/cloud/billing/v1/internal/cloud_billing_stub.h index dede42151b0be..8b824049cbcf2 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_stub.h +++ b/google/cloud/billing/v1/internal/cloud_billing_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_INTERNAL_CLOUD_BILLING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_INTERNAL_CLOUD_BILLING_STUB_H +#include "google/cloud/billing/v1/cloud_billing.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_billing_stub_factory.cc b/google/cloud/billing/v1/internal/cloud_billing_stub_factory.cc index c8f32450994f7..7733a79caadd5 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_stub_factory.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/billing/v1/cloud_billing.proto #include "google/cloud/billing/v1/internal/cloud_billing_stub_factory.h" +#include "google/cloud/billing/v1/cloud_billing.grpc.pb.h" #include "google/cloud/billing/v1/internal/cloud_billing_auth_decorator.h" #include "google/cloud/billing/v1/internal/cloud_billing_logging_decorator.h" #include "google/cloud/billing/v1/internal/cloud_billing_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc b/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc index 8b3aaceb64844..edd63837ffdfc 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudBillingTracingConnection::CloudBillingTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -137,16 +135,12 @@ CloudBillingTracingConnection::MoveBillingAccount( return internal::EndSpan(*span, child_->MoveBillingAccount(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudBillingTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.h b/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.h index 90ce15035113e..377c71b1dd2c6 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.h +++ b/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudBillingTracingConnection : public billing_v1::CloudBillingConnection { public: @@ -87,8 +85,6 @@ class CloudBillingTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.cc b/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.cc index 91e2d11358e61..22b7f8b14cf31 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudBillingTracingStub::CloudBillingTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -165,15 +163,9 @@ CloudBillingTracingStub::MoveBillingAccount( context, *span, child_->MoveBillingAccount(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudBillingTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.h b/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.h index 74142097e8de2..6ab2734e030ee 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.h +++ b/google/cloud/billing/v1/internal/cloud_billing_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudBillingTracingStub : public CloudBillingStub { public: ~CloudBillingTracingStub() override = default; @@ -100,8 +98,6 @@ class CloudBillingTracingStub : public CloudBillingStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/billing/v1/internal/cloud_catalog_auth_decorator.cc b/google/cloud/billing/v1/internal/cloud_catalog_auth_decorator.cc index 2ce708278f082..6d758380dc82c 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_auth_decorator.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/billing/v1/cloud_catalog.proto #include "google/cloud/billing/v1/internal/cloud_catalog_auth_decorator.h" -#include +#include "google/cloud/billing/v1/cloud_catalog.grpc.pb.h" #include #include diff --git a/google/cloud/billing/v1/internal/cloud_catalog_logging_decorator.cc b/google/cloud/billing/v1/internal/cloud_catalog_logging_decorator.cc index 8a6cac0644d8f..88be1f440058d 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_logging_decorator.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/billing/v1/cloud_catalog.proto #include "google/cloud/billing/v1/internal/cloud_catalog_logging_decorator.h" +#include "google/cloud/billing/v1/cloud_catalog.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_catalog_metadata_decorator.cc b/google/cloud/billing/v1/internal/cloud_catalog_metadata_decorator.cc index 1088faed8ef8a..e41b087713ed0 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_metadata_decorator.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/billing/v1/cloud_catalog.proto #include "google/cloud/billing/v1/internal/cloud_catalog_metadata_decorator.h" +#include "google/cloud/billing/v1/cloud_catalog.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 #include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_catalog_stub.cc b/google/cloud/billing/v1/internal/cloud_catalog_stub.cc index 174186531adcf..0cd7c87d9b1a8 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_stub.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/billing/v1/cloud_catalog.proto #include "google/cloud/billing/v1/internal/cloud_catalog_stub.h" +#include "google/cloud/billing/v1/cloud_catalog.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_catalog_stub.h b/google/cloud/billing/v1/internal/cloud_catalog_stub.h index 252be6fd66e5a..3910375728e15 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_stub.h +++ b/google/cloud/billing/v1/internal/cloud_catalog_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_INTERNAL_CLOUD_CATALOG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_V1_INTERNAL_CLOUD_CATALOG_STUB_H +#include "google/cloud/billing/v1/cloud_catalog.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_catalog_stub_factory.cc b/google/cloud/billing/v1/internal/cloud_catalog_stub_factory.cc index 66c8c58ce9fc6..e60c5bf9977fe 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_stub_factory.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/billing/v1/cloud_catalog.proto #include "google/cloud/billing/v1/internal/cloud_catalog_stub_factory.h" +#include "google/cloud/billing/v1/cloud_catalog.grpc.pb.h" #include "google/cloud/billing/v1/internal/cloud_catalog_auth_decorator.h" #include "google/cloud/billing/v1/internal/cloud_catalog_logging_decorator.h" #include "google/cloud/billing/v1/internal/cloud_catalog_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc b/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc index 52f982f0183eb..d91c4fe6fa9a9 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudCatalogTracingConnection::CloudCatalogTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -55,16 +53,12 @@ CloudCatalogTracingConnection::ListSkus( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudCatalogTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.h b/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.h index a0dbfe8f35928..56e1ea93386ab 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.h +++ b/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudCatalogTracingConnection : public billing_v1::CloudCatalogConnection { public: @@ -50,8 +48,6 @@ class CloudCatalogTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.cc b/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.cc index 09b898d2f6f3e..9eb363dc60bdb 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudCatalogTracingStub::CloudCatalogTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -56,15 +54,9 @@ CloudCatalogTracingStub::ListSkus( child_->ListSkus(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudCatalogTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.h b/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.h index e02ef50e343aa..e09f05d87c943 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.h +++ b/google/cloud/billing/v1/internal/cloud_catalog_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace billing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudCatalogTracingStub : public CloudCatalogStub { public: ~CloudCatalogTracingStub() override = default; @@ -52,8 +50,6 @@ class CloudCatalogTracingStub : public CloudCatalogStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/binaryauthorization/BUILD.bazel b/google/cloud/binaryauthorization/BUILD.bazel index 98ae06be8651f..98ced73d88efe 100644 --- a/google/cloud/binaryauthorization/BUILD.bazel +++ b/google/cloud/binaryauthorization/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/binaryauthorization/v1:binaryauthorization_cc_grpc", + "@googleapis//google/cloud/binaryauthorization/v1:binaryauthorization_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/binaryauthorization/quickstart/.bazelrc b/google/cloud/binaryauthorization/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/binaryauthorization/quickstart/.bazelrc +++ b/google/cloud/binaryauthorization/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection.h b/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection.h index db4fffc36869d..8e78321052a66 100644 --- a/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection.h +++ b/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection_idempotency_policy.h" #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_retry_traits.h" +#include "google/cloud/binaryauthorization/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection_idempotency_policy.h b/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection_idempotency_policy.h index 6de535ab49f6d..53129d39e015f 100644 --- a/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection_idempotency_policy.h +++ b/google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_auth_decorator.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_auth_decorator.cc index 5a0fb4a58f4d6..954ab5d115c66 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_auth_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_auth_decorator.h" -#include +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_logging_decorator.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_logging_decorator.cc index c89ff60ced7ca..a549947209f32 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_logging_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_logging_decorator.h" +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_metadata_decorator.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_metadata_decorator.cc index c64fdf3b6a827..d17d0b03cfb2b 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_metadata_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_metadata_decorator.h" +#include "google/cloud/binaryauthorization/v1/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 #include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.cc index a8bef9d46968f..cbe78932bf267 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.h" +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.h b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.h index 0d6e67acb4d2c..4da311b917701 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.h +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_INTERNAL_BINAUTHZ_MANAGEMENT_SERVICE_V1_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_INTERNAL_BINAUTHZ_MANAGEMENT_SERVICE_V1_STUB_H +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub_factory.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub_factory.cc index 1a4f3cccddfcb..52b013ebdb9f4 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub_factory.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_metadata_decorator.h" #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_stub.h" #include "google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.h" +#include "google/cloud/binaryauthorization/v1/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 #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc index cc59f42f07b8d..23ad8730b46f5 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BinauthzManagementServiceV1TracingConnection:: BinauthzManagementServiceV1TracingConnection( std::shared_ptr< @@ -112,19 +110,15 @@ Status BinauthzManagementServiceV1TracingConnection::DeleteAttestor( return internal::EndSpan(*span, child_->DeleteAttestor(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBinauthzManagementServiceV1TracingConnection( std::shared_ptr< binaryauthorization_v1::BinauthzManagementServiceV1Connection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.h b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.h index a9ad2fec3d959..8eacd82697a27 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.h +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BinauthzManagementServiceV1TracingConnection : public binaryauthorization_v1::BinauthzManagementServiceV1Connection { public: @@ -75,8 +73,6 @@ class BinauthzManagementServiceV1TracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.cc index a33fcf18f0f1f..09c5b8b7d5f24 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BinauthzManagementServiceV1TracingStub::BinauthzManagementServiceV1TracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -127,17 +125,11 @@ Status BinauthzManagementServiceV1TracingStub::DeleteAttestor( child_->DeleteAttestor(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBinauthzManagementServiceV1TracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.h b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.h index 9308b97a182ff..e26f1d2b70c79 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.h +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BinauthzManagementServiceV1TracingStub : public BinauthzManagementServiceV1Stub { public: @@ -82,8 +80,6 @@ class BinauthzManagementServiceV1TracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_auth_decorator.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_auth_decorator.cc index 30f12ff33e569..d6f662eec7b82 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_auth_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_auth_decorator.h" -#include +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_logging_decorator.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_logging_decorator.cc index 5894f55009339..3f7b641e05db8 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_logging_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_logging_decorator.h" +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_metadata_decorator.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_metadata_decorator.cc index e513df392108b..a66031977d7cb 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_metadata_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_metadata_decorator.h" +#include "google/cloud/binaryauthorization/v1/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 #include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.cc index cda15b789c980..037b1475ddf8e 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.h" +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.h b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.h index 3ba666a82994a..604dacad6d380 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.h +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_INTERNAL_SYSTEM_POLICY_V1_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_INTERNAL_SYSTEM_POLICY_V1_STUB_H +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub_factory.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub_factory.cc index 24d40a05d35cc..9e2e0e7942592 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub_factory.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_metadata_decorator.h" #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_stub.h" #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.h" +#include "google/cloud/binaryauthorization/v1/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 #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.cc index f081bb4ffb886..940c616333e99 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SystemPolicyV1TracingConnection::SystemPolicyV1TracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -42,16 +40,12 @@ SystemPolicyV1TracingConnection::GetSystemPolicy( return internal::EndSpan(*span, child_->GetSystemPolicy(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSystemPolicyV1TracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.h b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.h index 20ba07a36aa5b..edfe713cb81aa 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.h +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SystemPolicyV1TracingConnection : public binaryauthorization_v1::SystemPolicyV1Connection { public: @@ -48,8 +46,6 @@ class SystemPolicyV1TracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.cc b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.cc index 007288bf24fdf..d366dd317ace7 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.cc +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SystemPolicyV1TracingStub::SystemPolicyV1TracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -45,15 +43,9 @@ SystemPolicyV1TracingStub::GetSystemPolicy( child_->GetSystemPolicy(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSystemPolicyV1TracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.h b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.h index a01fb3b89a050..d31fbd81cd954 100644 --- a/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.h +++ b/google/cloud/binaryauthorization/v1/internal/system_policy_v1_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SystemPolicyV1TracingStub : public SystemPolicyV1Stub { public: ~SystemPolicyV1TracingStub() override = default; @@ -49,8 +47,6 @@ class SystemPolicyV1TracingStub : public SystemPolicyV1Stub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_auth_decorator.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_auth_decorator.cc index c3408e3835ad4..a08be1c28d097 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_auth_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_auth_decorator.h" -#include +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_logging_decorator.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_logging_decorator.cc index 1388971164b76..2444a764b67da 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_logging_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_logging_decorator.h" +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_metadata_decorator.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_metadata_decorator.cc index 29fd64d567b0d..93bbdf2d4c2ac 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_metadata_decorator.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_metadata_decorator.h" +#include "google/cloud/binaryauthorization/v1/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 #include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.cc index 7692db5c1247f..111e6c087148a 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/binaryauthorization/v1/service.proto #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.h" +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.h b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.h index 3247af5600c47..5f83e1bc27c47 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.h +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_INTERNAL_VALIDATION_HELPER_V1_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_INTERNAL_VALIDATION_HELPER_V1_STUB_H +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub_factory.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub_factory.cc index 6ff64cc486480..4c6bb4806201b 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub_factory.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_metadata_decorator.h" #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_stub.h" #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.h" +#include "google/cloud/binaryauthorization/v1/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 #include #include diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.cc index cc99eba3ea88f..cf407923ad86b 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ValidationHelperV1TracingConnection::ValidationHelperV1TracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -45,18 +43,14 @@ ValidationHelperV1TracingConnection::ValidateAttestationOccurrence( child_->ValidateAttestationOccurrence(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeValidationHelperV1TracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.h b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.h index e4a08a8b62c4d..153c64c675f5a 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.h +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ValidationHelperV1TracingConnection : public binaryauthorization_v1::ValidationHelperV1Connection { public: @@ -51,8 +49,6 @@ class ValidationHelperV1TracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.cc b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.cc index 34f08592227b5..fdfe53c3f0b52 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.cc +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ValidationHelperV1TracingStub::ValidationHelperV1TracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -48,15 +46,9 @@ ValidationHelperV1TracingStub::ValidateAttestationOccurrence( child_->ValidateAttestationOccurrence(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeValidationHelperV1TracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.h b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.h index a08a423f4baf8..e90a367448612 100644 --- a/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.h +++ b/google/cloud/binaryauthorization/v1/internal/validation_helper_v1_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace binaryauthorization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ValidationHelperV1TracingStub : public ValidationHelperV1Stub { public: ~ValidationHelperV1TracingStub() override = default; @@ -52,8 +50,6 @@ class ValidationHelperV1TracingStub : public ValidationHelperV1Stub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/binaryauthorization/v1/system_policy_v1_connection.h b/google/cloud/binaryauthorization/v1/system_policy_v1_connection.h index e290a300a0200..f8fa88c382e0a 100644 --- a/google/cloud/binaryauthorization/v1/system_policy_v1_connection.h +++ b/google/cloud/binaryauthorization/v1/system_policy_v1_connection.h @@ -20,13 +20,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_SYSTEM_POLICY_V1_CONNECTION_H #include "google/cloud/binaryauthorization/v1/internal/system_policy_v1_retry_traits.h" +#include "google/cloud/binaryauthorization/v1/service.pb.h" #include "google/cloud/binaryauthorization/v1/system_policy_v1_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/binaryauthorization/v1/system_policy_v1_connection_idempotency_policy.h b/google/cloud/binaryauthorization/v1/system_policy_v1_connection_idempotency_policy.h index ec6a2cbd738d1..a4e44ff553580 100644 --- a/google/cloud/binaryauthorization/v1/system_policy_v1_connection_idempotency_policy.h +++ b/google/cloud/binaryauthorization/v1/system_policy_v1_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_SYSTEM_POLICY_V1_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_SYSTEM_POLICY_V1_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/binaryauthorization/v1/validation_helper_v1_connection.h b/google/cloud/binaryauthorization/v1/validation_helper_v1_connection.h index 2813a6ff98716..e38c4427628b5 100644 --- a/google/cloud/binaryauthorization/v1/validation_helper_v1_connection.h +++ b/google/cloud/binaryauthorization/v1/validation_helper_v1_connection.h @@ -20,13 +20,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_VALIDATION_HELPER_V1_CONNECTION_H #include "google/cloud/binaryauthorization/v1/internal/validation_helper_v1_retry_traits.h" +#include "google/cloud/binaryauthorization/v1/service.pb.h" #include "google/cloud/binaryauthorization/v1/validation_helper_v1_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/binaryauthorization/v1/validation_helper_v1_connection_idempotency_policy.h b/google/cloud/binaryauthorization/v1/validation_helper_v1_connection_idempotency_policy.h index 2174521426d32..8a38cc674a625 100644 --- a/google/cloud/binaryauthorization/v1/validation_helper_v1_connection_idempotency_policy.h +++ b/google/cloud/binaryauthorization/v1/validation_helper_v1_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_VALIDATION_HELPER_V1_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_V1_VALIDATION_HELPER_V1_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/binaryauthorization/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/certificatemanager/BUILD.bazel b/google/cloud/certificatemanager/BUILD.bazel index 9057ab9ec38a4..ec9b433a64ea9 100644 --- a/google/cloud/certificatemanager/BUILD.bazel +++ b/google/cloud/certificatemanager/BUILD.bazel @@ -24,8 +24,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/certificatemanager/logging/v1:logging_cc_grpc", - "@com_google_googleapis//google/cloud/certificatemanager/v1:certificatemanager_cc_grpc", + "@googleapis//google/cloud/certificatemanager/logging/v1:logging_cc_grpc", + "@googleapis//google/cloud/certificatemanager/v1:certificatemanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/certificatemanager/quickstart/.bazelrc b/google/cloud/certificatemanager/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/certificatemanager/quickstart/.bazelrc +++ b/google/cloud/certificatemanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/certificatemanager/v1/certificate_manager_client.h b/google/cloud/certificatemanager/v1/certificate_manager_client.h index d08c04067b979..3cdbc90ed13de 100644 --- a/google/cloud/certificatemanager/v1/certificate_manager_client.h +++ b/google/cloud/certificatemanager/v1/certificate_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/certificatemanager/v1/certificate_manager_connection.h b/google/cloud/certificatemanager/v1/certificate_manager_connection.h index d6b66bd020403..56549a0f20458 100644 --- a/google/cloud/certificatemanager/v1/certificate_manager_connection.h +++ b/google/cloud/certificatemanager/v1/certificate_manager_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_V1_CERTIFICATE_MANAGER_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_V1_CERTIFICATE_MANAGER_CONNECTION_H +#include "google/cloud/certificatemanager/v1/certificate_manager.pb.h" #include "google/cloud/certificatemanager/v1/certificate_manager_connection_idempotency_policy.h" #include "google/cloud/certificatemanager/v1/internal/certificate_manager_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/certificatemanager/v1/certificate_manager_connection_idempotency_policy.h b/google/cloud/certificatemanager/v1/certificate_manager_connection_idempotency_policy.h index b1a745714b3b9..fee03fa9c58c2 100644 --- a/google/cloud/certificatemanager/v1/certificate_manager_connection_idempotency_policy.h +++ b/google/cloud/certificatemanager/v1/certificate_manager_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_V1_CERTIFICATE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_V1_CERTIFICATE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/certificatemanager/v1/certificate_manager.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.cc index a3bae677bca52..5ed3743ab92e3 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/certificatemanager/v1/certificate_manager.proto #include "google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.h" -#include +#include "google/cloud/certificatemanager/v1/certificate_manager.grpc.pb.h" #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.h index 1e5829314f6b0..2f32c3a2a4287 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_connection_impl.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_connection_impl.h index be19bdea8cc1e..2fa57ac738990 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_connection_impl.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.cc index 591a5000c9575..efe6c8d72fee1 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/certificatemanager/v1/certificate_manager.proto #include "google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.h" +#include "google/cloud/certificatemanager/v1/certificate_manager.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.h index 978cdfaca23d7..7bec2ece2192f 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.cc index e09e52d21d8ea..699ec17444cfe 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/certificatemanager/v1/certificate_manager.proto #include "google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.h" +#include "google/cloud/certificatemanager/v1/certificate_manager.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 #include #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.h index 66ed5b7fa8870..b6c8d36fe2c3d 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc index 1ab7bdb79ca68..0ff4cb56bc3cf 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/certificatemanager/v1/certificate_manager.proto #include "google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h" +#include "google/cloud/certificatemanager/v1/certificate_manager.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h index c54fc642398be..ef7cbb02014e6 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_V1_INTERNAL_CERTIFICATE_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_V1_INTERNAL_CERTIFICATE_MANAGER_STUB_H +#include "google/cloud/certificatemanager/v1/certificate_manager.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc index 711ad31705ca6..560a8dbd05779 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/certificatemanager/v1/certificate_manager.proto #include "google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.h" +#include "google/cloud/certificatemanager/v1/certificate_manager.grpc.pb.h" #include "google/cloud/certificatemanager/v1/internal/certificate_manager_auth_decorator.h" #include "google/cloud/certificatemanager/v1/internal/certificate_manager_logging_decorator.h" #include "google/cloud/certificatemanager/v1/internal/certificate_manager_metadata_decorator.h" #include "google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h" #include "google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc index 831047687ff3a..366e217b8c76f 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace certificatemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CertificateManagerTracingConnection::CertificateManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -817,17 +815,13 @@ Status CertificateManagerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCertificateManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.h index 38c1b6e930f8d..ff2e442c5555a 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace certificatemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CertificateManagerTracingConnection : public certificatemanager_v1::CertificateManagerConnection { public: @@ -349,8 +347,6 @@ class CertificateManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc index 2c0ace27ebc16..7a85036cdcaec 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace certificatemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CertificateManagerTracingStub::CertificateManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -842,15 +840,9 @@ future CertificateManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCertificateManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.h index fd2e5c3b1e866..7064f9e94dad6 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace certificatemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CertificateManagerTracingStub : public CertificateManagerStub { public: ~CertificateManagerTracingStub() override = default; @@ -362,8 +360,6 @@ class CertificateManagerTracingStub : public CertificateManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/channel/BUILD.bazel b/google/cloud/channel/BUILD.bazel index 54ba556ef942e..62e52387ed905 100644 --- a/google/cloud/channel/BUILD.bazel +++ b/google/cloud/channel/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/channel/v1:channel_cc_grpc", + "@googleapis//google/cloud/channel/v1:channel_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/channel/quickstart/.bazelrc b/google/cloud/channel/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/channel/quickstart/.bazelrc +++ b/google/cloud/channel/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/channel/v1/cloud_channel_client.h b/google/cloud/channel/v1/cloud_channel_client.h index c80d3cbe4720c..b02a5bd304bbc 100644 --- a/google/cloud/channel/v1/cloud_channel_client.h +++ b/google/cloud/channel/v1/cloud_channel_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/cloud_channel_connection.h b/google/cloud/channel/v1/cloud_channel_connection.h index 0ec28e6728247..c5cbedb009859 100644 --- a/google/cloud/channel/v1/cloud_channel_connection.h +++ b/google/cloud/channel/v1/cloud_channel_connection.h @@ -21,6 +21,8 @@ #include "google/cloud/channel/v1/cloud_channel_connection_idempotency_policy.h" #include "google/cloud/channel/v1/internal/cloud_channel_retry_traits.h" +#include "google/cloud/channel/v1/operations.pb.h" +#include "google/cloud/channel/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/channel/v1/cloud_channel_connection_idempotency_policy.h b/google/cloud/channel/v1/cloud_channel_connection_idempotency_policy.h index 62d4db160aa35..0e124e9158ccb 100644 --- a/google/cloud/channel/v1/cloud_channel_connection_idempotency_policy.h +++ b/google/cloud/channel/v1/cloud_channel_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/channel/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/channel/v1/cloud_channel_reports_client.h b/google/cloud/channel/v1/cloud_channel_reports_client.h index d349accf1a6fc..0afe404f80921 100644 --- a/google/cloud/channel/v1/cloud_channel_reports_client.h +++ b/google/cloud/channel/v1/cloud_channel_reports_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/cloud_channel_reports_connection.h b/google/cloud/channel/v1/cloud_channel_reports_connection.h index 9c887fd5acf50..08a093a3930a3 100644 --- a/google/cloud/channel/v1/cloud_channel_reports_connection.h +++ b/google/cloud/channel/v1/cloud_channel_reports_connection.h @@ -21,6 +21,8 @@ #include "google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h" #include "google/cloud/channel/v1/internal/cloud_channel_reports_retry_traits.h" +#include "google/cloud/channel/v1/operations.pb.h" +#include "google/cloud/channel/v1/reports_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h b/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h index a6a7424863161..5ea53e81d3985 100644 --- a/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h +++ b/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/channel/v1/reports_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.cc index 4a0cc61e80317..f5342bd29d84e 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/channel/v1/service.proto #include "google/cloud/channel/v1/internal/cloud_channel_auth_decorator.h" -#include +#include "google/cloud/channel/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.h index aee4d6b999693..b6edeee7e2ce0 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.h +++ b/google/cloud/channel/v1/internal/cloud_channel_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/channel/v1/internal/cloud_channel_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_connection_impl.h b/google/cloud/channel/v1/internal/cloud_channel_connection_impl.h index ead015cc32d79..85f902b90b18a 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_connection_impl.h +++ b/google/cloud/channel/v1/internal/cloud_channel_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.cc index 9588713bda69c..c0ffb7838767d 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/channel/v1/service.proto #include "google/cloud/channel/v1/internal/cloud_channel_logging_decorator.h" +#include "google/cloud/channel/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.h index 7aa2607885ef5..df49c17786f8d 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.h +++ b/google/cloud/channel/v1/internal/cloud_channel_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/channel/v1/internal/cloud_channel_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.cc index 2e7206be445c1..44da045fcad4e 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/channel/v1/service.proto #include "google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.h" +#include "google/cloud/channel/v1/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 #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.h index d78046e855f1e..a0145e9c6efdc 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.h +++ b/google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/channel/v1/internal/cloud_channel_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc index de6c83addd0f7..04521ec5f408e 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/channel/v1/reports_service.proto #include "google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h" -#include +#include "google/cloud/channel/v1/reports_service.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h index e85a1f1fa6850..4d9b7b4a44441 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/channel/v1/internal/cloud_channel_reports_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h b/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h index bcbb394c2a822..e878e811e67f4 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc index ae543652e5b16..dae5a03c0484f 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/channel/v1/reports_service.proto #include "google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h" +#include "google/cloud/channel/v1/reports_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h index 3f684aee67146..b6e3918423274 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/channel/v1/internal/cloud_channel_reports_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc index bc044f97300f5..63b53ee2fbe95 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/channel/v1/reports_service.proto #include "google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h" +#include "google/cloud/channel/v1/reports_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 #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h index f5dcf7a0088e1..407d20a180254 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/channel/v1/internal/cloud_channel_reports_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc index aa567a8d3a89f..279802b675d88 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/channel/v1/reports_service.proto #include "google/cloud/channel/v1/internal/cloud_channel_reports_stub.h" +#include "google/cloud/channel/v1/reports_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h index 3f9f864a9b297..b653f95f267d5 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_STUB_H +#include "google/cloud/channel/v1/operations.pb.h" +#include "google/cloud/channel/v1/reports_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc index c9d47efa3b930..96025dcbb69fc 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h" #include "google/cloud/channel/v1/internal/cloud_channel_reports_stub.h" #include "google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h" +#include "google/cloud/channel/v1/reports_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc index b81bc97be669e..0fa6cc41b3666 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudChannelReportsServiceTracingConnection:: CloudChannelReportsServiceTracingConnection( std::shared_ptr child) @@ -120,17 +118,13 @@ Status CloudChannelReportsServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudChannelReportsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h index 1e76d8af0e401..a87c1ed61b7fc 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudChannelReportsServiceTracingConnection : public channel_v1::CloudChannelReportsServiceConnection { public: @@ -73,8 +71,6 @@ class CloudChannelReportsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc index ce153912ae552..a70daf32df51c 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudChannelReportsServiceTracingStub::CloudChannelReportsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -157,17 +155,11 @@ future CloudChannelReportsServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudChannelReportsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h index 14bf63f41bc3e..aca4fd3baaf04 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudChannelReportsServiceTracingStub : public CloudChannelReportsServiceStub { public: @@ -94,8 +92,6 @@ class CloudChannelReportsServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/channel/v1/internal/cloud_channel_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_stub.cc index 0ad92f342fa49..7380c6a193ec5 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/channel/v1/service.proto #include "google/cloud/channel/v1/internal/cloud_channel_stub.h" +#include "google/cloud/channel/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_stub.h b/google/cloud/channel/v1/internal/cloud_channel_stub.h index 6b7bb835f04a8..1ca7254012dcc 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_stub.h +++ b/google/cloud/channel/v1/internal/cloud_channel_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_STUB_H +#include "google/cloud/channel/v1/operations.pb.h" +#include "google/cloud/channel/v1/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc b/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc index 88a5583af633a..bd6eaf1ae02a1 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/channel/v1/internal/cloud_channel_metadata_decorator.h" #include "google/cloud/channel/v1/internal/cloud_channel_stub.h" #include "google/cloud/channel/v1/internal/cloud_channel_tracing_stub.h" +#include "google/cloud/channel/v1/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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc b/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc index 672ae3d06a808..1627d8fedb6fe 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudChannelServiceTracingConnection::CloudChannelServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -819,17 +817,13 @@ Status CloudChannelServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudChannelServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.h b/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.h index 6d26fbb179696..3b50746e24413 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.h +++ b/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudChannelServiceTracingConnection : public channel_v1::CloudChannelServiceConnection { public: @@ -350,8 +348,6 @@ class CloudChannelServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc index 02c87a30d0370..fbbd2680a7aa8 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudChannelServiceTracingStub::CloudChannelServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -909,15 +907,9 @@ future CloudChannelServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudChannelServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.h b/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.h index 3842087878f33..7ae285886e62d 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.h +++ b/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace channel_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudChannelServiceTracingStub : public CloudChannelServiceStub { public: ~CloudChannelServiceTracingStub() override = default; @@ -409,8 +407,6 @@ class CloudChannelServiceTracingStub : public CloudChannelServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/chronicle/BUILD.bazel b/google/cloud/chronicle/BUILD.bazel index cb61c2ee5b520..e74ae0ccf533e 100644 --- a/google/cloud/chronicle/BUILD.bazel +++ b/google/cloud/chronicle/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/chronicle/v1:chronicle_cc_grpc", + "@googleapis//google/cloud/chronicle/v1:chronicle_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/chronicle/v1/data_access_control_connection.h b/google/cloud/chronicle/v1/data_access_control_connection.h index 1f8e5fceec5f2..bd79ba6a5ae6a 100644 --- a/google/cloud/chronicle/v1/data_access_control_connection.h +++ b/google/cloud/chronicle/v1/data_access_control_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_DATA_ACCESS_CONTROL_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_DATA_ACCESS_CONTROL_CONNECTION_H +#include "google/cloud/chronicle/v1/data_access_control.pb.h" #include "google/cloud/chronicle/v1/data_access_control_connection_idempotency_policy.h" #include "google/cloud/chronicle/v1/internal/data_access_control_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/chronicle/v1/data_access_control_connection_idempotency_policy.h b/google/cloud/chronicle/v1/data_access_control_connection_idempotency_policy.h index d301a6e432278..b23edf91309e4 100644 --- a/google/cloud/chronicle/v1/data_access_control_connection_idempotency_policy.h +++ b/google/cloud/chronicle/v1/data_access_control_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_DATA_ACCESS_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_DATA_ACCESS_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/chronicle/v1/data_access_control.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/chronicle/v1/entity_connection.h b/google/cloud/chronicle/v1/entity_connection.h index 60dcb4b15c634..e74f0b148449f 100644 --- a/google/cloud/chronicle/v1/entity_connection.h +++ b/google/cloud/chronicle/v1/entity_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_ENTITY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_ENTITY_CONNECTION_H +#include "google/cloud/chronicle/v1/entity.pb.h" #include "google/cloud/chronicle/v1/entity_connection_idempotency_policy.h" #include "google/cloud/chronicle/v1/internal/entity_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/chronicle/v1/entity_connection_idempotency_policy.h b/google/cloud/chronicle/v1/entity_connection_idempotency_policy.h index 36a2e36918dee..41c9f279cc395 100644 --- a/google/cloud/chronicle/v1/entity_connection_idempotency_policy.h +++ b/google/cloud/chronicle/v1/entity_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_ENTITY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_ENTITY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/chronicle/v1/entity.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/chronicle/v1/instance_connection.h b/google/cloud/chronicle/v1/instance_connection.h index 1ebbffab66389..da080a9fff4a9 100644 --- a/google/cloud/chronicle/v1/instance_connection.h +++ b/google/cloud/chronicle/v1/instance_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INSTANCE_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INSTANCE_CONNECTION_H +#include "google/cloud/chronicle/v1/instance.pb.h" #include "google/cloud/chronicle/v1/instance_connection_idempotency_policy.h" #include "google/cloud/chronicle/v1/internal/instance_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/chronicle/v1/instance_connection_idempotency_policy.h b/google/cloud/chronicle/v1/instance_connection_idempotency_policy.h index 9f9d1b51b0074..ee33464c1ed63 100644 --- a/google/cloud/chronicle/v1/instance_connection_idempotency_policy.h +++ b/google/cloud/chronicle/v1/instance_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INSTANCE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INSTANCE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/chronicle/v1/instance.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/chronicle/v1/internal/data_access_control_auth_decorator.cc b/google/cloud/chronicle/v1/internal/data_access_control_auth_decorator.cc index 0883a28a57a98..25d5a14f91a4a 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_auth_decorator.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/chronicle/v1/data_access_control.proto #include "google/cloud/chronicle/v1/internal/data_access_control_auth_decorator.h" -#include +#include "google/cloud/chronicle/v1/data_access_control.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/data_access_control_logging_decorator.cc b/google/cloud/chronicle/v1/internal/data_access_control_logging_decorator.cc index b8171aa291fe9..b6ee9951482b2 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_logging_decorator.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/data_access_control.proto #include "google/cloud/chronicle/v1/internal/data_access_control_logging_decorator.h" +#include "google/cloud/chronicle/v1/data_access_control.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/chronicle/v1/internal/data_access_control_metadata_decorator.cc b/google/cloud/chronicle/v1/internal/data_access_control_metadata_decorator.cc index f474a24eeda5a..e4e9d2e05b677 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_metadata_decorator.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/chronicle/v1/data_access_control.proto #include "google/cloud/chronicle/v1/internal/data_access_control_metadata_decorator.h" +#include "google/cloud/chronicle/v1/data_access_control.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 #include #include #include diff --git a/google/cloud/chronicle/v1/internal/data_access_control_stub.cc b/google/cloud/chronicle/v1/internal/data_access_control_stub.cc index b9bbb92ae2bd7..39f777af6b494 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_stub.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/data_access_control.proto #include "google/cloud/chronicle/v1/internal/data_access_control_stub.h" +#include "google/cloud/chronicle/v1/data_access_control.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/chronicle/v1/internal/data_access_control_stub.h b/google/cloud/chronicle/v1/internal/data_access_control_stub.h index c712cc8bef942..499664c865df5 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_stub.h +++ b/google/cloud/chronicle/v1/internal/data_access_control_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_DATA_ACCESS_CONTROL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_DATA_ACCESS_CONTROL_STUB_H +#include "google/cloud/chronicle/v1/data_access_control.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/data_access_control_stub_factory.cc b/google/cloud/chronicle/v1/internal/data_access_control_stub_factory.cc index 88767096de9f4..ae0e1a0ab7107 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_stub_factory.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/chronicle/v1/data_access_control.proto #include "google/cloud/chronicle/v1/internal/data_access_control_stub_factory.h" +#include "google/cloud/chronicle/v1/data_access_control.grpc.pb.h" #include "google/cloud/chronicle/v1/internal/data_access_control_auth_decorator.h" #include "google/cloud/chronicle/v1/internal/data_access_control_logging_decorator.h" #include "google/cloud/chronicle/v1/internal/data_access_control_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.cc b/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.cc index 01acaa41bdb5c..6e3880499aafd 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataAccessControlServiceTracingConnection:: DataAccessControlServiceTracingConnection( std::shared_ptr child) @@ -170,17 +168,13 @@ Status DataAccessControlServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataAccessControlServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.h b/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.h index 6e0eb2b21f97e..664a0ccc56d03 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.h +++ b/google/cloud/chronicle/v1/internal/data_access_control_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataAccessControlServiceTracingConnection : public chronicle_v1::DataAccessControlServiceConnection { public: @@ -96,8 +94,6 @@ class DataAccessControlServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.cc b/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.cc index 53c62ace43d35..44506249a88f9 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.cc +++ b/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataAccessControlServiceTracingStub::DataAccessControlServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -206,16 +204,10 @@ Status DataAccessControlServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataAccessControlServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.h b/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.h index 522314e6a8301..462e358cb7169 100644 --- a/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.h +++ b/google/cloud/chronicle/v1/internal/data_access_control_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataAccessControlServiceTracingStub : public DataAccessControlServiceStub { public: @@ -114,8 +112,6 @@ class DataAccessControlServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/chronicle/v1/internal/entity_auth_decorator.cc b/google/cloud/chronicle/v1/internal/entity_auth_decorator.cc index cbb71885cb326..c3450e7ac7380 100644 --- a/google/cloud/chronicle/v1/internal/entity_auth_decorator.cc +++ b/google/cloud/chronicle/v1/internal/entity_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/chronicle/v1/entity.proto #include "google/cloud/chronicle/v1/internal/entity_auth_decorator.h" -#include +#include "google/cloud/chronicle/v1/entity.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/entity_logging_decorator.cc b/google/cloud/chronicle/v1/internal/entity_logging_decorator.cc index a6d1eb0439248..2fec9b2048dbf 100644 --- a/google/cloud/chronicle/v1/internal/entity_logging_decorator.cc +++ b/google/cloud/chronicle/v1/internal/entity_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/entity.proto #include "google/cloud/chronicle/v1/internal/entity_logging_decorator.h" +#include "google/cloud/chronicle/v1/entity.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/chronicle/v1/internal/entity_metadata_decorator.cc b/google/cloud/chronicle/v1/internal/entity_metadata_decorator.cc index 1a2e50788c3b9..a7b9b77d6faef 100644 --- a/google/cloud/chronicle/v1/internal/entity_metadata_decorator.cc +++ b/google/cloud/chronicle/v1/internal/entity_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/chronicle/v1/entity.proto #include "google/cloud/chronicle/v1/internal/entity_metadata_decorator.h" +#include "google/cloud/chronicle/v1/entity.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 #include #include #include diff --git a/google/cloud/chronicle/v1/internal/entity_stub.cc b/google/cloud/chronicle/v1/internal/entity_stub.cc index cd7d6190cfe11..2a5e238bffc03 100644 --- a/google/cloud/chronicle/v1/internal/entity_stub.cc +++ b/google/cloud/chronicle/v1/internal/entity_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/entity.proto #include "google/cloud/chronicle/v1/internal/entity_stub.h" +#include "google/cloud/chronicle/v1/entity.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/chronicle/v1/internal/entity_stub.h b/google/cloud/chronicle/v1/internal/entity_stub.h index 1a404d8cea01f..68a09d3405bb4 100644 --- a/google/cloud/chronicle/v1/internal/entity_stub.h +++ b/google/cloud/chronicle/v1/internal/entity_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_ENTITY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_ENTITY_STUB_H +#include "google/cloud/chronicle/v1/entity.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/entity_stub_factory.cc b/google/cloud/chronicle/v1/internal/entity_stub_factory.cc index 1eb8e5bc733ed..33e41f41bbab8 100644 --- a/google/cloud/chronicle/v1/internal/entity_stub_factory.cc +++ b/google/cloud/chronicle/v1/internal/entity_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/chronicle/v1/entity.proto #include "google/cloud/chronicle/v1/internal/entity_stub_factory.h" +#include "google/cloud/chronicle/v1/entity.grpc.pb.h" #include "google/cloud/chronicle/v1/internal/entity_auth_decorator.h" #include "google/cloud/chronicle/v1/internal/entity_logging_decorator.h" #include "google/cloud/chronicle/v1/internal/entity_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/entity_tracing_connection.cc b/google/cloud/chronicle/v1/internal/entity_tracing_connection.cc index 2c5ab9df0177c..22f71bcea1295 100644 --- a/google/cloud/chronicle/v1/internal/entity_tracing_connection.cc +++ b/google/cloud/chronicle/v1/internal/entity_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EntityServiceTracingConnection::EntityServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -115,16 +113,12 @@ Status EntityServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEntityServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/chronicle/v1/internal/entity_tracing_connection.h b/google/cloud/chronicle/v1/internal/entity_tracing_connection.h index 47cc97ae44925..cc4ca4e810be3 100644 --- a/google/cloud/chronicle/v1/internal/entity_tracing_connection.h +++ b/google/cloud/chronicle/v1/internal/entity_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EntityServiceTracingConnection : public chronicle_v1::EntityServiceConnection { public: @@ -75,8 +73,6 @@ class EntityServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/chronicle/v1/internal/entity_tracing_stub.cc b/google/cloud/chronicle/v1/internal/entity_tracing_stub.cc index adf91a5bba8d2..1c2035a9f7cbc 100644 --- a/google/cloud/chronicle/v1/internal/entity_tracing_stub.cc +++ b/google/cloud/chronicle/v1/internal/entity_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EntityServiceTracingStub::EntityServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -136,15 +134,9 @@ Status EntityServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEntityServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/chronicle/v1/internal/entity_tracing_stub.h b/google/cloud/chronicle/v1/internal/entity_tracing_stub.h index 2aba006cc1652..67fd6e9f9e209 100644 --- a/google/cloud/chronicle/v1/internal/entity_tracing_stub.h +++ b/google/cloud/chronicle/v1/internal/entity_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EntityServiceTracingStub : public EntityServiceStub { public: ~EntityServiceTracingStub() override = default; @@ -85,8 +83,6 @@ class EntityServiceTracingStub : public EntityServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/chronicle/v1/internal/instance_auth_decorator.cc b/google/cloud/chronicle/v1/internal/instance_auth_decorator.cc index 5539c5be18f62..a282e122fd937 100644 --- a/google/cloud/chronicle/v1/internal/instance_auth_decorator.cc +++ b/google/cloud/chronicle/v1/internal/instance_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/chronicle/v1/instance.proto #include "google/cloud/chronicle/v1/internal/instance_auth_decorator.h" -#include +#include "google/cloud/chronicle/v1/instance.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/instance_logging_decorator.cc b/google/cloud/chronicle/v1/internal/instance_logging_decorator.cc index 3e25154707887..a7723de51e4ee 100644 --- a/google/cloud/chronicle/v1/internal/instance_logging_decorator.cc +++ b/google/cloud/chronicle/v1/internal/instance_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/instance.proto #include "google/cloud/chronicle/v1/internal/instance_logging_decorator.h" +#include "google/cloud/chronicle/v1/instance.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/chronicle/v1/internal/instance_metadata_decorator.cc b/google/cloud/chronicle/v1/internal/instance_metadata_decorator.cc index 7c123955e7f0b..4060369ee39a9 100644 --- a/google/cloud/chronicle/v1/internal/instance_metadata_decorator.cc +++ b/google/cloud/chronicle/v1/internal/instance_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/chronicle/v1/instance.proto #include "google/cloud/chronicle/v1/internal/instance_metadata_decorator.h" +#include "google/cloud/chronicle/v1/instance.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 #include #include #include diff --git a/google/cloud/chronicle/v1/internal/instance_stub.cc b/google/cloud/chronicle/v1/internal/instance_stub.cc index 2f40ff4484566..29ed05cca737e 100644 --- a/google/cloud/chronicle/v1/internal/instance_stub.cc +++ b/google/cloud/chronicle/v1/internal/instance_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/instance.proto #include "google/cloud/chronicle/v1/internal/instance_stub.h" +#include "google/cloud/chronicle/v1/instance.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/chronicle/v1/internal/instance_stub.h b/google/cloud/chronicle/v1/internal/instance_stub.h index e434675f51dab..ea605b3d41db9 100644 --- a/google/cloud/chronicle/v1/internal/instance_stub.h +++ b/google/cloud/chronicle/v1/internal/instance_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_INSTANCE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_INSTANCE_STUB_H +#include "google/cloud/chronicle/v1/instance.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/instance_stub_factory.cc b/google/cloud/chronicle/v1/internal/instance_stub_factory.cc index f4398575b0ff4..0847ce3fc4b09 100644 --- a/google/cloud/chronicle/v1/internal/instance_stub_factory.cc +++ b/google/cloud/chronicle/v1/internal/instance_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/chronicle/v1/instance.proto #include "google/cloud/chronicle/v1/internal/instance_stub_factory.h" +#include "google/cloud/chronicle/v1/instance.grpc.pb.h" #include "google/cloud/chronicle/v1/internal/instance_auth_decorator.h" #include "google/cloud/chronicle/v1/internal/instance_logging_decorator.h" #include "google/cloud/chronicle/v1/internal/instance_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/instance_tracing_connection.cc b/google/cloud/chronicle/v1/internal/instance_tracing_connection.cc index a1c834c5919d8..b8f12aa568096 100644 --- a/google/cloud/chronicle/v1/internal/instance_tracing_connection.cc +++ b/google/cloud/chronicle/v1/internal/instance_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceServiceTracingConnection::InstanceServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -78,16 +76,12 @@ Status InstanceServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/chronicle/v1/internal/instance_tracing_connection.h b/google/cloud/chronicle/v1/internal/instance_tracing_connection.h index 0337e5b5c4585..51827ff014df9 100644 --- a/google/cloud/chronicle/v1/internal/instance_tracing_connection.h +++ b/google/cloud/chronicle/v1/internal/instance_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceServiceTracingConnection : public chronicle_v1::InstanceServiceConnection { public: @@ -59,8 +57,6 @@ class InstanceServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/chronicle/v1/internal/instance_tracing_stub.cc b/google/cloud/chronicle/v1/internal/instance_tracing_stub.cc index 3bc224e248793..38725131f7c36 100644 --- a/google/cloud/chronicle/v1/internal/instance_tracing_stub.cc +++ b/google/cloud/chronicle/v1/internal/instance_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceServiceTracingStub::InstanceServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -90,15 +88,9 @@ Status InstanceServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/chronicle/v1/internal/instance_tracing_stub.h b/google/cloud/chronicle/v1/internal/instance_tracing_stub.h index 106a8ec4e342e..441b3d1f7a448 100644 --- a/google/cloud/chronicle/v1/internal/instance_tracing_stub.h +++ b/google/cloud/chronicle/v1/internal/instance_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceServiceTracingStub : public InstanceServiceStub { public: ~InstanceServiceTracingStub() override = default; @@ -65,8 +63,6 @@ class InstanceServiceTracingStub : public InstanceServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/chronicle/v1/internal/reference_list_auth_decorator.cc b/google/cloud/chronicle/v1/internal/reference_list_auth_decorator.cc index 0b846f6b538bd..6123c0169b170 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_auth_decorator.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/chronicle/v1/reference_list.proto #include "google/cloud/chronicle/v1/internal/reference_list_auth_decorator.h" -#include +#include "google/cloud/chronicle/v1/reference_list.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/reference_list_logging_decorator.cc b/google/cloud/chronicle/v1/internal/reference_list_logging_decorator.cc index abe604a50514a..94d25f121bee0 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_logging_decorator.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/reference_list.proto #include "google/cloud/chronicle/v1/internal/reference_list_logging_decorator.h" +#include "google/cloud/chronicle/v1/reference_list.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/chronicle/v1/internal/reference_list_metadata_decorator.cc b/google/cloud/chronicle/v1/internal/reference_list_metadata_decorator.cc index e9c53e44abb33..46544cc6d8b3d 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_metadata_decorator.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/chronicle/v1/reference_list.proto #include "google/cloud/chronicle/v1/internal/reference_list_metadata_decorator.h" +#include "google/cloud/chronicle/v1/reference_list.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 #include #include #include diff --git a/google/cloud/chronicle/v1/internal/reference_list_stub.cc b/google/cloud/chronicle/v1/internal/reference_list_stub.cc index 4a2e266bd3bdd..593e2c97d4cb5 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_stub.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/reference_list.proto #include "google/cloud/chronicle/v1/internal/reference_list_stub.h" +#include "google/cloud/chronicle/v1/reference_list.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/chronicle/v1/internal/reference_list_stub.h b/google/cloud/chronicle/v1/internal/reference_list_stub.h index 2497249414676..543af4d6aecf1 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_stub.h +++ b/google/cloud/chronicle/v1/internal/reference_list_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_REFERENCE_LIST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_REFERENCE_LIST_STUB_H +#include "google/cloud/chronicle/v1/reference_list.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/reference_list_stub_factory.cc b/google/cloud/chronicle/v1/internal/reference_list_stub_factory.cc index 52e5210f62b04..5b2c56ca01dc5 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_stub_factory.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/chronicle/v1/internal/reference_list_metadata_decorator.h" #include "google/cloud/chronicle/v1/internal/reference_list_stub.h" #include "google/cloud/chronicle/v1/internal/reference_list_tracing_stub.h" +#include "google/cloud/chronicle/v1/reference_list.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.cc b/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.cc index b13725bf0eb8f..3959b926b0ae4 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReferenceListServiceTracingConnection::ReferenceListServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -108,17 +106,13 @@ Status ReferenceListServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReferenceListServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.h b/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.h index caa10fec97bc4..b973808cb3902 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.h +++ b/google/cloud/chronicle/v1/internal/reference_list_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReferenceListServiceTracingConnection : public chronicle_v1::ReferenceListServiceConnection { public: @@ -71,8 +69,6 @@ class ReferenceListServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.cc b/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.cc index 0d42dfc86bbae..c75d0367f64f2 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.cc +++ b/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReferenceListServiceTracingStub::ReferenceListServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -126,15 +124,9 @@ Status ReferenceListServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReferenceListServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.h b/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.h index f825e660f8e88..e169754f0eea6 100644 --- a/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.h +++ b/google/cloud/chronicle/v1/internal/reference_list_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReferenceListServiceTracingStub : public ReferenceListServiceStub { public: ~ReferenceListServiceTracingStub() override = default; @@ -82,8 +80,6 @@ class ReferenceListServiceTracingStub : public ReferenceListServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/chronicle/v1/internal/rule_auth_decorator.cc b/google/cloud/chronicle/v1/internal/rule_auth_decorator.cc index c78084a277d8b..634b533da5a4e 100644 --- a/google/cloud/chronicle/v1/internal/rule_auth_decorator.cc +++ b/google/cloud/chronicle/v1/internal/rule_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/chronicle/v1/rule.proto #include "google/cloud/chronicle/v1/internal/rule_auth_decorator.h" -#include +#include "google/cloud/chronicle/v1/rule.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_auth_decorator.h b/google/cloud/chronicle/v1/internal/rule_auth_decorator.h index 143dc06330f98..605995eaf80b5 100644 --- a/google/cloud/chronicle/v1/internal/rule_auth_decorator.h +++ b/google/cloud/chronicle/v1/internal/rule_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/chronicle/v1/internal/rule_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_connection_impl.h b/google/cloud/chronicle/v1/internal/rule_connection_impl.h index dd57661095737..f4ac4846aeb69 100644 --- a/google/cloud/chronicle/v1/internal/rule_connection_impl.h +++ b/google/cloud/chronicle/v1/internal/rule_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/chronicle/v1/internal/rule_logging_decorator.cc b/google/cloud/chronicle/v1/internal/rule_logging_decorator.cc index bd6fc3621d389..023dc933c0b74 100644 --- a/google/cloud/chronicle/v1/internal/rule_logging_decorator.cc +++ b/google/cloud/chronicle/v1/internal/rule_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/chronicle/v1/rule.proto #include "google/cloud/chronicle/v1/internal/rule_logging_decorator.h" +#include "google/cloud/chronicle/v1/rule.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_logging_decorator.h b/google/cloud/chronicle/v1/internal/rule_logging_decorator.h index ce752da559723..1e1b794716f29 100644 --- a/google/cloud/chronicle/v1/internal/rule_logging_decorator.h +++ b/google/cloud/chronicle/v1/internal/rule_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/chronicle/v1/internal/rule_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_metadata_decorator.cc b/google/cloud/chronicle/v1/internal/rule_metadata_decorator.cc index 05fb39870b36b..7d8055c2b8b1b 100644 --- a/google/cloud/chronicle/v1/internal/rule_metadata_decorator.cc +++ b/google/cloud/chronicle/v1/internal/rule_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/chronicle/v1/rule.proto #include "google/cloud/chronicle/v1/internal/rule_metadata_decorator.h" +#include "google/cloud/chronicle/v1/rule.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 #include #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_metadata_decorator.h b/google/cloud/chronicle/v1/internal/rule_metadata_decorator.h index faf93bf4ebcdc..e05d9750b5d36 100644 --- a/google/cloud/chronicle/v1/internal/rule_metadata_decorator.h +++ b/google/cloud/chronicle/v1/internal/rule_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/chronicle/v1/internal/rule_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_stub.cc b/google/cloud/chronicle/v1/internal/rule_stub.cc index 2f803b3d564c1..c26a0a440f629 100644 --- a/google/cloud/chronicle/v1/internal/rule_stub.cc +++ b/google/cloud/chronicle/v1/internal/rule_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/chronicle/v1/rule.proto #include "google/cloud/chronicle/v1/internal/rule_stub.h" +#include "google/cloud/chronicle/v1/rule.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_stub.h b/google/cloud/chronicle/v1/internal/rule_stub.h index 7b11cf8b99e27..9c6910faf2d24 100644 --- a/google/cloud/chronicle/v1/internal/rule_stub.h +++ b/google/cloud/chronicle/v1/internal/rule_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_RULE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_INTERNAL_RULE_STUB_H +#include "google/cloud/chronicle/v1/rule.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_stub_factory.cc b/google/cloud/chronicle/v1/internal/rule_stub_factory.cc index bc6865e1a72c9..a3c7fac892fc1 100644 --- a/google/cloud/chronicle/v1/internal/rule_stub_factory.cc +++ b/google/cloud/chronicle/v1/internal/rule_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/chronicle/v1/internal/rule_metadata_decorator.h" #include "google/cloud/chronicle/v1/internal/rule_stub.h" #include "google/cloud/chronicle/v1/internal/rule_tracing_stub.h" +#include "google/cloud/chronicle/v1/rule.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/chronicle/v1/internal/rule_tracing_connection.cc b/google/cloud/chronicle/v1/internal/rule_tracing_connection.cc index 4228c83a06ad0..24e81551bf57d 100644 --- a/google/cloud/chronicle/v1/internal/rule_tracing_connection.cc +++ b/google/cloud/chronicle/v1/internal/rule_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RuleServiceTracingConnection::RuleServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -205,16 +203,12 @@ Status RuleServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRuleServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/chronicle/v1/internal/rule_tracing_connection.h b/google/cloud/chronicle/v1/internal/rule_tracing_connection.h index 6014919b587c1..00f9e9410d162 100644 --- a/google/cloud/chronicle/v1/internal/rule_tracing_connection.h +++ b/google/cloud/chronicle/v1/internal/rule_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RuleServiceTracingConnection : public chronicle_v1::RuleServiceConnection { public: @@ -105,8 +103,6 @@ class RuleServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/chronicle/v1/internal/rule_tracing_stub.cc b/google/cloud/chronicle/v1/internal/rule_tracing_stub.cc index 4801020c0913f..f27e5c3e39dde 100644 --- a/google/cloud/chronicle/v1/internal/rule_tracing_stub.cc +++ b/google/cloud/chronicle/v1/internal/rule_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RuleServiceTracingStub::RuleServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -260,15 +258,9 @@ future RuleServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRuleServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/chronicle/v1/internal/rule_tracing_stub.h b/google/cloud/chronicle/v1/internal/rule_tracing_stub.h index 99b938f41d0c5..0be33e6f281df 100644 --- a/google/cloud/chronicle/v1/internal/rule_tracing_stub.h +++ b/google/cloud/chronicle/v1/internal/rule_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace chronicle_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RuleServiceTracingStub : public RuleServiceStub { public: ~RuleServiceTracingStub() override = default; @@ -136,8 +134,6 @@ class RuleServiceTracingStub : public RuleServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/chronicle/v1/reference_list_connection.h b/google/cloud/chronicle/v1/reference_list_connection.h index 52e14bf459435..d90768d5d597f 100644 --- a/google/cloud/chronicle/v1/reference_list_connection.h +++ b/google/cloud/chronicle/v1/reference_list_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_REFERENCE_LIST_CONNECTION_H #include "google/cloud/chronicle/v1/internal/reference_list_retry_traits.h" +#include "google/cloud/chronicle/v1/reference_list.pb.h" #include "google/cloud/chronicle/v1/reference_list_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/chronicle/v1/reference_list_connection_idempotency_policy.h b/google/cloud/chronicle/v1/reference_list_connection_idempotency_policy.h index 4293d09352eb5..821453a3682e8 100644 --- a/google/cloud/chronicle/v1/reference_list_connection_idempotency_policy.h +++ b/google/cloud/chronicle/v1/reference_list_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_REFERENCE_LIST_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_REFERENCE_LIST_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/chronicle/v1/reference_list.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/chronicle/v1/rule_client.h b/google/cloud/chronicle/v1/rule_client.h index c6c572b01f8ec..bad9d11c0307d 100644 --- a/google/cloud/chronicle/v1/rule_client.h +++ b/google/cloud/chronicle/v1/rule_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/chronicle/v1/rule_connection.h b/google/cloud/chronicle/v1/rule_connection.h index ed412847f655b..653908b764fb9 100644 --- a/google/cloud/chronicle/v1/rule_connection.h +++ b/google/cloud/chronicle/v1/rule_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_RULE_CONNECTION_H #include "google/cloud/chronicle/v1/internal/rule_retry_traits.h" +#include "google/cloud/chronicle/v1/rule.pb.h" #include "google/cloud/chronicle/v1/rule_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/chronicle/v1/rule_connection_idempotency_policy.h b/google/cloud/chronicle/v1/rule_connection_idempotency_policy.h index 06a1eb59d3ffa..287fdd6ed8cba 100644 --- a/google/cloud/chronicle/v1/rule_connection_idempotency_policy.h +++ b/google/cloud/chronicle/v1/rule_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_RULE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHRONICLE_V1_RULE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/chronicle/v1/rule.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudbuild/BUILD.bazel b/google/cloud/cloudbuild/BUILD.bazel index 6f4e41867eaaa..7eccc2b26c739 100644 --- a/google/cloud/cloudbuild/BUILD.bazel +++ b/google/cloud/cloudbuild/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/cloudbuild/v1:cloudbuild_cc_grpc", - "@com_google_googleapis//google/devtools/cloudbuild/v2:cloudbuild_cc_grpc", + "@googleapis//google/devtools/cloudbuild/v1:cloudbuild_cc_grpc", + "@googleapis//google/devtools/cloudbuild/v2:cloudbuild_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/cloudbuild/quickstart/.bazelrc b/google/cloud/cloudbuild/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/cloudbuild/quickstart/.bazelrc +++ b/google/cloud/cloudbuild/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/cloudbuild/v1/cloud_build_client.h b/google/cloud/cloudbuild/v1/cloud_build_client.h index 52906b7445f19..ddcd57c8c76ca 100644 --- a/google/cloud/cloudbuild/v1/cloud_build_client.h +++ b/google/cloud/cloudbuild/v1/cloud_build_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v1/cloud_build_connection.h b/google/cloud/cloudbuild/v1/cloud_build_connection.h index 18d9eff75627f..3f112924e1363 100644 --- a/google/cloud/cloudbuild/v1/cloud_build_connection.h +++ b/google/cloud/cloudbuild/v1/cloud_build_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudbuild/v1/cloud_build_connection_idempotency_policy.h b/google/cloud/cloudbuild/v1/cloud_build_connection_idempotency_policy.h index 5c7129afbfc58..b88d73db53fd6 100644 --- a/google/cloud/cloudbuild/v1/cloud_build_connection_idempotency_policy.h +++ b/google/cloud/cloudbuild/v1/cloud_build_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.cc index 9aa458c6ab286..1c93990fae1c6 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/cloudbuild/v1/cloudbuild.proto #include "google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.h" -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.h b/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.h index b7acdb2835a13..bf0ddf41f45ff 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudbuild/v1/internal/cloud_build_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_connection_impl.h b/google/cloud/cloudbuild/v1/internal/cloud_build_connection_impl.h index d4f74776629ca..b19634b925c16 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_connection_impl.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.cc index 606744afef08d..ed5d18a01259e 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.h b/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.h index cd3c045d183a7..4347a04389437 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudbuild/v1/internal/cloud_build_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.cc index 12f94aa083435..6493cd2b31036 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.h b/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.h index 5b3bfdcf65cb1..b86c0ae6eb969 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudbuild/v1/internal/cloud_build_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc index 03cca5c99d1ed..d56c321b7a5e9 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/cloudbuild/v1/internal/cloud_build_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h index 1d2a9433cbbd0..f94c18db33a47 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_stub_factory.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_stub_factory.cc index 328b5a4490a5a..9477672f9cda1 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_stub_factory.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/devtools/cloudbuild/v1/cloudbuild.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc index 5a29e0adc3c25..cb4da7e6e5509 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudbuild_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudBuildTracingConnection::CloudBuildTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -358,16 +356,12 @@ CloudBuildTracingConnection::GetDefaultServiceAccount( return internal::EndSpan(*span, child_->GetDefaultServiceAccount(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudBuildTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.h b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.h index aa869ff6da9cf..2c84b90a1d779 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudbuild_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudBuildTracingConnection : public cloudbuild_v1::CloudBuildConnection { public: ~CloudBuildTracingConnection() override = default; @@ -181,8 +179,6 @@ class CloudBuildTracingConnection : public cloudbuild_v1::CloudBuildConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc index f2c96b12e436d..adf5114714375 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudbuild_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudBuildTracingStub::CloudBuildTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -391,15 +389,9 @@ future CloudBuildTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudBuildTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.h b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.h index f666b99db0bc6..ce52c17725b4f 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudbuild_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudBuildTracingStub : public CloudBuildStub { public: ~CloudBuildTracingStub() override = default; @@ -204,8 +202,6 @@ class CloudBuildTracingStub : public CloudBuildStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.cc index 9e138c0b78e32..ebffff7c9fc4e 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/cloudbuild/v2/repositories.proto #include "google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.h" -#include +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.h b/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.h index 6e6c9f24314cc..798f2966fc2bf 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudbuild/v2/internal/repository_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_connection_impl.h b/google/cloud/cloudbuild/v2/internal/repository_manager_connection_impl.h index 5e52aa52ac165..a519b8b044698 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_connection_impl.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.cc index 02145614dd495..b9b69d3a16f8b 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.h b/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.h index ebed4bf03e31c..586745581206b 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudbuild/v2/internal/repository_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.cc index c41d0353f572d..8046e0e81bf90 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.h b/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.h index e5fc51ee14216..cafb06fa96f05 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudbuild/v2/internal/repository_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc index 443fdc9416b0f..534e305df8297 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/cloudbuild/v2/internal/repository_manager_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h index 40ad0f305d4a2..e013af860e1b1 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h @@ -24,10 +24,10 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/devtools/cloudbuild/v2/cloudbuild.pb.h" +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc index 22e79cb252be1..69ac80c5e0614 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc @@ -28,9 +28,9 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc index 8baa92ccfb81b..40c3889f92d5f 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudbuild_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RepositoryManagerTracingConnection::RepositoryManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -345,17 +343,13 @@ Status RepositoryManagerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRepositoryManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.h b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.h index 30ce486e4f321..615b82f55ad67 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudbuild_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RepositoryManagerTracingConnection : public cloudbuild_v2::RepositoryManagerConnection { public: @@ -174,8 +172,6 @@ class RepositoryManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc index 0c659197212db..8db1246dde50c 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudbuild_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RepositoryManagerTracingStub::RepositoryManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -384,15 +382,9 @@ future RepositoryManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRepositoryManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.h b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.h index 4d59563cee158..38c20562cf133 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudbuild_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RepositoryManagerTracingStub : public RepositoryManagerStub { public: ~RepositoryManagerTracingStub() override = default; @@ -193,8 +191,6 @@ class RepositoryManagerTracingStub : public RepositoryManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/cloudbuild/v2/repository_manager_client.h b/google/cloud/cloudbuild/v2/repository_manager_client.h index 7f1258dd24de4..cc4d523806d0b 100644 --- a/google/cloud/cloudbuild/v2/repository_manager_client.h +++ b/google/cloud/cloudbuild/v2/repository_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudbuild/v2/repository_manager_connection.h b/google/cloud/cloudbuild/v2/repository_manager_connection.h index e5ad0d319a22f..2df6d6c23b599 100644 --- a/google/cloud/cloudbuild/v2/repository_manager_connection.h +++ b/google/cloud/cloudbuild/v2/repository_manager_connection.h @@ -30,9 +30,9 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/devtools/cloudbuild/v2/cloudbuild.pb.h" +#include "google/devtools/cloudbuild/v2/repositories.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudbuild/v2/repository_manager_connection_idempotency_policy.h b/google/cloud/cloudbuild/v2/repository_manager_connection_idempotency_policy.h index 5a49d8264f8be..351405a52bee7 100644 --- a/google/cloud/cloudbuild/v2/repository_manager_connection_idempotency_policy.h +++ b/google/cloud/cloudbuild/v2/repository_manager_connection_idempotency_policy.h @@ -21,9 +21,9 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/devtools/cloudbuild/v2/repositories.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudcontrolspartner/BUILD.bazel b/google/cloud/cloudcontrolspartner/BUILD.bazel index 0471dc9d7e7d9..6a020af37eb0d 100644 --- a/google/cloud/cloudcontrolspartner/BUILD.bazel +++ b/google/cloud/cloudcontrolspartner/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/cloudcontrolspartner/v1:cloudcontrolspartner_cc_grpc", + "@googleapis//google/cloud/cloudcontrolspartner/v1:cloudcontrolspartner_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/cloudcontrolspartner/quickstart/.bazelrc b/google/cloud/cloudcontrolspartner/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/cloudcontrolspartner/quickstart/.bazelrc +++ b/google/cloud/cloudcontrolspartner/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h index 91640272acde1..a0842ad5bb7a9 100644 --- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h +++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h" +#include "google/cloud/cloudcontrolspartner/v1/core.pb.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h index 4af283a696ccf..6903111c20944 100644 --- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h +++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection.h index 1189f591d077c..3c2a362bf8201 100644 --- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection.h +++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection_idempotency_policy.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_retry_traits.h" +#include "google/cloud/cloudcontrolspartner/v1/monitoring.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection_idempotency_policy.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection_idempotency_policy.h index 2779ee4069c37..165b3969e6f49 100644 --- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection_idempotency_policy.h +++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_monitoring_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_MONITORING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_MONITORING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/cloudcontrolspartner/v1/monitoring.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc index cb2e4b5a7a60e..90301d67584f4 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/cloudcontrolspartner/v1/core.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h" -#include +#include "google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h" #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc index c8146d10cdd73..a9021da3d22d0 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudcontrolspartner/v1/core.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h" +#include "google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc index 7a9866acd5add..12291aae43f4d 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/cloudcontrolspartner/v1/core.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h" +#include "google/cloud/cloudcontrolspartner/v1/core.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 #include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc index fa5db5180145c..1138cd2f688d9 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudcontrolspartner/v1/core.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h" +#include "google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h index fea018eeb0bf7..a58ea420eb13e 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_H +#include "google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc index a7769c2443774..6b3ec51d595fa 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/cloudcontrolspartner/v1/core.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.h" +#include "google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc index 3ca1c06f34c82..5c28d0841bbb6 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudControlsPartnerCoreTracingConnection:: CloudControlsPartnerCoreTracingConnection( std::shared_ptr< @@ -162,18 +160,14 @@ Status CloudControlsPartnerCoreTracingConnection::DeleteCustomer( return internal::EndSpan(*span, child_->DeleteCustomer(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudControlsPartnerCoreTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h index 73a380a83b226..e6e39ab34e386 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudControlsPartnerCoreTracingConnection : public cloudcontrolspartner_v1::CloudControlsPartnerCoreConnection { public: @@ -94,8 +92,6 @@ class CloudControlsPartnerCoreTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc index 20ec1742f85af..b356bdd9b2ada 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudControlsPartnerCoreTracingStub::CloudControlsPartnerCoreTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -186,16 +184,10 @@ Status CloudControlsPartnerCoreTracingStub::DeleteCustomer( child_->DeleteCustomer(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudControlsPartnerCoreTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h index 21623dfd3d980..b9c0c42f875ab 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudControlsPartnerCoreTracingStub : public CloudControlsPartnerCoreStub { public: @@ -107,8 +105,6 @@ class CloudControlsPartnerCoreTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_auth_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_auth_decorator.cc index 5fd5020ad7873..f28a7920beb07 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_auth_decorator.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/cloudcontrolspartner/v1/monitoring.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_auth_decorator.h" -#include +#include "google/cloud/cloudcontrolspartner/v1/monitoring.grpc.pb.h" #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_logging_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_logging_decorator.cc index 72241c42dbb8d..6d46c35fa4229 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_logging_decorator.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudcontrolspartner/v1/monitoring.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_logging_decorator.h" +#include "google/cloud/cloudcontrolspartner/v1/monitoring.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_metadata_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_metadata_decorator.cc index 3aae0753c892c..4a4dbe65d9483 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_metadata_decorator.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/cloudcontrolspartner/v1/monitoring.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_metadata_decorator.h" +#include "google/cloud/cloudcontrolspartner/v1/monitoring.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 #include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.cc index ff9a6f135d21a..08515a5fb75ce 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudcontrolspartner/v1/monitoring.proto #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.h" +#include "google/cloud/cloudcontrolspartner/v1/monitoring.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.h index e1020dee7b163..2707d49d0d878 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.h +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_MONITORING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_MONITORING_STUB_H +#include "google/cloud/cloudcontrolspartner/v1/monitoring.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub_factory.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub_factory.cc index 7f5e7d4dc1b08..e10bd8c80f4cf 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub_factory.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_metadata_decorator.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_stub.h" #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.h" +#include "google/cloud/cloudcontrolspartner/v1/monitoring.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 #include #include diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.cc index 64c1eb6fd7c6a..bdb57665b79a4 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudControlsPartnerMonitoringTracingConnection:: CloudControlsPartnerMonitoringTracingConnection( std::shared_ptr< @@ -60,20 +58,16 @@ CloudControlsPartnerMonitoringTracingConnection::GetViolation( return internal::EndSpan(*span, child_->GetViolation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< cloudcontrolspartner_v1::CloudControlsPartnerMonitoringConnection> MakeCloudControlsPartnerMonitoringTracingConnection( std::shared_ptr< cloudcontrolspartner_v1::CloudControlsPartnerMonitoringConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.h index 74459492a29a8..c5caecc2262ad 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.h +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudControlsPartnerMonitoringTracingConnection : public cloudcontrolspartner_v1::CloudControlsPartnerMonitoringConnection { public: @@ -56,8 +54,6 @@ class CloudControlsPartnerMonitoringTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.cc index 5aa5eb9ea3911..1b2296b11f21a 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.cc +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudControlsPartnerMonitoringTracingStub:: CloudControlsPartnerMonitoringTracingStub( std::shared_ptr child) @@ -61,17 +59,11 @@ CloudControlsPartnerMonitoringTracingStub::GetViolation( child_->GetViolation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudControlsPartnerMonitoringTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.h index 5b49beaa4b5bb..5447b0813ebf0 100644 --- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.h +++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_monitoring_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudcontrolspartner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudControlsPartnerMonitoringTracingStub : public CloudControlsPartnerMonitoringStub { public: @@ -57,8 +55,6 @@ class CloudControlsPartnerMonitoringTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/cloudquotas/BUILD.bazel b/google/cloud/cloudquotas/BUILD.bazel index 7929be1bd3354..c5960f7fe9a56 100644 --- a/google/cloud/cloudquotas/BUILD.bazel +++ b/google/cloud/cloudquotas/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/api/cloudquotas/v1:cloudquotas_cc_grpc", + "@googleapis//google/api/cloudquotas/v1:cloudquotas_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/cloudquotas/quickstart/.bazelrc b/google/cloud/cloudquotas/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/cloudquotas/quickstart/.bazelrc +++ b/google/cloud/cloudquotas/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/cloudquotas/v1/cloud_quotas_connection.h b/google/cloud/cloudquotas/v1/cloud_quotas_connection.h index 917d43bd1c271..efaf3c13b7cf9 100644 --- a/google/cloud/cloudquotas/v1/cloud_quotas_connection.h +++ b/google/cloud/cloudquotas/v1/cloud_quotas_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.pb.h" #include namespace google { diff --git a/google/cloud/cloudquotas/v1/cloud_quotas_connection_idempotency_policy.h b/google/cloud/cloudquotas/v1/cloud_quotas_connection_idempotency_policy.h index 95dd038997a5e..a4960d69bffd4 100644 --- a/google/cloud/cloudquotas/v1/cloud_quotas_connection_idempotency_policy.h +++ b/google/cloud/cloudquotas/v1/cloud_quotas_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_auth_decorator.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_auth_decorator.cc index c1519f89e0f5e..a632b34e3562c 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_auth_decorator.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/cloudquotas/v1/cloudquotas.proto #include "google/cloud/cloudquotas/v1/internal/cloud_quotas_auth_decorator.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include #include diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_logging_decorator.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_logging_decorator.cc index 7c5f62a0ae59f..892ba537bcddd 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_logging_decorator.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/cloudquotas/v1/internal/cloud_quotas_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_metadata_decorator.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_metadata_decorator.cc index 7919f263cb7a6..560b7635c4c3b 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_metadata_decorator.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.cc index b104fa391eac8..6e141efe29b04 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include #include diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.h b/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.h index 4abf7e9fbfc3c..8f9ecbaec3bb3 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.h +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include #include diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub_factory.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub_factory.cc index 422ee6ec9421a..197484d4064dc 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub_factory.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/api/cloudquotas/v1/cloudquotas.grpc.pb.h" #include #include diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.cc index eda0ac4a1374b..eaf1cb269aee0 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudquotas_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudQuotasTracingConnection::CloudQuotasTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -92,16 +90,12 @@ CloudQuotasTracingConnection::UpdateQuotaPreference( return internal::EndSpan(*span, child_->UpdateQuotaPreference(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudQuotasTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.h b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.h index 7ea809272ef85..7e08fd89ede5e 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.h +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudquotas_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudQuotasTracingConnection : public cloudquotas_v1::CloudQuotasConnection { public: @@ -67,8 +65,6 @@ class CloudQuotasTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.cc b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.cc index e54613bdd9431..ca63c595867d6 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.cc +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudquotas_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudQuotasTracingStub::CloudQuotasTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -104,15 +102,9 @@ CloudQuotasTracingStub::UpdateQuotaPreference( context, *span, child_->UpdateQuotaPreference(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudQuotasTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.h b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.h index f401ea10b2c7e..39dbcdce685cc 100644 --- a/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.h +++ b/google/cloud/cloudquotas/v1/internal/cloud_quotas_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudquotas_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudQuotasTracingStub : public CloudQuotasStub { public: ~CloudQuotasTracingStub() override = default; @@ -75,8 +73,6 @@ class CloudQuotasTracingStub : public CloudQuotasStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/cloudsecuritycompliance/BUILD.bazel b/google/cloud/cloudsecuritycompliance/BUILD.bazel index b28ec4f51d6ce..7941ef2a97956 100644 --- a/google/cloud/cloudsecuritycompliance/BUILD.bazel +++ b/google/cloud/cloudsecuritycompliance/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/cloudsecuritycompliance/v1:cloudsecuritycompliance_cc_grpc", + "@googleapis//google/cloud/cloudsecuritycompliance/v1:cloudsecuritycompliance_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/cloudsecuritycompliance/v1/config_connection.h b/google/cloud/cloudsecuritycompliance/v1/config_connection.h index f022b6c558367..a32f579853584 100644 --- a/google/cloud/cloudsecuritycompliance/v1/config_connection.h +++ b/google/cloud/cloudsecuritycompliance/v1/config_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_CONFIG_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_CONFIG_CONNECTION_H +#include "google/cloud/cloudsecuritycompliance/v1/config.pb.h" #include "google/cloud/cloudsecuritycompliance/v1/config_connection_idempotency_policy.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/config_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/cloudsecuritycompliance/v1/config_connection_idempotency_policy.h b/google/cloud/cloudsecuritycompliance/v1/config_connection_idempotency_policy.h index b4a9e65df5ea3..92fa468039262 100644 --- a/google/cloud/cloudsecuritycompliance/v1/config_connection_idempotency_policy.h +++ b/google/cloud/cloudsecuritycompliance/v1/config_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/cloudsecuritycompliance/v1/config.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudsecuritycompliance/v1/deployment_client.h b/google/cloud/cloudsecuritycompliance/v1/deployment_client.h index c1c31ef98dd49..7c3c2ca173650 100644 --- a/google/cloud/cloudsecuritycompliance/v1/deployment_client.h +++ b/google/cloud/cloudsecuritycompliance/v1/deployment_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/deployment_connection.h b/google/cloud/cloudsecuritycompliance/v1/deployment_connection.h index 21eff2cbd974a..71f94e4837bfc 100644 --- a/google/cloud/cloudsecuritycompliance/v1/deployment_connection.h +++ b/google/cloud/cloudsecuritycompliance/v1/deployment_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_DEPLOYMENT_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_DEPLOYMENT_CONNECTION_H +#include "google/cloud/cloudsecuritycompliance/v1/deployment.pb.h" #include "google/cloud/cloudsecuritycompliance/v1/deployment_connection_idempotency_policy.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudsecuritycompliance/v1/deployment_connection_idempotency_policy.h b/google/cloud/cloudsecuritycompliance/v1/deployment_connection_idempotency_policy.h index 7244ee72d7051..cd588d672dc0d 100644 --- a/google/cloud/cloudsecuritycompliance/v1/deployment_connection_idempotency_policy.h +++ b/google/cloud/cloudsecuritycompliance/v1/deployment_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_DEPLOYMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_DEPLOYMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/cloudsecuritycompliance/v1/deployment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_auth_decorator.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_auth_decorator.cc index 98a7284432885..68fbcc99762e0 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_auth_decorator.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/cloudsecuritycompliance/v1/config.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/config_auth_decorator.h" -#include +#include "google/cloud/cloudsecuritycompliance/v1/config.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_logging_decorator.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_logging_decorator.cc index 6849f22f61f79..53b14694191d7 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_logging_decorator.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudsecuritycompliance/v1/config.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/config_logging_decorator.h" +#include "google/cloud/cloudsecuritycompliance/v1/config.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_metadata_decorator.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_metadata_decorator.cc index e81e290d578ff..26188822f01a1 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_metadata_decorator.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/cloudsecuritycompliance/v1/config.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/config_metadata_decorator.h" +#include "google/cloud/cloudsecuritycompliance/v1/config.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 #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.cc index f73ef34de1e36..df934521e95de 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudsecuritycompliance/v1/config.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/config_stub.h" +#include "google/cloud/cloudsecuritycompliance/v1/config.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.h b/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.h index 1307478c4d341..14dc77862e76c 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_INTERNAL_CONFIG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_INTERNAL_CONFIG_STUB_H +#include "google/cloud/cloudsecuritycompliance/v1/config.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_stub_factory.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_stub_factory.cc index 5c513355b7010..bdfe65e4245b7 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_stub_factory.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/cloudsecuritycompliance/v1/config.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/config_stub_factory.h" +#include "google/cloud/cloudsecuritycompliance/v1/config.grpc.pb.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/config_auth_decorator.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/config_logging_decorator.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/config_metadata_decorator.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/config_stub.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.cc index a8e43b8a54d5c..7d34da1fa9df4 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigTracingConnection::ConfigTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -191,16 +189,12 @@ Status ConfigTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.h b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.h index 0e1e4476d0274..fb0c2adba5983 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigTracingConnection : public cloudsecuritycompliance_v1::ConfigConnection { public: @@ -107,8 +105,6 @@ class ConfigTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.cc b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.cc index eee6450de15ea..29843ea9231f8 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigTracingStub::ConfigTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -227,15 +225,9 @@ Status ConfigTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.h b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.h index 7a5c7e63bdd3d..afb376e0dd66d 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/config_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigTracingStub : public ConfigStub { public: ~ConfigTracingStub() override = default; @@ -123,8 +121,6 @@ class ConfigTracingStub : public ConfigStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.cc index 8052c7c8622cf..0cfb347283df6 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/cloudsecuritycompliance/v1/deployment.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.h" -#include +#include "google/cloud/cloudsecuritycompliance/v1/deployment.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.h index ef3a51305777e..2a4c6c8419f88 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_connection_impl.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_connection_impl.h index 546036f6432a8..1b88dea1c6df7 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_connection_impl.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.cc index 6b123abd3da72..5d1d99f575272 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/cloudsecuritycompliance/v1/deployment.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.h" +#include "google/cloud/cloudsecuritycompliance/v1/deployment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.h index b45f74f218c31..230ae6464a28b 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.cc index e63f9893108c6..d3babdbad09a3 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/cloudsecuritycompliance/v1/deployment.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.h" +#include "google/cloud/cloudsecuritycompliance/v1/deployment.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 #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.h index 36cb3b8c9287a..0dd90892cf815 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.cc index 06db4eb09d964..4f857b5cdf77a 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/cloudsecuritycompliance/v1/deployment.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h" +#include "google/cloud/cloudsecuritycompliance/v1/deployment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h index d9078cc571e05..3ec1e3ac0e664 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_INTERNAL_DEPLOYMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDSECURITYCOMPLIANCE_V1_INTERNAL_DEPLOYMENT_STUB_H +#include "google/cloud/cloudsecuritycompliance/v1/deployment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub_factory.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub_factory.cc index 62a23594d5751..b17cc0d6dac42 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub_factory.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/cloudsecuritycompliance/v1/deployment.proto #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub_factory.h" +#include "google/cloud/cloudsecuritycompliance/v1/deployment.grpc.pb.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_auth_decorator.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_logging_decorator.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_metadata_decorator.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_stub.h" #include "google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.cc index 5a1f123d62546..53f06497763cb 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeploymentTracingConnection::DeploymentTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -211,16 +209,12 @@ Status DeploymentTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeploymentTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.h index 5d27fee5b3fbf..1792bc99685e7 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeploymentTracingConnection : public cloudsecuritycompliance_v1::DeploymentConnection { public: @@ -113,8 +111,6 @@ class DeploymentTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.cc b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.cc index 08a3d5fbc5b61..3cf6221a1ac54 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.cc +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeploymentTracingStub::DeploymentTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -254,15 +252,9 @@ future DeploymentTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeploymentTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.h b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.h index 2801c15b62a2d..ceacc7a5b5c03 100644 --- a/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.h +++ b/google/cloud/cloudsecuritycompliance/v1/internal/deployment_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace cloudsecuritycompliance_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeploymentTracingStub : public DeploymentStub { public: ~DeploymentTracingStub() override = default; @@ -132,8 +130,6 @@ class DeploymentTracingStub : public DeploymentStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/commerce/BUILD.bazel b/google/cloud/commerce/BUILD.bazel index 3f6c419fd9dee..90e894cc5492b 100644 --- a/google/cloud/commerce/BUILD.bazel +++ b/google/cloud/commerce/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["consumer/procurement/v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_cc_grpc", + "@googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_client.h b/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_client.h index 69e5e3c2a77c5..fd7711d77fa8f 100644 --- a/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_client.h +++ b/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_client.h @@ -27,7 +27,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection.h b/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection.h index 7d44e9f282bea..9780ce3871a8f 100644 --- a/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection.h +++ b/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection.h @@ -22,6 +22,7 @@ #include "google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection_idempotency_policy.h" #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_retry_traits.h" +#include "google/cloud/commerce/consumer/procurement/v1/procurement_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -31,8 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection_idempotency_policy.h b/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection_idempotency_policy.h index 45a5553bb45cd..8a58ec4dfad26 100644 --- a/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection_idempotency_policy.h +++ b/google/cloud/commerce/consumer/procurement/v1/consumer_procurement_connection_idempotency_policy.h @@ -20,10 +20,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMMERCE_CONSUMER_PROCUREMENT_V1_CONSUMER_PROCUREMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMMERCE_CONSUMER_PROCUREMENT_V1_CONSUMER_PROCUREMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/commerce/consumer/procurement/v1/procurement_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.cc index f3bbcdd155d1a..40226c224ef11 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.cc @@ -18,7 +18,7 @@ // google/cloud/commerce/consumer/procurement/v1/procurement_service.proto #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.h" -#include +#include "google/cloud/commerce/consumer/procurement/v1/procurement_service.grpc.pb.h" #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.h index 2cea83a32e97b..817af50451b0d 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_auth_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_connection_impl.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_connection_impl.h index f90aa44cde680..aa9761f35bfaa 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_connection_impl.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.cc index f4112ba4f7e03..f8769b1f3a43a 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.cc @@ -18,9 +18,9 @@ // google/cloud/commerce/consumer/procurement/v1/procurement_service.proto #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.h" +#include "google/cloud/commerce/consumer/procurement/v1/procurement_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.h index fade59ebe8d23..1249fcd8b25b4 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_logging_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.cc index f2ebe935ebbd5..a9be03e6752e8 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.cc @@ -18,12 +18,12 @@ // google/cloud/commerce/consumer/procurement/v1/procurement_service.proto #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.h" +#include "google/cloud/commerce/consumer/procurement/v1/procurement_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 #include #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.h index b96fadbe17a51..7edbb087997e8 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc index 7c32a24fc50e4..d38eb5a510533 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc @@ -18,10 +18,10 @@ // google/cloud/commerce/consumer/procurement/v1/procurement_service.proto #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h" +#include "google/cloud/commerce/consumer/procurement/v1/procurement_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h index 9fe9b058d6397..d37f5f3be1a21 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMMERCE_CONSUMER_PROCUREMENT_V1_INTERNAL_CONSUMER_PROCUREMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMMERCE_CONSUMER_PROCUREMENT_V1_INTERNAL_CONSUMER_PROCUREMENT_STUB_H +#include "google/cloud/commerce/consumer/procurement/v1/procurement_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc index 4d153314b72c2..9c41836034006 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc @@ -23,14 +23,14 @@ #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_metadata_decorator.h" #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h" #include "google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.h" +#include "google/cloud/commerce/consumer/procurement/v1/procurement_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc index 49398380b8a2e..8afff2029f9e7 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace commerce_consumer_procurement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConsumerProcurementServiceTracingConnection:: ConsumerProcurementServiceTracingConnection( std::shared_ptrGetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< commerce_consumer_procurement_v1::ConsumerProcurementServiceConnection> MakeConsumerProcurementServiceTracingConnection( std::shared_ptr< commerce_consumer_procurement_v1::ConsumerProcurementServiceConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.h index 602e0f14fb302..076064fda4f1a 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace commerce_consumer_procurement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConsumerProcurementServiceTracingConnection : public commerce_consumer_procurement_v1:: ConsumerProcurementServiceConnection { @@ -95,8 +93,6 @@ class ConsumerProcurementServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc index a689dedf84605..2f6f7c6d0a717 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace commerce_consumer_procurement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConsumerProcurementServiceTracingStub::ConsumerProcurementServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -201,17 +199,11 @@ future ConsumerProcurementServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConsumerProcurementServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.h index 18e3cf2a8744c..da72013a0f86a 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.h @@ -31,8 +31,6 @@ namespace cloud { namespace commerce_consumer_procurement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConsumerProcurementServiceTracingStub : public ConsumerProcurementServiceStub { public: @@ -110,8 +108,6 @@ class ConsumerProcurementServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/commerce/quickstart/.bazelrc b/google/cloud/commerce/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/commerce/quickstart/.bazelrc +++ b/google/cloud/commerce/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/completion_queue_test.cc b/google/cloud/completion_queue_test.cc index 62e5bcdaa3287..6348e00089f05 100644 --- a/google/cloud/completion_queue_test.cc +++ b/google/cloud/completion_queue_test.cc @@ -20,8 +20,8 @@ #include "google/cloud/testing_util/fake_completion_queue_impl.h" #include "google/cloud/testing_util/mock_async_response_reader.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include #include diff --git a/google/cloud/composer/BUILD.bazel b/google/cloud/composer/BUILD.bazel index 3e4dab0ac399b..780416b0ec51a 100644 --- a/google/cloud/composer/BUILD.bazel +++ b/google/cloud/composer/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/orchestration/airflow/service/v1:service_cc_grpc", + "@googleapis//google/cloud/orchestration/airflow/service/v1:service_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/composer/quickstart/.bazelrc b/google/cloud/composer/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/composer/quickstart/.bazelrc +++ b/google/cloud/composer/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/composer/v1/environments_client.h b/google/cloud/composer/v1/environments_client.h index a4490c060e50e..8be63abe764e4 100644 --- a/google/cloud/composer/v1/environments_client.h +++ b/google/cloud/composer/v1/environments_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/composer/v1/environments_connection.h b/google/cloud/composer/v1/environments_connection.h index b692dba2e035c..815253430e639 100644 --- a/google/cloud/composer/v1/environments_connection.h +++ b/google/cloud/composer/v1/environments_connection.h @@ -21,6 +21,8 @@ #include "google/cloud/composer/v1/environments_connection_idempotency_policy.h" #include "google/cloud/composer/v1/internal/environments_retry_traits.h" +#include "google/cloud/orchestration/airflow/service/v1/environments.pb.h" +#include "google/cloud/orchestration/airflow/service/v1/operations.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/composer/v1/environments_connection_idempotency_policy.h b/google/cloud/composer/v1/environments_connection_idempotency_policy.h index 7a991ae78c9e3..a38fffd58a2e3 100644 --- a/google/cloud/composer/v1/environments_connection_idempotency_policy.h +++ b/google/cloud/composer/v1/environments_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/orchestration/airflow/service/v1/environments.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/composer/v1/image_versions_connection.h b/google/cloud/composer/v1/image_versions_connection.h index 6c02af64bee2f..d6f812584cf04 100644 --- a/google/cloud/composer/v1/image_versions_connection.h +++ b/google/cloud/composer/v1/image_versions_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/composer/v1/image_versions_connection_idempotency_policy.h" #include "google/cloud/composer/v1/internal/image_versions_retry_traits.h" +#include "google/cloud/orchestration/airflow/service/v1/image_versions.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/composer/v1/image_versions_connection_idempotency_policy.h b/google/cloud/composer/v1/image_versions_connection_idempotency_policy.h index 0a29d323989e6..51e964fb024ca 100644 --- a/google/cloud/composer/v1/image_versions_connection_idempotency_policy.h +++ b/google/cloud/composer/v1/image_versions_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_IMAGE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_IMAGE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/orchestration/airflow/service/v1/image_versions.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/composer/v1/internal/environments_auth_decorator.cc b/google/cloud/composer/v1/internal/environments_auth_decorator.cc index fa67e9f88f605..2db80665acc3b 100644 --- a/google/cloud/composer/v1/internal/environments_auth_decorator.cc +++ b/google/cloud/composer/v1/internal/environments_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/orchestration/airflow/service/v1/environments.proto #include "google/cloud/composer/v1/internal/environments_auth_decorator.h" -#include +#include "google/cloud/orchestration/airflow/service/v1/environments.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/environments_auth_decorator.h b/google/cloud/composer/v1/internal/environments_auth_decorator.h index 9a7451248f49a..f1090b893c831 100644 --- a/google/cloud/composer/v1/internal/environments_auth_decorator.h +++ b/google/cloud/composer/v1/internal/environments_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/composer/v1/internal/environments_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/composer/v1/internal/environments_connection_impl.h b/google/cloud/composer/v1/internal/environments_connection_impl.h index dd47cb264a1d3..4ef3aad8253d3 100644 --- a/google/cloud/composer/v1/internal/environments_connection_impl.h +++ b/google/cloud/composer/v1/internal/environments_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/composer/v1/internal/environments_logging_decorator.cc b/google/cloud/composer/v1/internal/environments_logging_decorator.cc index 11f10516141ae..0783fdc2c5291 100644 --- a/google/cloud/composer/v1/internal/environments_logging_decorator.cc +++ b/google/cloud/composer/v1/internal/environments_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/orchestration/airflow/service/v1/environments.proto #include "google/cloud/composer/v1/internal/environments_logging_decorator.h" +#include "google/cloud/orchestration/airflow/service/v1/environments.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/composer/v1/internal/environments_logging_decorator.h b/google/cloud/composer/v1/internal/environments_logging_decorator.h index 6c5074fed6957..00acf265361b9 100644 --- a/google/cloud/composer/v1/internal/environments_logging_decorator.h +++ b/google/cloud/composer/v1/internal/environments_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/composer/v1/internal/environments_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/composer/v1/internal/environments_metadata_decorator.cc b/google/cloud/composer/v1/internal/environments_metadata_decorator.cc index 47c09d914c151..684cad0f65b47 100644 --- a/google/cloud/composer/v1/internal/environments_metadata_decorator.cc +++ b/google/cloud/composer/v1/internal/environments_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/orchestration/airflow/service/v1/environments.proto #include "google/cloud/composer/v1/internal/environments_metadata_decorator.h" +#include "google/cloud/orchestration/airflow/service/v1/environments.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 #include #include #include diff --git a/google/cloud/composer/v1/internal/environments_metadata_decorator.h b/google/cloud/composer/v1/internal/environments_metadata_decorator.h index fb1ced4893c03..962a9bf2aecdb 100644 --- a/google/cloud/composer/v1/internal/environments_metadata_decorator.h +++ b/google/cloud/composer/v1/internal/environments_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/composer/v1/internal/environments_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/composer/v1/internal/environments_stub.cc b/google/cloud/composer/v1/internal/environments_stub.cc index 7ebdb01c2a4ff..2a1f6f0a5683b 100644 --- a/google/cloud/composer/v1/internal/environments_stub.cc +++ b/google/cloud/composer/v1/internal/environments_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/orchestration/airflow/service/v1/environments.proto #include "google/cloud/composer/v1/internal/environments_stub.h" +#include "google/cloud/orchestration/airflow/service/v1/environments.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/environments_stub.h b/google/cloud/composer/v1/internal/environments_stub.h index 4820fafa5acec..b8cd702f2ab7c 100644 --- a/google/cloud/composer/v1/internal/environments_stub.h +++ b/google/cloud/composer/v1/internal/environments_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_INTERNAL_ENVIRONMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_INTERNAL_ENVIRONMENTS_STUB_H +#include "google/cloud/orchestration/airflow/service/v1/environments.grpc.pb.h" +#include "google/cloud/orchestration/airflow/service/v1/operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/environments_stub_factory.cc b/google/cloud/composer/v1/internal/environments_stub_factory.cc index 78409e6ece640..a980d76f801fb 100644 --- a/google/cloud/composer/v1/internal/environments_stub_factory.cc +++ b/google/cloud/composer/v1/internal/environments_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/composer/v1/internal/environments_metadata_decorator.h" #include "google/cloud/composer/v1/internal/environments_stub.h" #include "google/cloud/composer/v1/internal/environments_tracing_stub.h" +#include "google/cloud/orchestration/airflow/service/v1/environments.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/environments_tracing_connection.cc b/google/cloud/composer/v1/internal/environments_tracing_connection.cc index 41770c57548db..a7c6a973864f6 100644 --- a/google/cloud/composer/v1/internal/environments_tracing_connection.cc +++ b/google/cloud/composer/v1/internal/environments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EnvironmentsTracingConnection::EnvironmentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -483,16 +481,12 @@ Status EnvironmentsTracingConnection::DeleteOperation( return internal::EndSpan(*span, child_->DeleteOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEnvironmentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/composer/v1/internal/environments_tracing_connection.h b/google/cloud/composer/v1/internal/environments_tracing_connection.h index fdcf998ab7968..f3139bee00d10 100644 --- a/google/cloud/composer/v1/internal/environments_tracing_connection.h +++ b/google/cloud/composer/v1/internal/environments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EnvironmentsTracingConnection : public composer_v1::EnvironmentsConnection { public: @@ -236,8 +234,6 @@ class EnvironmentsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/composer/v1/internal/environments_tracing_stub.cc b/google/cloud/composer/v1/internal/environments_tracing_stub.cc index 3b53fe08c1d4f..dece17ffa9fae 100644 --- a/google/cloud/composer/v1/internal/environments_tracing_stub.cc +++ b/google/cloud/composer/v1/internal/environments_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EnvironmentsTracingStub::EnvironmentsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -569,15 +567,9 @@ future EnvironmentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEnvironmentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/composer/v1/internal/environments_tracing_stub.h b/google/cloud/composer/v1/internal/environments_tracing_stub.h index 544effd2789d6..30d1ae1577453 100644 --- a/google/cloud/composer/v1/internal/environments_tracing_stub.h +++ b/google/cloud/composer/v1/internal/environments_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EnvironmentsTracingStub : public EnvironmentsStub { public: ~EnvironmentsTracingStub() override = default; @@ -261,8 +259,6 @@ class EnvironmentsTracingStub : public EnvironmentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/composer/v1/internal/image_versions_auth_decorator.cc b/google/cloud/composer/v1/internal/image_versions_auth_decorator.cc index ce5812957630f..9b0fe91537d27 100644 --- a/google/cloud/composer/v1/internal/image_versions_auth_decorator.cc +++ b/google/cloud/composer/v1/internal/image_versions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/orchestration/airflow/service/v1/image_versions.proto #include "google/cloud/composer/v1/internal/image_versions_auth_decorator.h" -#include +#include "google/cloud/orchestration/airflow/service/v1/image_versions.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/image_versions_logging_decorator.cc b/google/cloud/composer/v1/internal/image_versions_logging_decorator.cc index 8f09a5ab1c34a..4037845ef8076 100644 --- a/google/cloud/composer/v1/internal/image_versions_logging_decorator.cc +++ b/google/cloud/composer/v1/internal/image_versions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/orchestration/airflow/service/v1/image_versions.proto #include "google/cloud/composer/v1/internal/image_versions_logging_decorator.h" +#include "google/cloud/orchestration/airflow/service/v1/image_versions.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/composer/v1/internal/image_versions_metadata_decorator.cc b/google/cloud/composer/v1/internal/image_versions_metadata_decorator.cc index f8154d23d6c9c..21b43cb96802e 100644 --- a/google/cloud/composer/v1/internal/image_versions_metadata_decorator.cc +++ b/google/cloud/composer/v1/internal/image_versions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/orchestration/airflow/service/v1/image_versions.proto #include "google/cloud/composer/v1/internal/image_versions_metadata_decorator.h" +#include "google/cloud/orchestration/airflow/service/v1/image_versions.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 #include #include #include diff --git a/google/cloud/composer/v1/internal/image_versions_stub.cc b/google/cloud/composer/v1/internal/image_versions_stub.cc index 51bed33d3b5c9..c821cdffc4b3f 100644 --- a/google/cloud/composer/v1/internal/image_versions_stub.cc +++ b/google/cloud/composer/v1/internal/image_versions_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/orchestration/airflow/service/v1/image_versions.proto #include "google/cloud/composer/v1/internal/image_versions_stub.h" +#include "google/cloud/orchestration/airflow/service/v1/image_versions.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/composer/v1/internal/image_versions_stub.h b/google/cloud/composer/v1/internal/image_versions_stub.h index 223e1c941dc08..57c995ca2061e 100644 --- a/google/cloud/composer/v1/internal/image_versions_stub.h +++ b/google/cloud/composer/v1/internal/image_versions_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_INTERNAL_IMAGE_VERSIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_V1_INTERNAL_IMAGE_VERSIONS_STUB_H +#include "google/cloud/orchestration/airflow/service/v1/image_versions.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/image_versions_stub_factory.cc b/google/cloud/composer/v1/internal/image_versions_stub_factory.cc index ae10e6b4f1686..aedd0e161cb96 100644 --- a/google/cloud/composer/v1/internal/image_versions_stub_factory.cc +++ b/google/cloud/composer/v1/internal/image_versions_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/composer/v1/internal/image_versions_metadata_decorator.h" #include "google/cloud/composer/v1/internal/image_versions_stub.h" #include "google/cloud/composer/v1/internal/image_versions_tracing_stub.h" +#include "google/cloud/orchestration/airflow/service/v1/image_versions.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc b/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc index 0504b56bb9c47..87faaaf077095 100644 --- a/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc +++ b/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ImageVersionsTracingConnection::ImageVersionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -74,16 +72,12 @@ Status ImageVersionsTracingConnection::DeleteOperation( return internal::EndSpan(*span, child_->DeleteOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeImageVersionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/composer/v1/internal/image_versions_tracing_connection.h b/google/cloud/composer/v1/internal/image_versions_tracing_connection.h index 7d9ba32e726fa..785234d4817b1 100644 --- a/google/cloud/composer/v1/internal/image_versions_tracing_connection.h +++ b/google/cloud/composer/v1/internal/image_versions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ImageVersionsTracingConnection : public composer_v1::ImageVersionsConnection { public: @@ -57,8 +55,6 @@ class ImageVersionsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/composer/v1/internal/image_versions_tracing_stub.cc b/google/cloud/composer/v1/internal/image_versions_tracing_stub.cc index 38a13f6c82d31..7efcaa95f81e2 100644 --- a/google/cloud/composer/v1/internal/image_versions_tracing_stub.cc +++ b/google/cloud/composer/v1/internal/image_versions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ImageVersionsTracingStub::ImageVersionsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -84,15 +82,9 @@ Status ImageVersionsTracingStub::DeleteOperation( child_->DeleteOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeImageVersionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/composer/v1/internal/image_versions_tracing_stub.h b/google/cloud/composer/v1/internal/image_versions_tracing_stub.h index 4a9247bf952d4..b2794a895ea5e 100644 --- a/google/cloud/composer/v1/internal/image_versions_tracing_stub.h +++ b/google/cloud/composer/v1/internal/image_versions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace composer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ImageVersionsTracingStub : public ImageVersionsStub { public: ~ImageVersionsTracingStub() override = default; @@ -62,8 +60,6 @@ class ImageVersionsTracingStub : public ImageVersionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/compute/accelerator_types/v1/accelerator_types_connection.h b/google/cloud/compute/accelerator_types/v1/accelerator_types_connection.h index a02435242f742..baa321fb1c489 100644 --- a/google/cloud/compute/accelerator_types/v1/accelerator_types_connection.h +++ b/google/cloud/compute/accelerator_types/v1/accelerator_types_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_ACCELERATOR_TYPES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_ACCELERATOR_TYPES_CONNECTION_H +#include "google/cloud/compute/accelerator_types/v1/accelerator_types.pb.h" #include "google/cloud/compute/accelerator_types/v1/accelerator_types_connection_idempotency_policy.h" #include "google/cloud/compute/accelerator_types/v1/internal/accelerator_types_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/accelerator_types/v1/accelerator_types_connection_idempotency_policy.h b/google/cloud/compute/accelerator_types/v1/accelerator_types_connection_idempotency_policy.h index 169e70d49587f..76776511d6c2c 100644 --- a/google/cloud/compute/accelerator_types/v1/accelerator_types_connection_idempotency_policy.h +++ b/google/cloud/compute/accelerator_types/v1/accelerator_types_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_ACCELERATOR_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_ACCELERATOR_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/accelerator_types/v1/accelerator_types.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/accelerator_types/v1/accelerator_types_proto_export.h b/google/cloud/compute/accelerator_types/v1/accelerator_types_proto_export.h index 8f644e40f5b01..ffb487ab234e8 100644 --- a/google/cloud/compute/accelerator_types/v1/accelerator_types_proto_export.h +++ b/google/cloud/compute/accelerator_types/v1/accelerator_types_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_ACCELERATOR_TYPES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_002.pb.h" +#include "google/cloud/compute/v1/internal/common_023.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_ACCELERATOR_TYPES_PROTO_EXPORT_H diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_logging_decorator.h b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_logging_decorator.h index 3757be054938d..f13e7d29919a4 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_logging_decorator.h +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_INTERNAL_ACCELERATOR_TYPES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_INTERNAL_ACCELERATOR_TYPES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/accelerator_types/v1/accelerator_types.pb.h" #include "google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_metadata_decorator.h b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_metadata_decorator.h index 0af9dc0e03e87..ad1979aa85a56 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_metadata_decorator.h +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_INTERNAL_ACCELERATOR_TYPES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_INTERNAL_ACCELERATOR_TYPES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/accelerator_types/v1/accelerator_types.pb.h" #include "google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc index cb35d61928d96..96e49464e5cac 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/accelerator_types/v1/accelerator_types.proto #include "google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h" +#include "google/cloud/compute/accelerator_types/v1/accelerator_types.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h index de14eca3de9b9..bb6bf99d87600 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_INTERNAL_ACCELERATOR_TYPES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ACCELERATOR_TYPES_V1_INTERNAL_ACCELERATOR_TYPES_REST_STUB_H +#include "google/cloud/compute/accelerator_types/v1/accelerator_types.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc index 9e12c42890b70..2a14a9a84865a 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_accelerator_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AcceleratorTypesTracingConnection::AcceleratorTypesTracingConnection( std::shared_ptr child) @@ -75,17 +73,13 @@ AcceleratorTypesTracingConnection::ListAcceleratorTypes( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAcceleratorTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.h b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.h index a7fe4718e407d..9e59a9bd0dae9 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.h +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_accelerator_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AcceleratorTypesTracingConnection : public compute_accelerator_types_v1::AcceleratorTypesConnection { public: @@ -60,8 +58,6 @@ class AcceleratorTypesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/addresses/v1/addresses_connection.h b/google/cloud/compute/addresses/v1/addresses_connection.h index 1974fb2c4941e..e06856afb8acc 100644 --- a/google/cloud/compute/addresses/v1/addresses_connection.h +++ b/google/cloud/compute/addresses/v1/addresses_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_ADDRESSES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_ADDRESSES_CONNECTION_H +#include "google/cloud/compute/addresses/v1/addresses.pb.h" #include "google/cloud/compute/addresses/v1/addresses_connection_idempotency_policy.h" #include "google/cloud/compute/addresses/v1/internal/addresses_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/addresses/v1/addresses_connection_idempotency_policy.h b/google/cloud/compute/addresses/v1/addresses_connection_idempotency_policy.h index b096072bf54a2..c4449b9e64435 100644 --- a/google/cloud/compute/addresses/v1/addresses_connection_idempotency_policy.h +++ b/google/cloud/compute/addresses/v1/addresses_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_ADDRESSES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_ADDRESSES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/addresses/v1/addresses.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/addresses/v1/addresses_proto_export.h b/google/cloud/compute/addresses/v1/addresses_proto_export.h index 31baa5e730654..7ccf3339454b3 100644 --- a/google/cloud/compute/addresses/v1/addresses_proto_export.h +++ b/google/cloud/compute/addresses/v1/addresses_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_ADDRESSES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_004.pb.h" +#include "google/cloud/compute/v1/internal/common_005.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_ADDRESSES_PROTO_EXPORT_H diff --git a/google/cloud/compute/addresses/v1/internal/addresses_rest_connection_impl.h b/google/cloud/compute/addresses/v1/internal/addresses_rest_connection_impl.h index 9a9776badd979..4375ec5e5f1ce 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_rest_connection_impl.h +++ b/google/cloud/compute/addresses/v1/internal/addresses_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/addresses/v1/addresses_options.h" #include "google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h" #include "google/cloud/compute/addresses/v1/internal/addresses_retry_traits.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/addresses/v1/internal/addresses_rest_logging_decorator.h b/google/cloud/compute/addresses/v1/internal/addresses_rest_logging_decorator.h index d926900d6017d..ec6b11bbb8a95 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_rest_logging_decorator.h +++ b/google/cloud/compute/addresses/v1/internal/addresses_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_INTERNAL_ADDRESSES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_INTERNAL_ADDRESSES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/addresses/v1/addresses.pb.h" #include "google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/addresses/v1/internal/addresses_rest_metadata_decorator.h b/google/cloud/compute/addresses/v1/internal/addresses_rest_metadata_decorator.h index 0d8baa6fdad03..14d1d54796646 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_rest_metadata_decorator.h +++ b/google/cloud/compute/addresses/v1/internal/addresses_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_INTERNAL_ADDRESSES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_INTERNAL_ADDRESSES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/addresses/v1/addresses.pb.h" #include "google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc b/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc index 92d57a920feeb..c955cd1b5d7fc 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc +++ b/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/addresses/v1/addresses.proto #include "google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h" +#include "google/cloud/compute/addresses/v1/addresses.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h b/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h index 800535c718d76..4918d07bcd167 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h +++ b/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_INTERNAL_ADDRESSES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ADDRESSES_V1_INTERNAL_ADDRESSES_REST_STUB_H +#include "google/cloud/compute/addresses/v1/addresses.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc b/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc index 87795dcde9ef2..42f2867024dfd 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc +++ b/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_addresses_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AddressesTracingConnection::AddressesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -186,16 +184,12 @@ AddressesTracingConnection::SetLabels( return internal::EndSpan(std::move(span), child_->SetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAddressesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.h b/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.h index 619106dda7aae..e2b12ab96f45d 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.h +++ b/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_addresses_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AddressesTracingConnection : public compute_addresses_v1::AddressesConnection { public: @@ -106,8 +104,6 @@ class AddressesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/autoscalers/v1/autoscalers_connection.h b/google/cloud/compute/autoscalers/v1/autoscalers_connection.h index 8463b2ee34219..6a596effbd0bf 100644 --- a/google/cloud/compute/autoscalers/v1/autoscalers_connection.h +++ b/google/cloud/compute/autoscalers/v1/autoscalers_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_AUTOSCALERS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_AUTOSCALERS_CONNECTION_H +#include "google/cloud/compute/autoscalers/v1/autoscalers.pb.h" #include "google/cloud/compute/autoscalers/v1/autoscalers_connection_idempotency_policy.h" #include "google/cloud/compute/autoscalers/v1/internal/autoscalers_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/autoscalers/v1/autoscalers_connection_idempotency_policy.h b/google/cloud/compute/autoscalers/v1/autoscalers_connection_idempotency_policy.h index 541f876f06ad6..7369d904468dc 100644 --- a/google/cloud/compute/autoscalers/v1/autoscalers_connection_idempotency_policy.h +++ b/google/cloud/compute/autoscalers/v1/autoscalers_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_AUTOSCALERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_AUTOSCALERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/autoscalers/v1/autoscalers.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/autoscalers/v1/autoscalers_proto_export.h b/google/cloud/compute/autoscalers/v1/autoscalers_proto_export.h index 6ecde5705f3c8..16ac4b159f05c 100644 --- a/google/cloud/compute/autoscalers/v1/autoscalers_proto_export.h +++ b/google/cloud/compute/autoscalers/v1/autoscalers_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_AUTOSCALERS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_008.pb.h" +#include "google/cloud/compute/v1/internal/common_009.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_040.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_AUTOSCALERS_PROTO_EXPORT_H diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_connection_impl.h b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_connection_impl.h index 08435b52b39a6..fe60e6d32f5ac 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_connection_impl.h +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/autoscalers/v1/autoscalers_options.h" #include "google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h" #include "google/cloud/compute/autoscalers/v1/internal/autoscalers_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_logging_decorator.h b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_logging_decorator.h index ea187e5777b84..5b814a57e5cdb 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_logging_decorator.h +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_INTERNAL_AUTOSCALERS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_INTERNAL_AUTOSCALERS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/autoscalers/v1/autoscalers.pb.h" #include "google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_metadata_decorator.h b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_metadata_decorator.h index f49e2d866cace..d748627b19c48 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_metadata_decorator.h +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_INTERNAL_AUTOSCALERS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_INTERNAL_AUTOSCALERS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/autoscalers/v1/autoscalers.pb.h" #include "google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc index 06ce3a1edbe09..1c3db122968ef 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/autoscalers/v1/autoscalers.proto #include "google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h" +#include "google/cloud/compute/autoscalers/v1/autoscalers.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h index 4ee705eddb9d9..c6569984ee812 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_INTERNAL_AUTOSCALERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_AUTOSCALERS_V1_INTERNAL_AUTOSCALERS_REST_STUB_H +#include "google/cloud/compute/autoscalers/v1/autoscalers.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc b/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc index 59383608f5a7d..63e0aa9602558 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_autoscalers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutoscalersTracingConnection::AutoscalersTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -198,16 +196,12 @@ AutoscalersTracingConnection::UpdateAutoscaler( child_->UpdateAutoscaler(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutoscalersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.h b/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.h index 16af91862c042..7b1847d4cb931 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.h +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_autoscalers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutoscalersTracingConnection : public compute_autoscalers_v1::AutoscalersConnection { public: @@ -102,8 +100,6 @@ class AutoscalersTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/backend_buckets/v1/backend_buckets_connection.h b/google/cloud/compute/backend_buckets/v1/backend_buckets_connection.h index de280f2c81bff..2ab9fe847ef94 100644 --- a/google/cloud/compute/backend_buckets/v1/backend_buckets_connection.h +++ b/google/cloud/compute/backend_buckets/v1/backend_buckets_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_BACKEND_BUCKETS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_BACKEND_BUCKETS_CONNECTION_H +#include "google/cloud/compute/backend_buckets/v1/backend_buckets.pb.h" #include "google/cloud/compute/backend_buckets/v1/backend_buckets_connection_idempotency_policy.h" #include "google/cloud/compute/backend_buckets/v1/internal/backend_buckets_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/backend_buckets/v1/backend_buckets_connection_idempotency_policy.h b/google/cloud/compute/backend_buckets/v1/backend_buckets_connection_idempotency_policy.h index b5440de631fc5..3599e6ad76d4f 100644 --- a/google/cloud/compute/backend_buckets/v1/backend_buckets_connection_idempotency_policy.h +++ b/google/cloud/compute/backend_buckets/v1/backend_buckets_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_BACKEND_BUCKETS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_BACKEND_BUCKETS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/backend_buckets/v1/backend_buckets.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/backend_buckets/v1/backend_buckets_proto_export.h b/google/cloud/compute/backend_buckets/v1/backend_buckets_proto_export.h index 30602e44b4413..3e8399bd2ecec 100644 --- a/google/cloud/compute/backend_buckets/v1/backend_buckets_proto_export.h +++ b/google/cloud/compute/backend_buckets/v1/backend_buckets_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_BACKEND_BUCKETS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_010.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_118.pb.h" +#include "google/cloud/compute/v1/internal/common_121.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_BACKEND_BUCKETS_PROTO_EXPORT_H diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_connection_impl.h b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_connection_impl.h index 32c81f56546d8..a714e33c7b09a 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_connection_impl.h +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/backend_buckets/v1/backend_buckets_options.h" #include "google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h" #include "google/cloud/compute/backend_buckets/v1/internal/backend_buckets_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_logging_decorator.h b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_logging_decorator.h index cedc30fa2bc85..68ab2f27e797b 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_logging_decorator.h +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_INTERNAL_BACKEND_BUCKETS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_INTERNAL_BACKEND_BUCKETS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/backend_buckets/v1/backend_buckets.pb.h" #include "google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_metadata_decorator.h b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_metadata_decorator.h index 90d674531e5c8..660359ad74c88 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_metadata_decorator.h +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_INTERNAL_BACKEND_BUCKETS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_INTERNAL_BACKEND_BUCKETS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/backend_buckets/v1/backend_buckets.pb.h" #include "google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc index ec0e898ee48d1..c0ff0ddf394c7 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/backend_buckets/v1/backend_buckets.proto #include "google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h" +#include "google/cloud/compute/backend_buckets/v1/backend_buckets.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h index a2dec92e271a8..d607a319a6ef2 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_INTERNAL_BACKEND_BUCKETS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_BUCKETS_V1_INTERNAL_BACKEND_BUCKETS_REST_STUB_H +#include "google/cloud/compute/backend_buckets/v1/backend_buckets.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc index 4d1d8b24c2e15..6d9fce1a05ff4 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_backend_buckets_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BackendBucketsTracingConnection::BackendBucketsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -328,17 +326,13 @@ BackendBucketsTracingConnection::UpdateBackendBucket( child_->UpdateBackendBucket(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBackendBucketsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.h b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.h index 3bf2a13a3f03c..e74d0931b01e1 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.h +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_backend_buckets_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BackendBucketsTracingConnection : public compute_backend_buckets_v1::BackendBucketsConnection { public: @@ -149,8 +147,6 @@ class BackendBucketsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/backend_services/v1/backend_services_connection.h b/google/cloud/compute/backend_services/v1/backend_services_connection.h index 1e1462ff71061..734e2a613b550 100644 --- a/google/cloud/compute/backend_services/v1/backend_services_connection.h +++ b/google/cloud/compute/backend_services/v1/backend_services_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_BACKEND_SERVICES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_BACKEND_SERVICES_CONNECTION_H +#include "google/cloud/compute/backend_services/v1/backend_services.pb.h" #include "google/cloud/compute/backend_services/v1/backend_services_connection_idempotency_policy.h" #include "google/cloud/compute/backend_services/v1/internal/backend_services_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/backend_services/v1/backend_services_connection_idempotency_policy.h b/google/cloud/compute/backend_services/v1/backend_services_connection_idempotency_policy.h index 2ae879dfde6e7..dbac8ebc9db2c 100644 --- a/google/cloud/compute/backend_services/v1/backend_services_connection_idempotency_policy.h +++ b/google/cloud/compute/backend_services/v1/backend_services_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_BACKEND_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_BACKEND_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/backend_services/v1/backend_services.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/backend_services/v1/backend_services_proto_export.h b/google/cloud/compute/backend_services/v1/backend_services_proto_export.h index 28179d889f54c..e6336f1942e21 100644 --- a/google/cloud/compute/backend_services/v1/backend_services_proto_export.h +++ b/google/cloud/compute/backend_services/v1/backend_services_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,17 +26,17 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_BACKEND_SERVICES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_000.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_011.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_052.pb.h" +#include "google/cloud/compute/v1/internal/common_118.pb.h" +#include "google/cloud/compute/v1/internal/common_121.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_BACKEND_SERVICES_PROTO_EXPORT_H diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_connection_impl.h b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_connection_impl.h index d2f314f1ee081..c24e2e3dae62d 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_connection_impl.h +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/backend_services/v1/backend_services_options.h" #include "google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h" #include "google/cloud/compute/backend_services/v1/internal/backend_services_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_logging_decorator.h b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_logging_decorator.h index 76494fe13de37..92471d616240b 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_logging_decorator.h +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_INTERNAL_BACKEND_SERVICES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_INTERNAL_BACKEND_SERVICES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/backend_services/v1/backend_services.pb.h" #include "google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_metadata_decorator.h b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_metadata_decorator.h index 70e437f1e1175..cc6816c86b0a9 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_metadata_decorator.h +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_INTERNAL_BACKEND_SERVICES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_INTERNAL_BACKEND_SERVICES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/backend_services/v1/backend_services.pb.h" #include "google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc index 1e5d454624be5..888f617844dba 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/backend_services/v1/backend_services.proto #include "google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h" +#include "google/cloud/compute/backend_services/v1/backend_services.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h index 38fb4362043b4..de1f44a8bebd0 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_INTERNAL_BACKEND_SERVICES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_BACKEND_SERVICES_V1_INTERNAL_BACKEND_SERVICES_REST_STUB_H +#include "google/cloud/compute/backend_services/v1/backend_services.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc b/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc index a11a6cf8741be..dcb5076fc6566 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_backend_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BackendServicesTracingConnection::BackendServicesTracingConnection( std::shared_ptr child) @@ -405,17 +403,13 @@ BackendServicesTracingConnection::UpdateBackendService( child_->UpdateBackendService(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBackendServicesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.h b/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.h index 6700e43d634aa..dbe1cc35cd8f0 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.h +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_backend_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BackendServicesTracingConnection : public compute_backend_services_v1::BackendServicesConnection { public: @@ -177,8 +175,6 @@ class BackendServicesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/compute_library.bzl b/google/cloud/compute/compute_library.bzl index 014e2840bfee1..d0afcb0e16f14 100644 --- a/google/cloud/compute/compute_library.bzl +++ b/google/cloud/compute/compute_library.bzl @@ -63,7 +63,7 @@ def compute_library(service_dir, inner_deps = []): visibility = ["//:__pkg__"], deps = [ ":google_cloud_cpp_compute_" + service, - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -77,7 +77,7 @@ def compute_library(service_dir, inner_deps = []): "//:grpc_utils", "//google/cloud:google_cloud_cpp_rest_internal", "//google/cloud:google_cloud_cpp_rest_protobuf_internal", - "//protos:system_includes", + # "//protos:system_includes", "//protos/google/cloud/compute:cc_proto", ] + inner_deps, ) diff --git a/google/cloud/compute/disk_types/v1/disk_types_connection.h b/google/cloud/compute/disk_types/v1/disk_types_connection.h index 0b29ddc91dafd..88c31a59cd78f 100644 --- a/google/cloud/compute/disk_types/v1/disk_types_connection.h +++ b/google/cloud/compute/disk_types/v1/disk_types_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_DISK_TYPES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_DISK_TYPES_CONNECTION_H +#include "google/cloud/compute/disk_types/v1/disk_types.pb.h" #include "google/cloud/compute/disk_types/v1/disk_types_connection_idempotency_policy.h" #include "google/cloud/compute/disk_types/v1/internal/disk_types_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/disk_types/v1/disk_types_connection_idempotency_policy.h b/google/cloud/compute/disk_types/v1/disk_types_connection_idempotency_policy.h index 1aa25525eec82..6f4963641deba 100644 --- a/google/cloud/compute/disk_types/v1/disk_types_connection_idempotency_policy.h +++ b/google/cloud/compute/disk_types/v1/disk_types_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_DISK_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_DISK_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/disk_types/v1/disk_types.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/disk_types/v1/disk_types_proto_export.h b/google/cloud/compute/disk_types/v1/disk_types_proto_export.h index ba257307a7cfe..4e6922ebcda89 100644 --- a/google/cloud/compute/disk_types/v1/disk_types_proto_export.h +++ b/google/cloud/compute/disk_types/v1/disk_types_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_DISK_TYPES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_026.pb.h" +#include "google/cloud/compute/v1/internal/common_027.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_DISK_TYPES_PROTO_EXPORT_H diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_logging_decorator.h b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_logging_decorator.h index 0e9236358aa29..262c05cba1b46 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_logging_decorator.h +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_INTERNAL_DISK_TYPES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_INTERNAL_DISK_TYPES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/disk_types/v1/disk_types.pb.h" #include "google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_metadata_decorator.h b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_metadata_decorator.h index c6be52a27cd1b..f49bba68ad66e 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_metadata_decorator.h +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_INTERNAL_DISK_TYPES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_INTERNAL_DISK_TYPES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/disk_types/v1/disk_types.pb.h" #include "google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc index 5681155a14f3a..25749d15c617f 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/disk_types/v1/disk_types.proto #include "google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h" +#include "google/cloud/compute/disk_types/v1/disk_types.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h index 96af6442c4479..78ab00742378b 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_INTERNAL_DISK_TYPES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISK_TYPES_V1_INTERNAL_DISK_TYPES_REST_STUB_H +#include "google/cloud/compute/disk_types/v1/disk_types.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc b/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc index 532c61af3a982..b4b9b840a1398 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_disk_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DiskTypesTracingConnection::DiskTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -69,16 +67,12 @@ DiskTypesTracingConnection::ListDiskTypes( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDiskTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.h b/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.h index cf1c117ae461c..6a0ac70153730 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.h +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_disk_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DiskTypesTracingConnection : public compute_disk_types_v1::DiskTypesConnection { public: @@ -57,8 +55,6 @@ class DiskTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/disks/v1/disks_connection.h b/google/cloud/compute/disks/v1/disks_connection.h index 52e4036d8e657..199caa3e494e2 100644 --- a/google/cloud/compute/disks/v1/disks_connection.h +++ b/google/cloud/compute/disks/v1/disks_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_DISKS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_DISKS_CONNECTION_H +#include "google/cloud/compute/disks/v1/disks.pb.h" #include "google/cloud/compute/disks/v1/disks_connection_idempotency_policy.h" #include "google/cloud/compute/disks/v1/internal/disks_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/disks/v1/disks_connection_idempotency_policy.h b/google/cloud/compute/disks/v1/disks_connection_idempotency_policy.h index e340a7e299230..d22799ceb8c5c 100644 --- a/google/cloud/compute/disks/v1/disks_connection_idempotency_policy.h +++ b/google/cloud/compute/disks/v1/disks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_DISKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_DISKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/disks/v1/disks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/disks/v1/disks_proto_export.h b/google/cloud/compute/disks/v1/disks_proto_export.h index f5f402cb141c3..4a9a5c623c90b 100644 --- a/google/cloud/compute/disks/v1/disks_proto_export.h +++ b/google/cloud/compute/disks/v1/disks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,16 +26,16 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_DISKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_014.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_017.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_122.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_151.pb.h" +#include "google/cloud/compute/v1/internal/common_152.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_DISKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/disks/v1/internal/disks_rest_connection_impl.h b/google/cloud/compute/disks/v1/internal/disks_rest_connection_impl.h index 867340946d65c..d1b4c98defb06 100644 --- a/google/cloud/compute/disks/v1/internal/disks_rest_connection_impl.h +++ b/google/cloud/compute/disks/v1/internal/disks_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/disks/v1/disks_options.h" #include "google/cloud/compute/disks/v1/internal/disks_rest_stub.h" #include "google/cloud/compute/disks/v1/internal/disks_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/disks/v1/internal/disks_rest_logging_decorator.h b/google/cloud/compute/disks/v1/internal/disks_rest_logging_decorator.h index 347ca0b28687b..5d71c35f8bb9c 100644 --- a/google/cloud/compute/disks/v1/internal/disks_rest_logging_decorator.h +++ b/google/cloud/compute/disks/v1/internal/disks_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_INTERNAL_DISKS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_INTERNAL_DISKS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/disks/v1/disks.pb.h" #include "google/cloud/compute/disks/v1/internal/disks_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/disks/v1/internal/disks_rest_metadata_decorator.h b/google/cloud/compute/disks/v1/internal/disks_rest_metadata_decorator.h index 807c5881b0b15..7557be5a73ddb 100644 --- a/google/cloud/compute/disks/v1/internal/disks_rest_metadata_decorator.h +++ b/google/cloud/compute/disks/v1/internal/disks_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_INTERNAL_DISKS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_INTERNAL_DISKS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/disks/v1/disks.pb.h" #include "google/cloud/compute/disks/v1/internal/disks_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc b/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc index f7ef6066e38e1..e92c5b65a953d 100644 --- a/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc +++ b/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/disks/v1/disks.proto #include "google/cloud/compute/disks/v1/internal/disks_rest_stub.h" +#include "google/cloud/compute/disks/v1/disks.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/disks/v1/internal/disks_rest_stub.h b/google/cloud/compute/disks/v1/internal/disks_rest_stub.h index 226ec07a61fcc..f9123b9a39534 100644 --- a/google/cloud/compute/disks/v1/internal/disks_rest_stub.h +++ b/google/cloud/compute/disks/v1/internal/disks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_INTERNAL_DISKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_DISKS_V1_INTERNAL_DISKS_REST_STUB_H +#include "google/cloud/compute/disks/v1/disks.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc b/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc index 4071184a022ab..271ce8de2d4fd 100644 --- a/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc +++ b/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_disks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DisksTracingConnection::DisksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -485,15 +483,11 @@ DisksTracingConnection::UpdateDisk( return internal::EndSpan(std::move(span), child_->UpdateDisk(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDisksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/disks/v1/internal/disks_tracing_connection.h b/google/cloud/compute/disks/v1/internal/disks_tracing_connection.h index d3b50df9aa47a..8cf191957cde5 100644 --- a/google/cloud/compute/disks/v1/internal/disks_tracing_connection.h +++ b/google/cloud/compute/disks/v1/internal/disks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_disks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DisksTracingConnection : public compute_disks_v1::DisksConnection { public: ~DisksTracingConnection() override = default; @@ -234,8 +232,6 @@ class DisksTracingConnection : public compute_disks_v1::DisksConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection.h b/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection.h index 25fee098fcbab..ee21aacbdd402 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection.h +++ b/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_EXTERNAL_VPN_GATEWAYS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_EXTERNAL_VPN_GATEWAYS_CONNECTION_H +#include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.pb.h" #include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection_idempotency_policy.h" #include "google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection_idempotency_policy.h b/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection_idempotency_policy.h index f1967ce875fe2..5a2b0270d6e34 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection_idempotency_policy.h +++ b/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_EXTERNAL_VPN_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_EXTERNAL_VPN_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_proto_export.h b/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_proto_export.h index 2ba9fa472f001..9e6083481dbe9 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_proto_export.h +++ b/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_EXTERNAL_VPN_GATEWAYS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_032.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_EXTERNAL_VPN_GATEWAYS_PROTO_EXPORT_H diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_connection_impl.h b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_connection_impl.h index 7b6a5bdb274fe..21bd15b60983b 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_connection_impl.h +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways_options.h" #include "google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h" #include "google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_logging_decorator.h b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_logging_decorator.h index 6eec805689074..c6f19affdcf31 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_logging_decorator.h +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_INTERNAL_EXTERNAL_VPN_GATEWAYS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_INTERNAL_EXTERNAL_VPN_GATEWAYS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.pb.h" #include "google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_metadata_decorator.h b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_metadata_decorator.h index 74232cb3ba24b..7f91f66d1cedf 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_metadata_decorator.h +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_INTERNAL_EXTERNAL_VPN_GATEWAYS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_INTERNAL_EXTERNAL_VPN_GATEWAYS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.pb.h" #include "google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc index f1952a748cc82..f5b052241866a 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.proto #include "google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h" +#include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h index 8f91716039ae8..bf5735559b65f 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_INTERNAL_EXTERNAL_VPN_GATEWAYS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_EXTERNAL_VPN_GATEWAYS_V1_INTERNAL_EXTERNAL_VPN_GATEWAYS_REST_STUB_H +#include "google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc index 9ee9175f72537..dbc58fa77c5ed 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_external_vpn_gateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExternalVpnGatewaysTracingConnection::ExternalVpnGatewaysTracingConnection( std::shared_ptr< compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection> @@ -174,19 +172,15 @@ ExternalVpnGatewaysTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExternalVpnGatewaysTracingConnection( std::shared_ptr< compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.h b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.h index 7b86c59bea8b1..3b9214435f3ac 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.h +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_external_vpn_gateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExternalVpnGatewaysTracingConnection : public compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection { public: @@ -100,8 +98,6 @@ class ExternalVpnGatewaysTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/firewall_policies/v1/firewall_policies_connection.h b/google/cloud/compute/firewall_policies/v1/firewall_policies_connection.h index 0ad9456907c97..e97f912574edd 100644 --- a/google/cloud/compute/firewall_policies/v1/firewall_policies_connection.h +++ b/google/cloud/compute/firewall_policies/v1/firewall_policies_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_FIREWALL_POLICIES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_FIREWALL_POLICIES_CONNECTION_H +#include "google/cloud/compute/firewall_policies/v1/firewall_policies.pb.h" #include "google/cloud/compute/firewall_policies/v1/firewall_policies_connection_idempotency_policy.h" #include "google/cloud/compute/firewall_policies/v1/internal/firewall_policies_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/firewall_policies/v1/firewall_policies_connection_idempotency_policy.h b/google/cloud/compute/firewall_policies/v1/firewall_policies_connection_idempotency_policy.h index f4b0a15c99be1..62cecaf282207 100644 --- a/google/cloud/compute/firewall_policies/v1/firewall_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/firewall_policies/v1/firewall_policies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_FIREWALL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_FIREWALL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/firewall_policies/v1/firewall_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/firewall_policies/v1/firewall_policies_proto_export.h b/google/cloud/compute/firewall_policies/v1/firewall_policies_proto_export.h index e49fe9dbb1be2..bcd7cd1c3dc5d 100644 --- a/google/cloud/compute/firewall_policies/v1/firewall_policies_proto_export.h +++ b/google/cloud/compute/firewall_policies/v1/firewall_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_FIREWALL_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_036.pb.h" +#include "google/cloud/compute/v1/internal/common_038.pb.h" +#include "google/cloud/compute/v1/internal/common_039.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_FIREWALL_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_connection_impl.h b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_connection_impl.h index f75ce1717c15a..7af3d0d955958 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_connection_impl.h +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/firewall_policies/v1/firewall_policies_options.h" #include "google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h" #include "google/cloud/compute/firewall_policies/v1/internal/firewall_policies_retry_traits.h" +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_logging_decorator.h b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_logging_decorator.h index f90a26b7b7882..f12035b374ea1 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_logging_decorator.h +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_INTERNAL_FIREWALL_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_INTERNAL_FIREWALL_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/firewall_policies/v1/firewall_policies.pb.h" #include "google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h" +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_metadata_decorator.h b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_metadata_decorator.h index 999ee0e3c8404..6bb29eb60dbfa 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_INTERNAL_FIREWALL_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_INTERNAL_FIREWALL_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/firewall_policies/v1/firewall_policies.pb.h" #include "google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h" +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc index 7cd537c35e2cc..ddda45dc47e75 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/firewall_policies/v1/firewall_policies.proto #include "google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h" +#include "google/cloud/compute/firewall_policies/v1/firewall_policies.pb.h" +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h index bba276c555118..d9de6b7cd4e55 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_INTERNAL_FIREWALL_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALL_POLICIES_V1_INTERNAL_FIREWALL_POLICIES_REST_STUB_H +#include "google/cloud/compute/firewall_policies/v1/firewall_policies.pb.h" +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc index d0843e5275cb0..4e4ac7975244e 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_firewall_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FirewallPoliciesTracingConnection::FirewallPoliciesTracingConnection( std::shared_ptr child) @@ -445,17 +443,13 @@ FirewallPoliciesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFirewallPoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.h b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.h index 60a9a77c599b4..d45a78edc3890 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.h +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_firewall_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FirewallPoliciesTracingConnection : public compute_firewall_policies_v1::FirewallPoliciesConnection { public: @@ -195,8 +193,6 @@ class FirewallPoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/firewalls/v1/firewalls_connection.h b/google/cloud/compute/firewalls/v1/firewalls_connection.h index d686a7390a33c..306f907e634a3 100644 --- a/google/cloud/compute/firewalls/v1/firewalls_connection.h +++ b/google/cloud/compute/firewalls/v1/firewalls_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_FIREWALLS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_FIREWALLS_CONNECTION_H +#include "google/cloud/compute/firewalls/v1/firewalls.pb.h" #include "google/cloud/compute/firewalls/v1/firewalls_connection_idempotency_policy.h" #include "google/cloud/compute/firewalls/v1/internal/firewalls_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/firewalls/v1/firewalls_connection_idempotency_policy.h b/google/cloud/compute/firewalls/v1/firewalls_connection_idempotency_policy.h index 664b20510f22c..57a9d5014eaf0 100644 --- a/google/cloud/compute/firewalls/v1/firewalls_connection_idempotency_policy.h +++ b/google/cloud/compute/firewalls/v1/firewalls_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_FIREWALLS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_FIREWALLS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/firewalls/v1/firewalls.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/firewalls/v1/firewalls_proto_export.h b/google/cloud/compute/firewalls/v1/firewalls_proto_export.h index 4161c2f545e86..7a630bcdc8e4a 100644 --- a/google/cloud/compute/firewalls/v1/firewalls_proto_export.h +++ b/google/cloud/compute/firewalls/v1/firewalls_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_FIREWALLS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_034.pb.h" +#include "google/cloud/compute/v1/internal/common_035.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_FIREWALLS_PROTO_EXPORT_H diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_connection_impl.h b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_connection_impl.h index 843f62cca0b09..ee060f3e03447 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_connection_impl.h +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/firewalls/v1/firewalls_options.h" #include "google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h" #include "google/cloud/compute/firewalls/v1/internal/firewalls_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_logging_decorator.h b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_logging_decorator.h index 0c4c801d4ccbd..b89384fe97444 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_logging_decorator.h +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_INTERNAL_FIREWALLS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_INTERNAL_FIREWALLS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/firewalls/v1/firewalls.pb.h" #include "google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_metadata_decorator.h b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_metadata_decorator.h index f78426ee1106f..92373eb1203f9 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_metadata_decorator.h +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_INTERNAL_FIREWALLS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_INTERNAL_FIREWALLS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/firewalls/v1/firewalls.pb.h" #include "google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc index b73f2d2ff33ce..6c9f431985505 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/firewalls/v1/firewalls.proto #include "google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h" +#include "google/cloud/compute/firewalls/v1/firewalls.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h index 82b7b51e8d2a1..25405c2ca0d1f 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_INTERNAL_FIREWALLS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FIREWALLS_V1_INTERNAL_FIREWALLS_REST_STUB_H +#include "google/cloud/compute/firewalls/v1/firewalls.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc b/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc index 3de8471ef6d88..98fc7e257429f 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_firewalls_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FirewallsTracingConnection::FirewallsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -178,16 +176,12 @@ FirewallsTracingConnection::UpdateFirewall( return internal::EndSpan(std::move(span), child_->UpdateFirewall(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFirewallsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.h b/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.h index 5dd274ecdabad..d002d9ee7d3e4 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.h +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_firewalls_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FirewallsTracingConnection : public compute_firewalls_v1::FirewallsConnection { public: @@ -100,8 +98,6 @@ class FirewallsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection.h b/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection.h index 916e1237698c3..a1e833bb376a1 100644 --- a/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection.h +++ b/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_FORWARDING_RULES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_FORWARDING_RULES_CONNECTION_H +#include "google/cloud/compute/forwarding_rules/v1/forwarding_rules.pb.h" #include "google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection_idempotency_policy.h" #include "google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection_idempotency_policy.h b/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection_idempotency_policy.h index 405c7b1026318..1a835c08eead2 100644 --- a/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection_idempotency_policy.h +++ b/google/cloud/compute/forwarding_rules/v1/forwarding_rules_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_FORWARDING_RULES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_FORWARDING_RULES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/forwarding_rules/v1/forwarding_rules.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/forwarding_rules/v1/forwarding_rules_proto_export.h b/google/cloud/compute/forwarding_rules/v1/forwarding_rules_proto_export.h index fa3a5ca0fdf04..61a7f37821cf3 100644 --- a/google/cloud/compute/forwarding_rules/v1/forwarding_rules_proto_export.h +++ b/google/cloud/compute/forwarding_rules/v1/forwarding_rules_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_FORWARDING_RULES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_041.pb.h" +#include "google/cloud/compute/v1/internal/common_042.pb.h" +#include "google/cloud/compute/v1/internal/common_082.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_140.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_FORWARDING_RULES_PROTO_EXPORT_H diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_connection_impl.h b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_connection_impl.h index 6cc9c9e198436..4a51bd342ad36 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_connection_impl.h +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/forwarding_rules/v1/forwarding_rules_options.h" #include "google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h" #include "google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_retry_traits.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_logging_decorator.h b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_logging_decorator.h index ddb6272802446..33ef656c88dad 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_logging_decorator.h +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_INTERNAL_FORWARDING_RULES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_INTERNAL_FORWARDING_RULES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/forwarding_rules/v1/forwarding_rules.pb.h" #include "google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_metadata_decorator.h b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_metadata_decorator.h index d1fea6b7b4ceb..65b98747489b1 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_metadata_decorator.h +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_INTERNAL_FORWARDING_RULES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_INTERNAL_FORWARDING_RULES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/forwarding_rules/v1/forwarding_rules.pb.h" #include "google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc index e0c5917e2ce89..071cdf8741129 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/forwarding_rules/v1/forwarding_rules.proto #include "google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h" +#include "google/cloud/compute/forwarding_rules/v1/forwarding_rules.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h index f806ae1681a88..0d40ad443b4fd 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_INTERNAL_FORWARDING_RULES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_FORWARDING_RULES_V1_INTERNAL_FORWARDING_RULES_REST_STUB_H +#include "google/cloud/compute/forwarding_rules/v1/forwarding_rules.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc index 626f5961cf85a..3cee62888d2fd 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_forwarding_rules_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ForwardingRulesTracingConnection::ForwardingRulesTracingConnection( std::shared_ptr child) @@ -239,17 +237,13 @@ ForwardingRulesTracingConnection::SetTarget( return internal::EndSpan(std::move(span), child_->SetTarget(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeForwardingRulesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.h b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.h index a885541afb5cd..d78ed59f062c7 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.h +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_forwarding_rules_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ForwardingRulesTracingConnection : public compute_forwarding_rules_v1::ForwardingRulesConnection { public: @@ -120,8 +118,6 @@ class ForwardingRulesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/global_addresses/v1/global_addresses_connection.h b/google/cloud/compute/global_addresses/v1/global_addresses_connection.h index 36af8d2e1aa68..6821a8893b501 100644 --- a/google/cloud/compute/global_addresses/v1/global_addresses_connection.h +++ b/google/cloud/compute/global_addresses/v1/global_addresses_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_GLOBAL_ADDRESSES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_GLOBAL_ADDRESSES_CONNECTION_H +#include "google/cloud/compute/global_addresses/v1/global_addresses.pb.h" #include "google/cloud/compute/global_addresses/v1/global_addresses_connection_idempotency_policy.h" #include "google/cloud/compute/global_addresses/v1/internal/global_addresses_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_addresses/v1/global_addresses_connection_idempotency_policy.h b/google/cloud/compute/global_addresses/v1/global_addresses_connection_idempotency_policy.h index 05ac635ead64c..9dd39bbc3f342 100644 --- a/google/cloud/compute/global_addresses/v1/global_addresses_connection_idempotency_policy.h +++ b/google/cloud/compute/global_addresses/v1/global_addresses_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_GLOBAL_ADDRESSES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_GLOBAL_ADDRESSES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/global_addresses/v1/global_addresses.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_addresses/v1/global_addresses_proto_export.h b/google/cloud/compute/global_addresses/v1/global_addresses_proto_export.h index 3b2675e7c4714..b0644b347d78c 100644 --- a/google/cloud/compute/global_addresses/v1/global_addresses_proto_export.h +++ b/google/cloud/compute/global_addresses/v1/global_addresses_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_GLOBAL_ADDRESSES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_004.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_044.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_GLOBAL_ADDRESSES_PROTO_EXPORT_H diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_connection_impl.h b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_connection_impl.h index 9dcebe11efcd4..c4728b4212c91 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_connection_impl.h +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/global_addresses/v1/global_addresses_options.h" #include "google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h" #include "google/cloud/compute/global_addresses/v1/internal/global_addresses_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_logging_decorator.h b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_logging_decorator.h index 8f746c9b5fbf7..d5ba84324f16b 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_logging_decorator.h +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_INTERNAL_GLOBAL_ADDRESSES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_INTERNAL_GLOBAL_ADDRESSES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_addresses/v1/global_addresses.pb.h" #include "google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_metadata_decorator.h b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_metadata_decorator.h index 3e7abe2d3cb82..1aa0271e26443 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_metadata_decorator.h +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_INTERNAL_GLOBAL_ADDRESSES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_INTERNAL_GLOBAL_ADDRESSES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_addresses/v1/global_addresses.pb.h" #include "google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc index aec352a15c1ea..67c50e57f1e93 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/global_addresses/v1/global_addresses.proto #include "google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h" +#include "google/cloud/compute/global_addresses/v1/global_addresses.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h index 29d639968d48f..f1f1a4cbff8d1 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_INTERNAL_GLOBAL_ADDRESSES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ADDRESSES_V1_INTERNAL_GLOBAL_ADDRESSES_REST_STUB_H +#include "google/cloud/compute/global_addresses/v1/global_addresses.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc b/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc index 43ce077775d21..34b6c4c69b648 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_global_addresses_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GlobalAddressesTracingConnection::GlobalAddressesTracingConnection( std::shared_ptr child) @@ -175,17 +173,13 @@ GlobalAddressesTracingConnection::SetLabels( return internal::EndSpan(std::move(span), child_->SetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGlobalAddressesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.h b/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.h index c37b2c276a4e0..9ee4fa21ee56b 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.h +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_global_addresses_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GlobalAddressesTracingConnection : public compute_global_addresses_v1::GlobalAddressesConnection { public: @@ -100,8 +98,6 @@ class GlobalAddressesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection.h b/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection.h index d474a3e7a2b53..52f0a05ea09b3 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection.h +++ b/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_GLOBAL_FORWARDING_RULES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_GLOBAL_FORWARDING_RULES_CONNECTION_H +#include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.pb.h" #include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection_idempotency_policy.h" #include "google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection_idempotency_policy.h b/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection_idempotency_policy.h index 9638038e19b43..0213beb4d3e29 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection_idempotency_policy.h +++ b/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_GLOBAL_FORWARDING_RULES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_GLOBAL_FORWARDING_RULES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_proto_export.h b/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_proto_export.h index ae5666e4aaac8..c09990225c10b 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_proto_export.h +++ b/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_GLOBAL_FORWARDING_RULES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_041.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_082.pb.h" +#include "google/cloud/compute/v1/internal/common_140.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_GLOBAL_FORWARDING_RULES_PROTO_EXPORT_H diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_connection_impl.h b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_connection_impl.h index 66d1f949ba4ed..2ede8b1e35b78 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_connection_impl.h +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules_options.h" #include "google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h" #include "google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_logging_decorator.h b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_logging_decorator.h index b394d85c984cf..5062878f48f4e 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_logging_decorator.h +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_INTERNAL_GLOBAL_FORWARDING_RULES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_INTERNAL_GLOBAL_FORWARDING_RULES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.pb.h" #include "google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_metadata_decorator.h b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_metadata_decorator.h index c6189a6195fba..d16c3cdf4e844 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_metadata_decorator.h +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_INTERNAL_GLOBAL_FORWARDING_RULES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_INTERNAL_GLOBAL_FORWARDING_RULES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.pb.h" #include "google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc index 0f6bb7bf7cef2..21b8d8561984f 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.proto #include "google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h" +#include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h index 0a7bd54efad4c..6fd78e018d521 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_INTERNAL_GLOBAL_FORWARDING_RULES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_FORWARDING_RULES_V1_INTERNAL_GLOBAL_FORWARDING_RULES_REST_STUB_H +#include "google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc index c1518bc87afa3..97edea702f291 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_global_forwarding_rules_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GlobalForwardingRulesTracingConnection::GlobalForwardingRulesTracingConnection( std::shared_ptr< compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection> @@ -230,20 +228,16 @@ GlobalForwardingRulesTracingConnection::SetTarget( return internal::EndSpan(std::move(span), child_->SetTarget(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection> MakeGlobalForwardingRulesTracingConnection( std::shared_ptr< compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.h b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.h index 9f1f84a8948ee..4380dc1a6fa56 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.h +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_global_forwarding_rules_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GlobalForwardingRulesTracingConnection : public compute_global_forwarding_rules_v1:: GlobalForwardingRulesConnection { @@ -119,8 +117,6 @@ class GlobalForwardingRulesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection.h b/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection.h index c040c4b929b09..919057308d41c 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_GLOBAL_NETWORK_ENDPOINT_GROUPS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_GLOBAL_NETWORK_ENDPOINT_GROUPS_CONNECTION_H +#include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.pb.h" #include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection_idempotency_policy.h" #include "google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection_idempotency_policy.h b/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection_idempotency_policy.h index 58992201b2b80..81906b6d238a9 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_GLOBAL_NETWORK_ENDPOINT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_GLOBAL_NETWORK_ENDPOINT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_proto_export.h b/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_proto_export.h index 9c4bcf1bbdb73..85c0a2ff64177 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_proto_export.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_GLOBAL_NETWORK_ENDPOINT_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_012.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_045.pb.h" +#include "google/cloud/compute/v1/internal/common_049.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_GLOBAL_NETWORK_ENDPOINT_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_connection_impl.h b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_connection_impl.h index 6b56ad6c2f252..8171e5dc1395b 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_connection_impl.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups_options.h" #include "google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h" #include "google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_retry_traits.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_logging_decorator.h b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_logging_decorator.h index df034ecdbcc1d..e9348ed5e4351 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_logging_decorator.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_GLOBAL_NETWORK_ENDPOINT_GROUPS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_GLOBAL_NETWORK_ENDPOINT_GROUPS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.pb.h" #include "google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_metadata_decorator.h b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_metadata_decorator.h index f9f27c66d3339..62ac23ede3332 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_GLOBAL_NETWORK_ENDPOINT_GROUPS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_GLOBAL_NETWORK_ENDPOINT_GROUPS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.pb.h" #include "google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc index 7a9d0a7f5d0e5..680288f599474 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.proto #include "google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h index a0d086cbc808b..54bf65b56f883 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_GLOBAL_NETWORK_ENDPOINT_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_GLOBAL_NETWORK_ENDPOINT_GROUPS_REST_STUB_H +#include "google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.pb.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc index 395ecd76fe812..0d1ca9230a3a0 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_global_network_endpoint_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GlobalNetworkEndpointGroupsTracingConnection:: GlobalNetworkEndpointGroupsTracingConnection( std::shared_ptr MakeGlobalNetworkEndpointGroupsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.h b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.h index d9cb04e416891..b5cf80e70d826 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.h +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_global_network_endpoint_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GlobalNetworkEndpointGroupsTracingConnection : public compute_global_network_endpoint_groups_v1:: GlobalNetworkEndpointGroupsConnection { @@ -123,8 +121,6 @@ class GlobalNetworkEndpointGroupsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/global_operations/v1/global_operations_connection.h b/google/cloud/compute/global_operations/v1/global_operations_connection.h index bb1fa3207966f..7b37e9c128b40 100644 --- a/google/cloud/compute/global_operations/v1/global_operations_connection.h +++ b/google/cloud/compute/global_operations/v1/global_operations_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_GLOBAL_OPERATIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_GLOBAL_OPERATIONS_CONNECTION_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/global_operations/v1/global_operations_connection_idempotency_policy.h" #include "google/cloud/compute/global_operations/v1/internal/global_operations_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_operations/v1/global_operations_connection_idempotency_policy.h b/google/cloud/compute/global_operations/v1/global_operations_connection_idempotency_policy.h index 1456bd7a638c1..eb9db1c7005f8 100644 --- a/google/cloud/compute/global_operations/v1/global_operations_connection_idempotency_policy.h +++ b/google/cloud/compute/global_operations/v1/global_operations_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_GLOBAL_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_GLOBAL_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_operations/v1/global_operations_proto_export.h b/google/cloud/compute/global_operations/v1/global_operations_proto_export.h index 9b4e1bd4a2a7c..a852292680565 100644 --- a/google/cloud/compute/global_operations/v1/global_operations_proto_export.h +++ b/google/cloud/compute/global_operations/v1/global_operations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_GLOBAL_OPERATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_091.pb.h" +#include "google/cloud/compute/v1/internal/common_092.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_GLOBAL_OPERATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_logging_decorator.h b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_logging_decorator.h index c32bb2066b2bd..466f5f6dfebe8 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_logging_decorator.h +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_INTERNAL_GLOBAL_OPERATIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_INTERNAL_GLOBAL_OPERATIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_metadata_decorator.h b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_metadata_decorator.h index 2f4d226ed34a0..c691a96c4b976 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_metadata_decorator.h +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_INTERNAL_GLOBAL_OPERATIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_INTERNAL_GLOBAL_OPERATIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc index 7053cc0447708..90dc482e4283c 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/global_operations/v1/global_operations.proto #include "google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h index 63ca4d5701179..99fa038c34624 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_INTERNAL_GLOBAL_OPERATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_OPERATIONS_V1_INTERNAL_GLOBAL_OPERATIONS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc b/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc index 4531311a30dd5..880f012c46728 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_global_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GlobalOperationsTracingConnection::GlobalOperationsTracingConnection( std::shared_ptr child) @@ -93,17 +91,13 @@ GlobalOperationsTracingConnection::Wait( return internal::EndSpan(*span, child_->Wait(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGlobalOperationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.h b/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.h index 6d34354421f18..c214ebdea70fd 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.h +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_global_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GlobalOperationsTracingConnection : public compute_global_operations_v1::GlobalOperationsConnection { public: @@ -67,8 +65,6 @@ class GlobalOperationsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection.h b/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection.h index 6abcdf536143c..8d0853fbcae26 100644 --- a/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection.h +++ b/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_GLOBAL_ORGANIZATION_OPERATIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_GLOBAL_ORGANIZATION_OPERATIONS_CONNECTION_H +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection_idempotency_policy.h" #include "google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection_idempotency_policy.h b/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection_idempotency_policy.h index f570f75b64a04..85f7e1e71c11a 100644 --- a/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection_idempotency_policy.h +++ b/google/cloud/compute/global_organization_operations/v1/global_organization_operations_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_GLOBAL_ORGANIZATION_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_GLOBAL_ORGANIZATION_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_organization_operations/v1/global_organization_operations_proto_export.h b/google/cloud/compute/global_organization_operations/v1/global_organization_operations_proto_export.h index a4f38ef4e7e05..dabfdd3777981 100644 --- a/google/cloud/compute/global_organization_operations/v1/global_organization_operations_proto_export.h +++ b/google/cloud/compute/global_organization_operations/v1/global_organization_operations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_GLOBAL_ORGANIZATION_OPERATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_092.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_GLOBAL_ORGANIZATION_OPERATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_logging_decorator.h b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_logging_decorator.h index 199013dffbc66..3b92e2f393c55 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_logging_decorator.h +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_logging_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_INTERNAL_GLOBAL_ORGANIZATION_OPERATIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_INTERNAL_GLOBAL_ORGANIZATION_OPERATIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_metadata_decorator.h b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_metadata_decorator.h index 7706b415dfdec..ea8cc7448a2e3 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_metadata_decorator.h +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_INTERNAL_GLOBAL_ORGANIZATION_OPERATIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_INTERNAL_GLOBAL_ORGANIZATION_OPERATIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc index 6aa5cfdb5a12f..7af61c393c591 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc @@ -18,11 +18,11 @@ // google/cloud/compute/global_organization_operations/v1/global_organization_operations.proto #include "google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h" +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h index baa90d8f1188b..3ce16faec42d5 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_INTERNAL_GLOBAL_ORGANIZATION_OPERATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_ORGANIZATION_OPERATIONS_V1_INTERNAL_GLOBAL_ORGANIZATION_OPERATIONS_REST_STUB_H +#include "google/cloud/compute/global_organization_operations/v1/global_organization_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc index 19894b8612dee..d5c7c30490015 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_global_organization_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GlobalOrganizationOperationsTracingConnection:: GlobalOrganizationOperationsTracingConnection( std::shared_ptr MakeGlobalOrganizationOperationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.h b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.h index b5a00a6c77941..1d551b3822eba 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.h +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_global_organization_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GlobalOrganizationOperationsTracingConnection : public compute_global_organization_operations_v1:: GlobalOrganizationOperationsConnection { @@ -63,8 +61,6 @@ class GlobalOrganizationOperationsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection.h b/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection.h index e482a2f2f1c02..889c1f83b27aa 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_GLOBAL_PUBLIC_DELEGATED_PREFIXES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_GLOBAL_PUBLIC_DELEGATED_PREFIXES_CONNECTION_H +#include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.pb.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection_idempotency_policy.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection_idempotency_policy.h b/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection_idempotency_policy.h index 02f5160520231..518754b9a6d8b 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection_idempotency_policy.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_GLOBAL_PUBLIC_DELEGATED_PREFIXES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_GLOBAL_PUBLIC_DELEGATED_PREFIXES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_proto_export.h b/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_proto_export.h index 936e6c756e778..3bdf0adb99009 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_proto_export.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_GLOBAL_PUBLIC_DELEGATED_PREFIXES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_096.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_GLOBAL_PUBLIC_DELEGATED_PREFIXES_PROTO_EXPORT_H diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_connection_impl.h b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_connection_impl.h index 6bf23a41a32a0..8521b727ff8ae 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_connection_impl.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_connection_idempotency_policy.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes_options.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_logging_decorator.h b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_logging_decorator.h index e5b594868ac48..fb49a38450665 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_logging_decorator.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.pb.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_metadata_decorator.h b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_metadata_decorator.h index 5b408b13209ed..f1b776d49f4ee 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_metadata_decorator.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.pb.h" #include "google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc index 9fc1f7d2baa1f..8f804f3b3bb52 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.proto #include "google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h index 96f7f5af217b9..bb18c3812e678 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_GLOBAL_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_GLOBAL_PUBLIC_DELEGATED_PREFIXES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc index 8214dab74573e..fdbb9e2dc10df 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_global_public_delegated_prefixes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GlobalPublicDelegatedPrefixesTracingConnection:: GlobalPublicDelegatedPrefixesTracingConnection( std::shared_ptrPatchPublicDelegatedPrefix(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGlobalPublicDelegatedPrefixesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.h b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.h index 4d60c19389a68..91fc3331b55ec 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.h +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_global_public_delegated_prefixes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GlobalPublicDelegatedPrefixesTracingConnection : public compute_global_public_delegated_prefixes_v1:: GlobalPublicDelegatedPrefixesConnection { @@ -105,8 +103,6 @@ class GlobalPublicDelegatedPrefixesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/health_checks/v1/health_checks_connection.h b/google/cloud/compute/health_checks/v1/health_checks_connection.h index 2b1d604807980..64cac99cbb912 100644 --- a/google/cloud/compute/health_checks/v1/health_checks_connection.h +++ b/google/cloud/compute/health_checks/v1/health_checks_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_HEALTH_CHECKS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_HEALTH_CHECKS_CONNECTION_H +#include "google/cloud/compute/health_checks/v1/health_checks.pb.h" #include "google/cloud/compute/health_checks/v1/health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/health_checks/v1/internal/health_checks_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/health_checks/v1/health_checks_connection_idempotency_policy.h b/google/cloud/compute/health_checks/v1/health_checks_connection_idempotency_policy.h index de1dd32d0708e..33509b33bac1c 100644 --- a/google/cloud/compute/health_checks/v1/health_checks_connection_idempotency_policy.h +++ b/google/cloud/compute/health_checks/v1/health_checks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/health_checks/v1/health_checks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/health_checks/v1/health_checks_proto_export.h b/google/cloud/compute/health_checks/v1/health_checks_proto_export.h index 07f8f7811d0d6..5c60b105d1b1d 100644 --- a/google/cloud/compute/health_checks/v1/health_checks_proto_export.h +++ b/google/cloud/compute/health_checks/v1/health_checks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_HEALTH_CHECKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_043.pb.h" +#include "google/cloud/compute/v1/internal/common_051.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_HEALTH_CHECKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_connection_impl.h b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_connection_impl.h index 9556f3daecb25..ecfec7fd13ecb 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_connection_impl.h +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/health_checks/v1/health_checks_connection.h" #include "google/cloud/compute/health_checks/v1/health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/health_checks/v1/health_checks_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_logging_decorator.h b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_logging_decorator.h index 8223380c4d150..c78abceaf2b87 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_logging_decorator.h +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/health_checks/v1/health_checks.pb.h" #include "google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_metadata_decorator.h b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_metadata_decorator.h index bd8e9958f435e..93b69705c98ec 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_metadata_decorator.h +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/health_checks/v1/health_checks.pb.h" #include "google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc index 3f34d96af82eb..170a0665ae299 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/health_checks/v1/health_checks.proto #include "google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/health_checks/v1/health_checks.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h index a7dbeca38c2cc..05a450573c646 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HEALTH_CHECKS_V1_INTERNAL_HEALTH_CHECKS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/health_checks/v1/health_checks.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc b/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc index 3ba5d35de0f19..833f7dc3027ef 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - HealthChecksTracingConnection::HealthChecksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -195,16 +193,12 @@ HealthChecksTracingConnection::UpdateHealthCheck( child_->UpdateHealthCheck(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeHealthChecksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.h b/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.h index 8d954ee26b01c..974780dd37442 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.h +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class HealthChecksTracingConnection : public compute_health_checks_v1::HealthChecksConnection { public: @@ -105,8 +103,6 @@ class HealthChecksTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/http_health_checks/v1/http_health_checks_connection.h b/google/cloud/compute/http_health_checks/v1/http_health_checks_connection.h index 232b424b1631b..bfbd229fb0c98 100644 --- a/google/cloud/compute/http_health_checks/v1/http_health_checks_connection.h +++ b/google/cloud/compute/http_health_checks/v1/http_health_checks_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_HTTP_HEALTH_CHECKS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_HTTP_HEALTH_CHECKS_CONNECTION_H +#include "google/cloud/compute/http_health_checks/v1/http_health_checks.pb.h" #include "google/cloud/compute/http_health_checks/v1/http_health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/http_health_checks/v1/internal/http_health_checks_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/http_health_checks/v1/http_health_checks_connection_idempotency_policy.h b/google/cloud/compute/http_health_checks/v1/http_health_checks_connection_idempotency_policy.h index c5705aec85109..0331861527f92 100644 --- a/google/cloud/compute/http_health_checks/v1/http_health_checks_connection_idempotency_policy.h +++ b/google/cloud/compute/http_health_checks/v1/http_health_checks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_HTTP_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_HTTP_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/http_health_checks/v1/http_health_checks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/http_health_checks/v1/http_health_checks_proto_export.h b/google/cloud/compute/http_health_checks/v1/http_health_checks_proto_export.h index ce6e5e8d550a0..a13ad208156f7 100644 --- a/google/cloud/compute/http_health_checks/v1/http_health_checks_proto_export.h +++ b/google/cloud/compute/http_health_checks/v1/http_health_checks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_HTTP_HEALTH_CHECKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_053.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_HTTP_HEALTH_CHECKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_connection_impl.h b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_connection_impl.h index 85c0aab4c7aa8..179953db0964c 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_connection_impl.h +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/http_health_checks/v1/http_health_checks_connection.h" #include "google/cloud/compute/http_health_checks/v1/http_health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/http_health_checks/v1/http_health_checks_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_logging_decorator.h b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_logging_decorator.h index 208659d5958b8..3b222e76e2943 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_logging_decorator.h +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/http_health_checks/v1/http_health_checks.pb.h" #include "google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_metadata_decorator.h b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_metadata_decorator.h index 929687ed0cea0..f754cfe186d5e 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_metadata_decorator.h +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/http_health_checks/v1/http_health_checks.pb.h" #include "google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc index 5f29e7bf9edf5..43cc6153f40e4 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/http_health_checks/v1/http_health_checks.proto #include "google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/http_health_checks/v1/http_health_checks.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h index adc1c38d7592c..54d00d9043be2 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTP_HEALTH_CHECKS_V1_INTERNAL_HTTP_HEALTH_CHECKS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/http_health_checks/v1/http_health_checks.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc index 35a0dafd16512..6133ccec68b9f 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_http_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - HttpHealthChecksTracingConnection::HttpHealthChecksTracingConnection( std::shared_ptr child) @@ -199,17 +197,13 @@ HttpHealthChecksTracingConnection::UpdateHttpHealthCheck( child_->UpdateHttpHealthCheck(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeHttpHealthChecksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.h b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.h index 81db483011e1d..3ee4fc55438ea 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.h +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_http_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class HttpHealthChecksTracingConnection : public compute_http_health_checks_v1::HttpHealthChecksConnection { public: @@ -105,8 +103,6 @@ class HttpHealthChecksTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/https_health_checks/v1/https_health_checks_connection.h b/google/cloud/compute/https_health_checks/v1/https_health_checks_connection.h index 1eef33f981762..49a98c41909e0 100644 --- a/google/cloud/compute/https_health_checks/v1/https_health_checks_connection.h +++ b/google/cloud/compute/https_health_checks/v1/https_health_checks_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_HTTPS_HEALTH_CHECKS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_HTTPS_HEALTH_CHECKS_CONNECTION_H +#include "google/cloud/compute/https_health_checks/v1/https_health_checks.pb.h" #include "google/cloud/compute/https_health_checks/v1/https_health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/https_health_checks/v1/internal/https_health_checks_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/https_health_checks/v1/https_health_checks_connection_idempotency_policy.h b/google/cloud/compute/https_health_checks/v1/https_health_checks_connection_idempotency_policy.h index bd5ab768587d0..9d2c5fa4840c1 100644 --- a/google/cloud/compute/https_health_checks/v1/https_health_checks_connection_idempotency_policy.h +++ b/google/cloud/compute/https_health_checks/v1/https_health_checks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_HTTPS_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_HTTPS_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/https_health_checks/v1/https_health_checks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/https_health_checks/v1/https_health_checks_proto_export.h b/google/cloud/compute/https_health_checks/v1/https_health_checks_proto_export.h index 214512fc76438..51f70130f5f90 100644 --- a/google/cloud/compute/https_health_checks/v1/https_health_checks_proto_export.h +++ b/google/cloud/compute/https_health_checks/v1/https_health_checks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_HTTPS_HEALTH_CHECKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_054.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_HTTPS_HEALTH_CHECKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_connection_impl.h b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_connection_impl.h index c74c9be1eeffa..0ae2e47902d61 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_connection_impl.h +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/https_health_checks/v1/https_health_checks_connection.h" #include "google/cloud/compute/https_health_checks/v1/https_health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/https_health_checks/v1/https_health_checks_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_logging_decorator.h b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_logging_decorator.h index 29d12cb121c8a..a4044050d7a70 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_logging_decorator.h +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/https_health_checks/v1/https_health_checks.pb.h" #include "google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_metadata_decorator.h b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_metadata_decorator.h index 2f681a6c3e2cc..1ba2fe726fbf3 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_metadata_decorator.h +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/https_health_checks/v1/https_health_checks.pb.h" #include "google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc index abb69ebd058a7..7dd08fe41763f 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/https_health_checks/v1/https_health_checks.proto #include "google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/https_health_checks/v1/https_health_checks.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h index dae0e36e2d679..839455228655b 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_HTTPS_HEALTH_CHECKS_V1_INTERNAL_HTTPS_HEALTH_CHECKS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/https_health_checks/v1/https_health_checks.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc index f9cb9d6350eb6..003dc4e104b07 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_https_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - HttpsHealthChecksTracingConnection::HttpsHealthChecksTracingConnection( std::shared_ptr child) @@ -199,18 +197,14 @@ HttpsHealthChecksTracingConnection::UpdateHttpsHealthCheck( child_->UpdateHttpsHealthCheck(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeHttpsHealthChecksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.h b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.h index ee4415896bad5..623f2c83bc1f5 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.h +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_https_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class HttpsHealthChecksTracingConnection : public compute_https_health_checks_v1::HttpsHealthChecksConnection { public: @@ -107,8 +105,6 @@ class HttpsHealthChecksTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/image_family_views/v1/image_family_views_connection.h b/google/cloud/compute/image_family_views/v1/image_family_views_connection.h index 762803e3465b0..a96e38c33f528 100644 --- a/google/cloud/compute/image_family_views/v1/image_family_views_connection.h +++ b/google/cloud/compute/image_family_views/v1/image_family_views_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_IMAGE_FAMILY_VIEWS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_IMAGE_FAMILY_VIEWS_CONNECTION_H +#include "google/cloud/compute/image_family_views/v1/image_family_views.pb.h" #include "google/cloud/compute/image_family_views/v1/image_family_views_connection_idempotency_policy.h" #include "google/cloud/compute/image_family_views/v1/internal/image_family_views_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/image_family_views/v1/image_family_views_connection_idempotency_policy.h b/google/cloud/compute/image_family_views/v1/image_family_views_connection_idempotency_policy.h index c74e9e06ad121..09b22b75836ee 100644 --- a/google/cloud/compute/image_family_views/v1/image_family_views_connection_idempotency_policy.h +++ b/google/cloud/compute/image_family_views/v1/image_family_views_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_IMAGE_FAMILY_VIEWS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_IMAGE_FAMILY_VIEWS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/image_family_views/v1/image_family_views.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/image_family_views/v1/image_family_views_proto_export.h b/google/cloud/compute/image_family_views/v1/image_family_views_proto_export.h index 0a7e7b3e1b323..146a2bb003e35 100644 --- a/google/cloud/compute/image_family_views/v1/image_family_views_proto_export.h +++ b/google/cloud/compute/image_family_views/v1/image_family_views_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_IMAGE_FAMILY_VIEWS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_055.pb.h" +#include "google/cloud/compute/v1/internal/common_056.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_IMAGE_FAMILY_VIEWS_PROTO_EXPORT_H diff --git a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_logging_decorator.h b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_logging_decorator.h index 431e169e8da0a..9e51e9d3a3e0b 100644 --- a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_logging_decorator.h +++ b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_INTERNAL_IMAGE_FAMILY_VIEWS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_INTERNAL_IMAGE_FAMILY_VIEWS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/image_family_views/v1/image_family_views.pb.h" #include "google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_metadata_decorator.h b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_metadata_decorator.h index 2eeeaa856f688..206246ba7eb42 100644 --- a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_metadata_decorator.h +++ b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_INTERNAL_IMAGE_FAMILY_VIEWS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_INTERNAL_IMAGE_FAMILY_VIEWS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/image_family_views/v1/image_family_views.pb.h" #include "google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.cc b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.cc index f38c7cb7ec434..7c3dce112ff1c 100644 --- a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.cc +++ b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/image_family_views/v1/image_family_views.proto #include "google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h" +#include "google/cloud/compute/image_family_views/v1/image_family_views.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h index 39e3f07933450..e0eb9af3e660f 100644 --- a/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h +++ b/google/cloud/compute/image_family_views/v1/internal/image_family_views_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_INTERNAL_IMAGE_FAMILY_VIEWS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGE_FAMILY_VIEWS_V1_INTERNAL_IMAGE_FAMILY_VIEWS_REST_STUB_H +#include "google/cloud/compute/image_family_views/v1/image_family_views.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.cc b/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.cc index 510420f154d0e..85c41acea1cdf 100644 --- a/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.cc +++ b/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace compute_image_family_views_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ImageFamilyViewsTracingConnection::ImageFamilyViewsTracingConnection( std::shared_ptr child) @@ -44,17 +42,13 @@ ImageFamilyViewsTracingConnection::GetImageFamilyView( return internal::EndSpan(*span, child_->GetImageFamilyView(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeImageFamilyViewsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.h b/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.h index b1251ec5d15b7..c79c7304088a0 100644 --- a/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.h +++ b/google/cloud/compute/image_family_views/v1/internal/image_family_views_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_image_family_views_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ImageFamilyViewsTracingConnection : public compute_image_family_views_v1::ImageFamilyViewsConnection { public: @@ -50,8 +48,6 @@ class ImageFamilyViewsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/images/v1/images_connection.h b/google/cloud/compute/images/v1/images_connection.h index d99bb28b73b51..032f39646bcbc 100644 --- a/google/cloud/compute/images/v1/images_connection.h +++ b/google/cloud/compute/images/v1/images_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_IMAGES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_IMAGES_CONNECTION_H +#include "google/cloud/compute/images/v1/images.pb.h" #include "google/cloud/compute/images/v1/images_connection_idempotency_policy.h" #include "google/cloud/compute/images/v1/internal/images_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/images/v1/images_connection_idempotency_policy.h b/google/cloud/compute/images/v1/images_connection_idempotency_policy.h index bd35efb38c5bf..96bfe2ca31240 100644 --- a/google/cloud/compute/images/v1/images_connection_idempotency_policy.h +++ b/google/cloud/compute/images/v1/images_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_IMAGES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_IMAGES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/images/v1/images.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/images/v1/images_proto_export.h b/google/cloud/compute/images/v1/images_proto_export.h index fe8b9fa1bfb19..f3f6cb0503048 100644 --- a/google/cloud/compute/images/v1/images_proto_export.h +++ b/google/cloud/compute/images/v1/images_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,17 +26,17 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_IMAGES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_055.pb.h" +#include "google/cloud/compute/v1/internal/common_057.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_IMAGES_PROTO_EXPORT_H diff --git a/google/cloud/compute/images/v1/internal/images_rest_connection_impl.h b/google/cloud/compute/images/v1/internal/images_rest_connection_impl.h index 6b9e78ffe99e6..b03c8d83990d0 100644 --- a/google/cloud/compute/images/v1/internal/images_rest_connection_impl.h +++ b/google/cloud/compute/images/v1/internal/images_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/images/v1/images_connection.h" #include "google/cloud/compute/images/v1/images_connection_idempotency_policy.h" #include "google/cloud/compute/images/v1/images_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/images/v1/internal/images_rest_logging_decorator.h b/google/cloud/compute/images/v1/internal/images_rest_logging_decorator.h index 8b09031c69def..e10ca39c2bae4 100644 --- a/google/cloud/compute/images/v1/internal/images_rest_logging_decorator.h +++ b/google/cloud/compute/images/v1/internal/images_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/images/v1/images.pb.h" #include "google/cloud/compute/images/v1/internal/images_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/images/v1/internal/images_rest_metadata_decorator.h b/google/cloud/compute/images/v1/internal/images_rest_metadata_decorator.h index e0f76df2bde9c..0bcd441b2358c 100644 --- a/google/cloud/compute/images/v1/internal/images_rest_metadata_decorator.h +++ b/google/cloud/compute/images/v1/internal/images_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/images/v1/images.pb.h" #include "google/cloud/compute/images/v1/internal/images_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/images/v1/internal/images_rest_stub.cc b/google/cloud/compute/images/v1/internal/images_rest_stub.cc index 28689f74484bb..91ec5d9329bd8 100644 --- a/google/cloud/compute/images/v1/internal/images_rest_stub.cc +++ b/google/cloud/compute/images/v1/internal/images_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/images/v1/images.proto #include "google/cloud/compute/images/v1/internal/images_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/images/v1/images.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/images/v1/internal/images_rest_stub.h b/google/cloud/compute/images/v1/internal/images_rest_stub.h index d91dfe754258e..beffdbfb4bc94 100644 --- a/google/cloud/compute/images/v1/internal/images_rest_stub.h +++ b/google/cloud/compute/images/v1/internal/images_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_IMAGES_V1_INTERNAL_IMAGES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/images/v1/images.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/images/v1/internal/images_tracing_connection.cc b/google/cloud/compute/images/v1/internal/images_tracing_connection.cc index 229d78fef945b..fd3396db79480 100644 --- a/google/cloud/compute/images/v1/internal/images_tracing_connection.cc +++ b/google/cloud/compute/images/v1/internal/images_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_images_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ImagesTracingConnection::ImagesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -237,16 +235,12 @@ ImagesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeImagesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/images/v1/internal/images_tracing_connection.h b/google/cloud/compute/images/v1/internal/images_tracing_connection.h index ae8024b7803fe..46c62b9a72a56 100644 --- a/google/cloud/compute/images/v1/internal/images_tracing_connection.h +++ b/google/cloud/compute/images/v1/internal/images_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_images_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ImagesTracingConnection : public compute_images_v1::ImagesConnection { public: ~ImagesTracingConnection() override = default; @@ -128,8 +126,6 @@ class ImagesTracingConnection : public compute_images_v1::ImagesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection.h index ccef4edcec104..46948a3f913ce 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_CONNECTION_H +#include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.pb.h" #include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection_idempotency_policy.h" #include "google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection_idempotency_policy.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection_idempotency_policy.h index 1ea821af37246..49473681d357e 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection_idempotency_policy.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_proto_export.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_proto_export.h index fdf73bd8dd4a5..2faf312babb8f 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_proto_export.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_062.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_connection_impl.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_connection_impl.h index 9168e56ddcac0..f49f9336b14a5 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_connection_impl.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests_options.h" #include "google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h" #include "google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_logging_decorator.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_logging_decorator.h index 30c7e63ceb8da..c7c016d51637c 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_logging_decorator.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INTERNAL_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INTERNAL_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.pb.h" #include "google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_metadata_decorator.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_metadata_decorator.h index 78149bff6edca..b3dcef4a5d809 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_metadata_decorator.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INTERNAL_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INTERNAL_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.pb.h" #include "google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc index 29bd4ccaafbee..452a8c8b5d891 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.proto #include "google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h" +#include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h index bc761578966cc..340c586e3cfe9 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INTERNAL_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_V1_INTERNAL_INSTANCE_GROUP_MANAGER_RESIZE_REQUESTS_REST_STUB_H +#include "google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.cc b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.cc index 4b7b1730b3356..5db39e52f3b0c 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.cc +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instance_group_manager_resize_requests_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceGroupManagerResizeRequestsTracingConnection:: InstanceGroupManagerResizeRequestsTracingConnection( std::shared_ptr MakeInstanceGroupManagerResizeRequestsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.h b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.h index abc797c1606b9..ee0d518853d00 100644 --- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.h +++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_instance_group_manager_resize_requests_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceGroupManagerResizeRequestsTracingConnection : public compute_instance_group_manager_resize_requests_v1:: InstanceGroupManagerResizeRequestsConnection { @@ -107,8 +105,6 @@ class InstanceGroupManagerResizeRequestsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection.h b/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection.h index 729287452b7b4..0c8e4a89d39b5 100644 --- a/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection.h +++ b/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INSTANCE_GROUP_MANAGERS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INSTANCE_GROUP_MANAGERS_CONNECTION_H +#include "google/cloud/compute/instance_group_managers/v1/instance_group_managers.pb.h" #include "google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection_idempotency_policy.h" #include "google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection_idempotency_policy.h b/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection_idempotency_policy.h index 4642adc850653..f92e87f3bd5c2 100644 --- a/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection_idempotency_policy.h +++ b/google/cloud/compute/instance_group_managers/v1/instance_group_managers_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INSTANCE_GROUP_MANAGERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INSTANCE_GROUP_MANAGERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instance_group_managers/v1/instance_group_managers.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_managers/v1/instance_group_managers_proto_export.h b/google/cloud/compute/instance_group_managers/v1/instance_group_managers_proto_export.h index 72623033ec843..145560402f9c2 100644 --- a/google/cloud/compute/instance_group_managers/v1/instance_group_managers_proto_export.h +++ b/google/cloud/compute/instance_group_managers/v1/instance_group_managers_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INSTANCE_GROUP_MANAGERS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_028.pb.h" +#include "google/cloud/compute/v1/internal/common_040.pb.h" +#include "google/cloud/compute/v1/internal/common_061.pb.h" +#include "google/cloud/compute/v1/internal/common_083.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INSTANCE_GROUP_MANAGERS_PROTO_EXPORT_H diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_connection_impl.h b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_connection_impl.h index f96d0514093d8..5f02bfce975dc 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_connection_impl.h +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/instance_group_managers/v1/instance_group_managers_options.h" #include "google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h" #include "google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_logging_decorator.h b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_logging_decorator.h index 7f5700935f353..3ab17bd676f64 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_logging_decorator.h +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_INSTANCE_GROUP_MANAGERS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_INSTANCE_GROUP_MANAGERS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/instance_group_managers/v1/instance_group_managers.pb.h" #include "google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_metadata_decorator.h b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_metadata_decorator.h index 9f45284f5a733..07188df200b53 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_metadata_decorator.h +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_INSTANCE_GROUP_MANAGERS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_INSTANCE_GROUP_MANAGERS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/instance_group_managers/v1/instance_group_managers.pb.h" #include "google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc index 6db8ab4a8a3c5..c746c8dcd9e10 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/instance_group_managers/v1/instance_group_managers.proto #include "google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h" +#include "google/cloud/compute/instance_group_managers/v1/instance_group_managers.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h index 03431f352633f..90719f386dcc1 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_INSTANCE_GROUP_MANAGERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_INSTANCE_GROUP_MANAGERS_REST_STUB_H +#include "google/cloud/compute/instance_group_managers/v1/instance_group_managers.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc index 98cbe255dce1f..78363d452094d 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instance_group_managers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceGroupManagersTracingConnection::InstanceGroupManagersTracingConnection( std::shared_ptr< compute_instance_group_managers_v1::InstanceGroupManagersConnection> @@ -729,20 +727,16 @@ InstanceGroupManagersTracingConnection::UpdatePerInstanceConfigs( child_->UpdatePerInstanceConfigs(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_instance_group_managers_v1::InstanceGroupManagersConnection> MakeInstanceGroupManagersTracingConnection( std::shared_ptr< compute_instance_group_managers_v1::InstanceGroupManagersConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.h b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.h index bc4903491085c..75a368d5e5cc9 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.h +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_instance_group_managers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceGroupManagersTracingConnection : public compute_instance_group_managers_v1:: InstanceGroupManagersConnection { @@ -300,8 +298,6 @@ class InstanceGroupManagersTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instance_groups/v1/instance_groups_connection.h b/google/cloud/compute/instance_groups/v1/instance_groups_connection.h index 6a4e91ef3f30c..3fd4fe1ca3bdd 100644 --- a/google/cloud/compute/instance_groups/v1/instance_groups_connection.h +++ b/google/cloud/compute/instance_groups/v1/instance_groups_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INSTANCE_GROUPS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INSTANCE_GROUPS_CONNECTION_H +#include "google/cloud/compute/instance_groups/v1/instance_groups.pb.h" #include "google/cloud/compute/instance_groups/v1/instance_groups_connection_idempotency_policy.h" #include "google/cloud/compute/instance_groups/v1/internal/instance_groups_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_groups/v1/instance_groups_connection_idempotency_policy.h b/google/cloud/compute/instance_groups/v1/instance_groups_connection_idempotency_policy.h index 15baaf2fee932..4af7d05610ffe 100644 --- a/google/cloud/compute/instance_groups/v1/instance_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/instance_groups/v1/instance_groups_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INSTANCE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INSTANCE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instance_groups/v1/instance_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_groups/v1/instance_groups_proto_export.h b/google/cloud/compute/instance_groups/v1/instance_groups_proto_export.h index 14bd93fa6fde8..8eb5aa4cfea08 100644 --- a/google/cloud/compute/instance_groups/v1/instance_groups_proto_export.h +++ b/google/cloud/compute/instance_groups/v1/instance_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INSTANCE_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_059.pb.h" +#include "google/cloud/compute/v1/internal/common_060.pb.h" +#include "google/cloud/compute/v1/internal/common_063.pb.h" +#include "google/cloud/compute/v1/internal/common_083.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INSTANCE_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_connection_impl.h b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_connection_impl.h index 28cb90fa597ab..fb7274910a49a 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_connection_impl.h +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/instance_groups/v1/instance_groups_options.h" #include "google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h" #include "google/cloud/compute/instance_groups/v1/internal/instance_groups_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_logging_decorator.h b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_logging_decorator.h index 66d4023e82ab3..7b57f38e1a55d 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_logging_decorator.h +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INTERNAL_INSTANCE_GROUPS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INTERNAL_INSTANCE_GROUPS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/instance_groups/v1/instance_groups.pb.h" #include "google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_metadata_decorator.h b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_metadata_decorator.h index 4a2ce26e2bcb6..bfbe7cbcbac7e 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INTERNAL_INSTANCE_GROUPS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INTERNAL_INSTANCE_GROUPS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/instance_groups/v1/instance_groups.pb.h" #include "google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc index 6325015b90dc5..0465f411d3bbe 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/instance_groups/v1/instance_groups.proto #include "google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h" +#include "google/cloud/compute/instance_groups/v1/instance_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h index a697028599288..699c86660ad21 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INTERNAL_INSTANCE_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_GROUPS_V1_INTERNAL_INSTANCE_GROUPS_REST_STUB_H +#include "google/cloud/compute/instance_groups/v1/instance_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc b/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc index bdab63c583d9d..60969134a114a 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_instance_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceGroupsTracingConnection::InstanceGroupsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -244,17 +242,13 @@ InstanceGroupsTracingConnection::SetNamedPorts( return internal::EndSpan(std::move(span), child_->SetNamedPorts(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceGroupsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.h b/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.h index d77123a6031f2..2411e33285b74 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.h +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instance_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceGroupsTracingConnection : public compute_instance_groups_v1::InstanceGroupsConnection { public: @@ -121,8 +119,6 @@ class InstanceGroupsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instance_settings/v1/instance_settings_connection.h b/google/cloud/compute/instance_settings/v1/instance_settings_connection.h index 7529e10fd2ec5..6b4d8ebe6b163 100644 --- a/google/cloud/compute/instance_settings/v1/instance_settings_connection.h +++ b/google/cloud/compute/instance_settings/v1/instance_settings_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INSTANCE_SETTINGS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INSTANCE_SETTINGS_CONNECTION_H +#include "google/cloud/compute/instance_settings/v1/instance_settings.pb.h" #include "google/cloud/compute/instance_settings/v1/instance_settings_connection_idempotency_policy.h" #include "google/cloud/compute/instance_settings/v1/internal/instance_settings_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -29,7 +30,6 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_settings/v1/instance_settings_connection_idempotency_policy.h b/google/cloud/compute/instance_settings/v1/instance_settings_connection_idempotency_policy.h index b2285d51f35ef..21ec7faa367a2 100644 --- a/google/cloud/compute/instance_settings/v1/instance_settings_connection_idempotency_policy.h +++ b/google/cloud/compute/instance_settings/v1/instance_settings_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INSTANCE_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INSTANCE_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instance_settings/v1/instance_settings.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_settings/v1/instance_settings_proto_export.h b/google/cloud/compute/instance_settings/v1/instance_settings_proto_export.h index 3279db0dfa759..f9beef5cc16eb 100644 --- a/google/cloud/compute/instance_settings/v1/instance_settings_proto_export.h +++ b/google/cloud/compute/instance_settings/v1/instance_settings_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INSTANCE_SETTINGS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_064.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INSTANCE_SETTINGS_PROTO_EXPORT_H diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_connection_impl.h b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_connection_impl.h index 45ea8f3414ed6..af88d90c1db7e 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_connection_impl.h +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_connection_impl.h @@ -24,12 +24,12 @@ #include "google/cloud/compute/instance_settings/v1/instance_settings_options.h" #include "google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h" #include "google/cloud/compute/instance_settings/v1/internal/instance_settings_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_logging_decorator.h b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_logging_decorator.h index 7d4e623e01497..4bbe985fb5084 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_logging_decorator.h +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INTERNAL_INSTANCE_SETTINGS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INTERNAL_INSTANCE_SETTINGS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/instance_settings/v1/instance_settings.pb.h" #include "google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_metadata_decorator.h b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_metadata_decorator.h index 4004b6e7732ea..af6f6ce2d0899 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_metadata_decorator.h +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INTERNAL_INSTANCE_SETTINGS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INTERNAL_INSTANCE_SETTINGS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/instance_settings/v1/instance_settings.pb.h" #include "google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.cc b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.cc index ce1ad54c7edf8..9cc432a15a73f 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.cc +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/instance_settings/v1/instance_settings.proto #include "google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h" +#include "google/cloud/compute/instance_settings/v1/instance_settings.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h index b162ddb71a4de..6fee378673b70 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INTERNAL_INSTANCE_SETTINGS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_SETTINGS_V1_INTERNAL_INSTANCE_SETTINGS_REST_STUB_H +#include "google/cloud/compute/instance_settings/v1/instance_settings.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.cc b/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.cc index 09eddab8dca73..404dc84b97358 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.cc +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace compute_instance_settings_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceSettingsTracingConnection::InstanceSettingsTracingConnection( std::shared_ptr child) @@ -79,17 +77,13 @@ InstanceSettingsTracingConnection::PatchInstanceSettings( child_->PatchInstanceSettings(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceSettingsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.h b/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.h index cafc7b9b9290c..b1f6826ed6128 100644 --- a/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.h +++ b/google/cloud/compute/instance_settings/v1/internal/instance_settings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instance_settings_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceSettingsTracingConnection : public compute_instance_settings_v1::InstanceSettingsConnection { public: @@ -63,8 +61,6 @@ class InstanceSettingsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instance_templates/v1/instance_templates_connection.h b/google/cloud/compute/instance_templates/v1/instance_templates_connection.h index ae5b14565e6c4..dc78c3643e8d7 100644 --- a/google/cloud/compute/instance_templates/v1/instance_templates_connection.h +++ b/google/cloud/compute/instance_templates/v1/instance_templates_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INSTANCE_TEMPLATES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INSTANCE_TEMPLATES_CONNECTION_H +#include "google/cloud/compute/instance_templates/v1/instance_templates.pb.h" #include "google/cloud/compute/instance_templates/v1/instance_templates_connection_idempotency_policy.h" #include "google/cloud/compute/instance_templates/v1/internal/instance_templates_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_templates/v1/instance_templates_connection_idempotency_policy.h b/google/cloud/compute/instance_templates/v1/instance_templates_connection_idempotency_policy.h index 9722097fcba0f..3dae768f430f2 100644 --- a/google/cloud/compute/instance_templates/v1/instance_templates_connection_idempotency_policy.h +++ b/google/cloud/compute/instance_templates/v1/instance_templates_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INSTANCE_TEMPLATES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INSTANCE_TEMPLATES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instance_templates/v1/instance_templates.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_templates/v1/instance_templates_proto_export.h b/google/cloud/compute/instance_templates/v1/instance_templates_proto_export.h index e2affab0876e4..143ec0382f3cc 100644 --- a/google/cloud/compute/instance_templates/v1/instance_templates_proto_export.h +++ b/google/cloud/compute/instance_templates/v1/instance_templates_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,19 +26,19 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INSTANCE_TEMPLATES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_003.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_024.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_065.pb.h" +#include "google/cloud/compute/v1/internal/common_081.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INSTANCE_TEMPLATES_PROTO_EXPORT_H diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_connection_impl.h b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_connection_impl.h index c2a3327d18ac1..beb4444b0b867 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_connection_impl.h +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/instance_templates/v1/instance_templates_connection.h" #include "google/cloud/compute/instance_templates/v1/instance_templates_connection_idempotency_policy.h" #include "google/cloud/compute/instance_templates/v1/instance_templates_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_logging_decorator.h b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_logging_decorator.h index e3fb828562817..b302cedc81dc4 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_logging_decorator.h +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/instance_templates/v1/instance_templates.pb.h" #include "google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_metadata_decorator.h b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_metadata_decorator.h index 959ca46063a91..c1cac63aed397 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_metadata_decorator.h +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/instance_templates/v1/instance_templates.pb.h" #include "google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc index 6595885c14b59..322417aa0a240 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/instance_templates/v1/instance_templates.proto #include "google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/instance_templates/v1/instance_templates.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h index 72d4fe32a4439..81c28de28deb0 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCE_TEMPLATES_V1_INTERNAL_INSTANCE_TEMPLATES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/instance_templates/v1/instance_templates.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc b/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc index 3ed9a3e0f431d..1ab294ee2c3ff 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_instance_templates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceTemplatesTracingConnection::InstanceTemplatesTracingConnection( std::shared_ptr child) @@ -178,18 +176,14 @@ InstanceTemplatesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceTemplatesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.h b/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.h index 9661f9087a690..78e1996075958 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.h +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instance_templates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceTemplatesTracingConnection : public compute_instance_templates_v1::InstanceTemplatesConnection { public: @@ -100,8 +98,6 @@ class InstanceTemplatesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instances/v1/instances_connection.h b/google/cloud/compute/instances/v1/instances_connection.h index cb9b5b3d3828d..9a4aeee7d0a83 100644 --- a/google/cloud/compute/instances/v1/instances_connection.h +++ b/google/cloud/compute/instances/v1/instances_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INSTANCES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INSTANCES_CONNECTION_H +#include "google/cloud/compute/instances/v1/instances.pb.h" #include "google/cloud/compute/instances/v1/instances_connection_idempotency_policy.h" #include "google/cloud/compute/instances/v1/internal/instances_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instances/v1/instances_connection_idempotency_policy.h b/google/cloud/compute/instances/v1/instances_connection_idempotency_policy.h index 1e8a4d35ad0d7..772320437dad3 100644 --- a/google/cloud/compute/instances/v1/instances_connection_idempotency_policy.h +++ b/google/cloud/compute/instances/v1/instances_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instances/v1/instances.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instances/v1/instances_proto_export.h b/google/cloud/compute/instances/v1/instances_proto_export.h index e6e1496fb52b2..31058ec707203 100644 --- a/google/cloud/compute/instances/v1/instances_proto_export.h +++ b/google/cloud/compute/instances/v1/instances_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,22 +26,22 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INSTANCES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_003.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_015.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_022.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_034.pb.h" +#include "google/cloud/compute/v1/internal/common_039.pb.h" +#include "google/cloud/compute/v1/internal/common_081.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_146.pb.h" +#include "google/cloud/compute/v1/internal/common_152.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INSTANCES_PROTO_EXPORT_H diff --git a/google/cloud/compute/instances/v1/internal/instances_rest_connection_impl.h b/google/cloud/compute/instances/v1/internal/instances_rest_connection_impl.h index 5f8020a7443cd..375d08283ffcc 100644 --- a/google/cloud/compute/instances/v1/internal/instances_rest_connection_impl.h +++ b/google/cloud/compute/instances/v1/internal/instances_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/instances/v1/instances_options.h" #include "google/cloud/compute/instances/v1/internal/instances_rest_stub.h" #include "google/cloud/compute/instances/v1/internal/instances_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instances/v1/internal/instances_rest_logging_decorator.h b/google/cloud/compute/instances/v1/internal/instances_rest_logging_decorator.h index 202656fe5c14f..13637e55d4487 100644 --- a/google/cloud/compute/instances/v1/internal/instances_rest_logging_decorator.h +++ b/google/cloud/compute/instances/v1/internal/instances_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INTERNAL_INSTANCES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INTERNAL_INSTANCES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/instances/v1/instances.pb.h" #include "google/cloud/compute/instances/v1/internal/instances_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instances/v1/internal/instances_rest_metadata_decorator.h b/google/cloud/compute/instances/v1/internal/instances_rest_metadata_decorator.h index 590764e345456..4e57e4b711aed 100644 --- a/google/cloud/compute/instances/v1/internal/instances_rest_metadata_decorator.h +++ b/google/cloud/compute/instances/v1/internal/instances_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INTERNAL_INSTANCES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INTERNAL_INSTANCES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/instances/v1/instances.pb.h" #include "google/cloud/compute/instances/v1/internal/instances_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc b/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc index 009bebf415096..00be4c1c60ce7 100644 --- a/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc +++ b/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/instances/v1/instances.proto #include "google/cloud/compute/instances/v1/internal/instances_rest_stub.h" +#include "google/cloud/compute/instances/v1/instances.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instances/v1/internal/instances_rest_stub.h b/google/cloud/compute/instances/v1/internal/instances_rest_stub.h index cebffdf70e2a7..5329c7daacdc7 100644 --- a/google/cloud/compute/instances/v1/internal/instances_rest_stub.h +++ b/google/cloud/compute/instances/v1/internal/instances_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INTERNAL_INSTANCES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANCES_V1_INTERNAL_INSTANCES_REST_STUB_H +#include "google/cloud/compute/instances/v1/instances.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc b/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc index 44e9c477016c6..b4d7c0859518f 100644 --- a/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc +++ b/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_instances_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstancesTracingConnection::InstancesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1288,16 +1286,12 @@ InstancesTracingConnection::UpdateShieldedInstanceConfig( child_->UpdateShieldedInstanceConfig(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstancesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instances/v1/internal/instances_tracing_connection.h b/google/cloud/compute/instances/v1/internal/instances_tracing_connection.h index fbc8a2b1c9d4e..f076434a3bfcc 100644 --- a/google/cloud/compute/instances/v1/internal/instances_tracing_connection.h +++ b/google/cloud/compute/instances/v1/internal/instances_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instances_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstancesTracingConnection : public compute_instances_v1::InstancesConnection { public: @@ -544,8 +542,6 @@ class InstancesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection.h b/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection.h index d889d707da3c0..8cd42e6b28858 100644 --- a/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection.h +++ b/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INSTANT_SNAPSHOTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INSTANT_SNAPSHOTS_CONNECTION_H +#include "google/cloud/compute/instant_snapshots/v1/instant_snapshots.pb.h" #include "google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection_idempotency_policy.h" #include "google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection_idempotency_policy.h b/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection_idempotency_policy.h index a06ce5c6e7750..2048c7d7f1616 100644 --- a/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection_idempotency_policy.h +++ b/google/cloud/compute/instant_snapshots/v1/instant_snapshots_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INSTANT_SNAPSHOTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INSTANT_SNAPSHOTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/instant_snapshots/v1/instant_snapshots.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instant_snapshots/v1/instant_snapshots_proto_export.h b/google/cloud/compute/instant_snapshots/v1/instant_snapshots_proto_export.h index e0673545f4607..2df65dca61d48 100644 --- a/google/cloud/compute/instant_snapshots/v1/instant_snapshots_proto_export.h +++ b/google/cloud/compute/instant_snapshots/v1/instant_snapshots_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INSTANT_SNAPSHOTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_066.pb.h" +#include "google/cloud/compute/v1/internal/common_067.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_151.pb.h" +#include "google/cloud/compute/v1/internal/common_152.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INSTANT_SNAPSHOTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_connection_impl.h b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_connection_impl.h index 1c8b95f4d58d1..74e586fe438c5 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_connection_impl.h +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/instant_snapshots/v1/instant_snapshots_options.h" #include "google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h" #include "google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_logging_decorator.h b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_logging_decorator.h index 975d114a2928d..58c61f46aff54 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_logging_decorator.h +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INTERNAL_INSTANT_SNAPSHOTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INTERNAL_INSTANT_SNAPSHOTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/instant_snapshots/v1/instant_snapshots.pb.h" #include "google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_metadata_decorator.h b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_metadata_decorator.h index 37d455ba53497..73324e8c993e4 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_metadata_decorator.h +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INTERNAL_INSTANT_SNAPSHOTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INTERNAL_INSTANT_SNAPSHOTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/instant_snapshots/v1/instant_snapshots.pb.h" #include "google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.cc b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.cc index f89b83c90ad88..db15c51d8a2ee 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.cc +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/instant_snapshots/v1/instant_snapshots.proto #include "google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h" +#include "google/cloud/compute/instant_snapshots/v1/instant_snapshots.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h index 3e7027fa17822..5a6457a1c82e4 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INTERNAL_INSTANT_SNAPSHOTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INSTANT_SNAPSHOTS_V1_INTERNAL_INSTANT_SNAPSHOTS_REST_STUB_H +#include "google/cloud/compute/instant_snapshots/v1/instant_snapshots.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.cc b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.cc index 41fd5f4829e87..1f0a3dbab1a04 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.cc +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_instant_snapshots_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstantSnapshotsTracingConnection::InstantSnapshotsTracingConnection( std::shared_ptr child) @@ -206,17 +204,13 @@ InstantSnapshotsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstantSnapshotsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.h b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.h index eeeb051cb9a94..ab51177169ee9 100644 --- a/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.h +++ b/google/cloud/compute/instant_snapshots/v1/internal/instant_snapshots_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_instant_snapshots_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstantSnapshotsTracingConnection : public compute_instant_snapshots_v1::InstantSnapshotsConnection { public: @@ -109,8 +107,6 @@ class InstantSnapshotsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection.h b/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection.h index b79074386f2c4..8498258bdbbe1 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERCONNECT_ATTACHMENT_GROUPS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERCONNECT_ATTACHMENT_GROUPS_CONNECTION_H +#include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.pb.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection_idempotency_policy.h b/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection_idempotency_policy.h index bfc89a8c128aa..fb3ad666c33e8 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERCONNECT_ATTACHMENT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERCONNECT_ATTACHMENT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_proto_export.h b/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_proto_export.h index 225b1cdf2d962..ec6516a3afcc3 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_proto_export.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERCONNECT_ATTACHMENT_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_071.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERCONNECT_ATTACHMENT_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_connection_impl.h b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_connection_impl.h index cf5f95259978a..d478b89d42160 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_connection_impl.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups_options.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_logging_decorator.h b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_logging_decorator.h index 246f81a566d73..248c68c9caf4e 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_logging_decorator.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.pb.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_metadata_decorator.h b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_metadata_decorator.h index edc5149779615..95b3357533f3d 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.pb.h" #include "google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.cc b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.cc index bd662bb8bb181..728d09e4fe6d4 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.cc +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.proto #include "google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h index e5d1d22427978..0511d849c57c7 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENT_GROUPS_V1_INTERNAL_INTERCONNECT_ATTACHMENT_GROUPS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.cc b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.cc index b1c3348b0a086..c443bdaad77f9 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.cc +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_interconnect_attachment_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InterconnectAttachmentGroupsTracingConnection:: InterconnectAttachmentGroupsTracingConnection( std::shared_ptrTestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInterconnectAttachmentGroupsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.h b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.h index 296ab19150236..e82b1a078ec33 100644 --- a/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.h +++ b/google/cloud/compute/interconnect_attachment_groups/v1/internal/interconnect_attachment_groups_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_interconnect_attachment_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InterconnectAttachmentGroupsTracingConnection : public compute_interconnect_attachment_groups_v1:: InterconnectAttachmentGroupsConnection { @@ -124,8 +122,6 @@ class InterconnectAttachmentGroupsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection.h b/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection.h index b12d576445d58..2212f39369caf 100644 --- a/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection.h +++ b/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERCONNECT_ATTACHMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERCONNECT_ATTACHMENTS_CONNECTION_H +#include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.pb.h" #include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection_idempotency_policy.h b/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection_idempotency_policy.h index 3701f13e3e169..2a16146d32189 100644 --- a/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection_idempotency_policy.h +++ b/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERCONNECT_ATTACHMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERCONNECT_ATTACHMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_proto_export.h b/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_proto_export.h index 18c1063eb6683..87d65a390321b 100644 --- a/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_proto_export.h +++ b/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERCONNECT_ATTACHMENTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_069.pb.h" +#include "google/cloud/compute/v1/internal/common_070.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERCONNECT_ATTACHMENTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_connection_impl.h b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_connection_impl.h index efe5bc0c16ceb..cc72ef847497d 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_connection_impl.h +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments_options.h" #include "google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h" #include "google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_retry_traits.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_logging_decorator.h b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_logging_decorator.h index f454d1b98b3d9..bd4a4f70e96aa 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_logging_decorator.h +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERNAL_INTERCONNECT_ATTACHMENTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERNAL_INTERCONNECT_ATTACHMENTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.pb.h" #include "google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_metadata_decorator.h b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_metadata_decorator.h index eb25f42460f09..24a528053ac84 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_metadata_decorator.h +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERNAL_INTERCONNECT_ATTACHMENTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERNAL_INTERCONNECT_ATTACHMENTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.pb.h" #include "google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc index 2d8a443c99137..969308d84ed8b 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.proto #include "google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h" +#include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h index 4afa037100fe3..6617bd18b4794 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERNAL_INTERCONNECT_ATTACHMENTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_ATTACHMENTS_V1_INTERNAL_INTERCONNECT_ATTACHMENTS_REST_STUB_H +#include "google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc index 73841f9cd5a64..e3cd97fb95aaf 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_interconnect_attachments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InterconnectAttachmentsTracingConnection:: InterconnectAttachmentsTracingConnection( std::shared_ptrSetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_interconnect_attachments_v1::InterconnectAttachmentsConnection> MakeInterconnectAttachmentsTracingConnection( std::shared_ptr< compute_interconnect_attachments_v1::InterconnectAttachmentsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.h b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.h index eba6596fad106..262767d0c9f60 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.h +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_interconnect_attachments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InterconnectAttachmentsTracingConnection : public compute_interconnect_attachments_v1:: InterconnectAttachmentsConnection { @@ -122,8 +120,6 @@ class InterconnectAttachmentsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection.h b/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection.h index df444f090223d..28e744b366dbd 100644 --- a/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection.h +++ b/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERCONNECT_GROUPS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERCONNECT_GROUPS_CONNECTION_H +#include "google/cloud/compute/interconnect_groups/v1/interconnect_groups.pb.h" #include "google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection_idempotency_policy.h b/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection_idempotency_policy.h index 26effa0fcb2d0..8fe74a41624f2 100644 --- a/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERCONNECT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERCONNECT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/interconnect_groups/v1/interconnect_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_groups/v1/interconnect_groups_proto_export.h b/google/cloud/compute/interconnect_groups/v1/interconnect_groups_proto_export.h index 39caadcc54c9b..942bc1daa59a6 100644 --- a/google/cloud/compute/interconnect_groups/v1/interconnect_groups_proto_export.h +++ b/google/cloud/compute/interconnect_groups/v1/interconnect_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERCONNECT_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_072.pb.h" +#include "google/cloud/compute/v1/internal/common_073.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERCONNECT_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_connection_impl.h b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_connection_impl.h index d917a63596907..8ae4b51233fb1 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_connection_impl.h +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection.h" #include "google/cloud/compute/interconnect_groups/v1/interconnect_groups_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_groups/v1/interconnect_groups_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_logging_decorator.h b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_logging_decorator.h index 98f4fd3cd08c1..772e3ceef84ff 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_logging_decorator.h +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_groups/v1/interconnect_groups.pb.h" #include "google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_metadata_decorator.h b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_metadata_decorator.h index cd4876fe0e717..767db4c4790a0 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_groups/v1/interconnect_groups.pb.h" #include "google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.cc b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.cc index d2962b3180ed1..d348dfdc313c2 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.cc +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/interconnect_groups/v1/interconnect_groups.proto #include "google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_groups/v1/interconnect_groups.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h index e12f035580abf..4807d340f4175 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_GROUPS_V1_INTERNAL_INTERCONNECT_GROUPS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnect_groups/v1/interconnect_groups.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.cc b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.cc index 6dd8b638058dc..2d7bf6e9fed60 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.cc +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_interconnect_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InterconnectGroupsTracingConnection::InterconnectGroupsTracingConnection( std::shared_ptr< compute_interconnect_groups_v1::InterconnectGroupsConnection> @@ -242,19 +240,15 @@ InterconnectGroupsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInterconnectGroupsTracingConnection( std::shared_ptr< compute_interconnect_groups_v1::InterconnectGroupsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.h b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.h index b60bcb1254673..8658aab4fa986 100644 --- a/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.h +++ b/google/cloud/compute/interconnect_groups/v1/internal/interconnect_groups_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_interconnect_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InterconnectGroupsTracingConnection : public compute_interconnect_groups_v1::InterconnectGroupsConnection { public: @@ -122,8 +120,6 @@ class InterconnectGroupsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection.h b/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection.h index 97a07d7349fbd..26a0d34423ba6 100644 --- a/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection.h +++ b/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERCONNECT_LOCATIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERCONNECT_LOCATIONS_CONNECTION_H +#include "google/cloud/compute/interconnect_locations/v1/interconnect_locations.pb.h" #include "google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection_idempotency_policy.h b/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection_idempotency_policy.h index 482d44d5d8175..a3e85cd50307c 100644 --- a/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection_idempotency_policy.h +++ b/google/cloud/compute/interconnect_locations/v1/interconnect_locations_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERCONNECT_LOCATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERCONNECT_LOCATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/interconnect_locations/v1/interconnect_locations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_locations/v1/interconnect_locations_proto_export.h b/google/cloud/compute/interconnect_locations/v1/interconnect_locations_proto_export.h index 2435c8ced727f..049a82f5dab94 100644 --- a/google/cloud/compute/interconnect_locations/v1/interconnect_locations_proto_export.h +++ b/google/cloud/compute/interconnect_locations/v1/interconnect_locations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERCONNECT_LOCATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include +#include "google/cloud/compute/v1/internal/common_074.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERCONNECT_LOCATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_logging_decorator.h b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_logging_decorator.h index 951da5d3b7f86..476f694589905 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_logging_decorator.h +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_logging_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERNAL_INTERCONNECT_LOCATIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERNAL_INTERCONNECT_LOCATIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/interconnect_locations/v1/interconnect_locations.pb.h" #include "google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_metadata_decorator.h b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_metadata_decorator.h index 2531336de3022..62afed4607817 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_metadata_decorator.h +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERNAL_INTERCONNECT_LOCATIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERNAL_INTERCONNECT_LOCATIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/interconnect_locations/v1/interconnect_locations.pb.h" #include "google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc index 4cc5bf9b1881e..2dafa257bb8d6 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc @@ -18,11 +18,11 @@ // google/cloud/compute/interconnect_locations/v1/interconnect_locations.proto #include "google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h" +#include "google/cloud/compute/interconnect_locations/v1/interconnect_locations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h index 630d4ad8c90e9..17b2d60fe7446 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERNAL_INTERCONNECT_LOCATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_LOCATIONS_V1_INTERNAL_INTERCONNECT_LOCATIONS_REST_STUB_H +#include "google/cloud/compute/interconnect_locations/v1/interconnect_locations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc index 8f7ed15f17e38..be084abc5f62c 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_interconnect_locations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InterconnectLocationsTracingConnection::InterconnectLocationsTracingConnection( std::shared_ptr< compute_interconnect_locations_v1::InterconnectLocationsConnection> @@ -61,20 +59,16 @@ InterconnectLocationsTracingConnection::ListInterconnectLocations( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_interconnect_locations_v1::InterconnectLocationsConnection> MakeInterconnectLocationsTracingConnection( std::shared_ptr< compute_interconnect_locations_v1::InterconnectLocationsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.h b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.h index a3fbc277c7a01..1e5484a2b2c77 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.h +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_interconnect_locations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InterconnectLocationsTracingConnection : public compute_interconnect_locations_v1:: InterconnectLocationsConnection { @@ -60,8 +58,6 @@ class InterconnectLocationsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection.h b/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection.h index 8429dc64f890d..acfaca4f8cc1f 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERCONNECT_REMOTE_LOCATIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERCONNECT_REMOTE_LOCATIONS_CONNECTION_H +#include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.pb.h" #include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection_idempotency_policy.h" #include "google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection_idempotency_policy.h b/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection_idempotency_policy.h index 01a0e7683f731..1f78d402b0264 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection_idempotency_policy.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERCONNECT_REMOTE_LOCATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERCONNECT_REMOTE_LOCATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_proto_export.h b/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_proto_export.h index 04a266776f85b..dee12ca0726a4 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_proto_export.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERCONNECT_REMOTE_LOCATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_070.pb.h" +#include "google/cloud/compute/v1/internal/common_075.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERCONNECT_REMOTE_LOCATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_logging_decorator.h b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_logging_decorator.h index 252d3434137cc..6c25c8e125f50 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_logging_decorator.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_logging_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERNAL_INTERCONNECT_REMOTE_LOCATIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERNAL_INTERCONNECT_REMOTE_LOCATIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.pb.h" #include "google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_metadata_decorator.h b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_metadata_decorator.h index 00cbdf1f0f333..d9ff68cbcb89d 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_metadata_decorator.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERNAL_INTERCONNECT_REMOTE_LOCATIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERNAL_INTERCONNECT_REMOTE_LOCATIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.pb.h" #include "google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc index 32d9159bced85..ccb084c6d1efa 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc @@ -18,11 +18,11 @@ // google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.proto #include "google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h" +#include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h index 18a3f782557dc..0ba0f5c42103b 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERNAL_INTERCONNECT_REMOTE_LOCATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECT_REMOTE_LOCATIONS_V1_INTERNAL_INTERCONNECT_REMOTE_LOCATIONS_REST_STUB_H +#include "google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc index fbf8ef66d8066..cd9116ccd2f85 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_interconnect_remote_locations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InterconnectRemoteLocationsTracingConnection:: InterconnectRemoteLocationsTracingConnection( std::shared_ptr MakeInterconnectRemoteLocationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.h b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.h index 2ab266ae11ec9..57607a7197416 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.h +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_interconnect_remote_locations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InterconnectRemoteLocationsTracingConnection : public compute_interconnect_remote_locations_v1:: InterconnectRemoteLocationsConnection { @@ -60,8 +58,6 @@ class InterconnectRemoteLocationsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/interconnects/v1/interconnects_connection.h b/google/cloud/compute/interconnects/v1/interconnects_connection.h index c44d90e5b761e..40efe62925122 100644 --- a/google/cloud/compute/interconnects/v1/interconnects_connection.h +++ b/google/cloud/compute/interconnects/v1/interconnects_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERCONNECTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERCONNECTS_CONNECTION_H +#include "google/cloud/compute/interconnects/v1/interconnects.pb.h" #include "google/cloud/compute/interconnects/v1/interconnects_connection_idempotency_policy.h" #include "google/cloud/compute/interconnects/v1/internal/interconnects_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnects/v1/interconnects_connection_idempotency_policy.h b/google/cloud/compute/interconnects/v1/interconnects_connection_idempotency_policy.h index c7d3f4c72ab6e..d3e4840d0ab33 100644 --- a/google/cloud/compute/interconnects/v1/interconnects_connection_idempotency_policy.h +++ b/google/cloud/compute/interconnects/v1/interconnects_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERCONNECTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERCONNECTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/interconnects/v1/interconnects.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnects/v1/interconnects_proto_export.h b/google/cloud/compute/interconnects/v1/interconnects_proto_export.h index 1df7ae6187037..28d03f527b2ee 100644 --- a/google/cloud/compute/interconnects/v1/interconnects_proto_export.h +++ b/google/cloud/compute/interconnects/v1/interconnects_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERCONNECTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_068.pb.h" +#include "google/cloud/compute/v1/internal/common_072.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERCONNECTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_connection_impl.h b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_connection_impl.h index af643e271b2fe..a574a560a4c55 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_connection_impl.h +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/interconnects/v1/interconnects_connection.h" #include "google/cloud/compute/interconnects/v1/interconnects_connection_idempotency_policy.h" #include "google/cloud/compute/interconnects/v1/interconnects_options.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_logging_decorator.h b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_logging_decorator.h index c18b61ea4cdcf..44e3516b668fc 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_logging_decorator.h +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnects/v1/interconnects.pb.h" #include "google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_metadata_decorator.h b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_metadata_decorator.h index adda6c50f02e4..a7de627b2c9a6 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_metadata_decorator.h +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnects/v1/interconnects.pb.h" #include "google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc index 3d6b0f1413334..238ea7c3a345e 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/interconnects/v1/interconnects.proto #include "google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnects/v1/interconnects.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h index ed4220d6f8a11..faf5f097d5a8d 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_INTERCONNECTS_V1_INTERNAL_INTERCONNECTS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/interconnects/v1/interconnects.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc b/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc index 1f2c5796c70c5..3c50451d70899 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_interconnects_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InterconnectsTracingConnection::InterconnectsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -201,16 +199,12 @@ InterconnectsTracingConnection::SetLabels( return internal::EndSpan(std::move(span), child_->SetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInterconnectsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.h b/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.h index ee092d0361b18..dd28b22768089 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.h +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_interconnects_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InterconnectsTracingConnection : public compute_interconnects_v1::InterconnectsConnection { public: @@ -109,8 +107,6 @@ class InterconnectsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_logging_decorator.h b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_logging_decorator.h index 9928f17eeccd4..1338441af6042 100644 --- a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_logging_decorator.h +++ b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_INTERNAL_LICENSE_CODES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h" +#include "google/cloud/compute/license_codes/v1/license_codes.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_metadata_decorator.h b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_metadata_decorator.h index 0ee675915c058..774af7f60c9c0 100644 --- a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_metadata_decorator.h +++ b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_INTERNAL_LICENSE_CODES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h" +#include "google/cloud/compute/license_codes/v1/license_codes.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.cc b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.cc index ac720e511d092..3778886a35422 100644 --- a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.cc +++ b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/license_codes/v1/license_codes.proto #include "google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h" +#include "google/cloud/compute/license_codes/v1/license_codes.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h index 1795166d74bee..3de76502f66d8 100644 --- a/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h +++ b/google/cloud/compute/license_codes/v1/internal/license_codes_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_INTERNAL_LICENSE_CODES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_INTERNAL_LICENSE_CODES_REST_STUB_H +#include "google/cloud/compute/license_codes/v1/license_codes.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.cc b/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.cc index 7f3d1ea4e7aa3..8d61a0afeb6e7 100644 --- a/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.cc +++ b/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace compute_license_codes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LicenseCodesTracingConnection::LicenseCodesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -52,16 +50,12 @@ LicenseCodesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLicenseCodesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.h b/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.h index 1bf365e7ccbd8..962b1ae73645f 100644 --- a/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.h +++ b/google/cloud/compute/license_codes/v1/internal/license_codes_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_license_codes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LicenseCodesTracingConnection : public compute_license_codes_v1::LicenseCodesConnection { public: @@ -52,8 +50,6 @@ class LicenseCodesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/license_codes/v1/license_codes_connection.h b/google/cloud/compute/license_codes/v1/license_codes_connection.h index 3f3abfc397baf..ad811d4af8318 100644 --- a/google/cloud/compute/license_codes/v1/license_codes_connection.h +++ b/google/cloud/compute/license_codes/v1/license_codes_connection.h @@ -20,13 +20,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_LICENSE_CODES_CONNECTION_H #include "google/cloud/compute/license_codes/v1/internal/license_codes_retry_traits.h" +#include "google/cloud/compute/license_codes/v1/license_codes.pb.h" #include "google/cloud/compute/license_codes/v1/license_codes_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/license_codes/v1/license_codes_connection_idempotency_policy.h b/google/cloud/compute/license_codes/v1/license_codes_connection_idempotency_policy.h index d9d23efc8acbd..9fb95dc04f653 100644 --- a/google/cloud/compute/license_codes/v1/license_codes_connection_idempotency_policy.h +++ b/google/cloud/compute/license_codes/v1/license_codes_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_LICENSE_CODES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_LICENSE_CODES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/license_codes/v1/license_codes.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/license_codes/v1/license_codes_proto_export.h b/google/cloud/compute/license_codes/v1/license_codes_proto_export.h index e07269cad06f3..1615730514d13 100644 --- a/google/cloud/compute/license_codes/v1/license_codes_proto_export.h +++ b/google/cloud/compute/license_codes/v1/license_codes_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_LICENSE_CODES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_077.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSE_CODES_V1_LICENSE_CODES_PROTO_EXPORT_H diff --git a/google/cloud/compute/licenses/v1/internal/licenses_rest_connection_impl.h b/google/cloud/compute/licenses/v1/internal/licenses_rest_connection_impl.h index 246ee2e79ec34..88bc28b1708e0 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_rest_connection_impl.h +++ b/google/cloud/compute/licenses/v1/internal/licenses_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h" #include "google/cloud/compute/licenses/v1/internal/licenses_retry_traits.h" #include "google/cloud/compute/licenses/v1/licenses_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/licenses/v1/internal/licenses_rest_logging_decorator.h b/google/cloud/compute/licenses/v1/internal/licenses_rest_logging_decorator.h index 887179762ccc2..501eb7675f7c7 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_rest_logging_decorator.h +++ b/google/cloud/compute/licenses/v1/internal/licenses_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h" +#include "google/cloud/compute/licenses/v1/licenses.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/licenses/v1/internal/licenses_rest_metadata_decorator.h b/google/cloud/compute/licenses/v1/internal/licenses_rest_metadata_decorator.h index 5b095a83d65f0..6073f931e32ae 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_rest_metadata_decorator.h +++ b/google/cloud/compute/licenses/v1/internal/licenses_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h" +#include "google/cloud/compute/licenses/v1/licenses.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc b/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc index 6bae346f75e40..cd6a77e6c16fa 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc +++ b/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/licenses/v1/licenses.proto #include "google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/licenses/v1/licenses.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h b/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h index 639bce77efcd6..fb150d125282a 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h +++ b/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_INTERNAL_LICENSES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/licenses/v1/licenses.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc b/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc index 5a3d38c15e0d3..ad25da957fbad 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc +++ b/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_licenses_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LicensesTracingConnection::LicensesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -174,16 +172,12 @@ LicensesTracingConnection::UpdateLicense( return internal::EndSpan(std::move(span), child_->UpdateLicense(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLicensesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.h b/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.h index 1ae7ae196ca2b..f435b0f284a56 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.h +++ b/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_licenses_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LicensesTracingConnection : public compute_licenses_v1::LicensesConnection { public: @@ -100,8 +98,6 @@ class LicensesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/licenses/v1/licenses_connection.h b/google/cloud/compute/licenses/v1/licenses_connection.h index cb19e814d2fd2..fb99f38f8c5c6 100644 --- a/google/cloud/compute/licenses/v1/licenses_connection.h +++ b/google/cloud/compute/licenses/v1/licenses_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_LICENSES_CONNECTION_H #include "google/cloud/compute/licenses/v1/internal/licenses_retry_traits.h" +#include "google/cloud/compute/licenses/v1/licenses.pb.h" #include "google/cloud/compute/licenses/v1/licenses_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/licenses/v1/licenses_connection_idempotency_policy.h b/google/cloud/compute/licenses/v1/licenses_connection_idempotency_policy.h index 01159edd15bce..4fc9f9058b5f7 100644 --- a/google/cloud/compute/licenses/v1/licenses_connection_idempotency_policy.h +++ b/google/cloud/compute/licenses/v1/licenses_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_LICENSES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_LICENSES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/licenses/v1/licenses.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/licenses/v1/licenses_proto_export.h b/google/cloud/compute/licenses/v1/licenses_proto_export.h index f352e6e3a94ab..d57c206a4b996 100644 --- a/google/cloud/compute/licenses/v1/licenses_proto_export.h +++ b/google/cloud/compute/licenses/v1/licenses_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_LICENSES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_076.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_LICENSES_V1_LICENSES_PROTO_EXPORT_H diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_connection_impl.h b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_connection_impl.h index 19635db9a9c26..8bcb8c5542792 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_connection_impl.h +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h" #include "google/cloud/compute/machine_images/v1/internal/machine_images_retry_traits.h" #include "google/cloud/compute/machine_images/v1/machine_images_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_logging_decorator.h b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_logging_decorator.h index 84faa66928d00..5292f16fa50f7 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_logging_decorator.h +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h" +#include "google/cloud/compute/machine_images/v1/machine_images.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_metadata_decorator.h b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_metadata_decorator.h index 3e7443145b7f7..8cfe029e33bf7 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_metadata_decorator.h +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h" +#include "google/cloud/compute/machine_images/v1/machine_images.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc index 6eda66033a5ec..c38f5905ad0fe 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/machine_images/v1/machine_images.proto #include "google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/machine_images/v1/machine_images.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h index 09d988764f7cf..1601362c40dc4 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_INTERNAL_MACHINE_IMAGES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/machine_images/v1/machine_images.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc b/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc index 3a8d9a816e639..cc4fdbd157f3d 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_machine_images_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MachineImagesTracingConnection::MachineImagesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -180,16 +178,12 @@ MachineImagesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMachineImagesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.h b/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.h index eb7d12ed68a51..cf7afc783af37 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.h +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_machine_images_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MachineImagesTracingConnection : public compute_machine_images_v1::MachineImagesConnection { public: @@ -101,8 +99,6 @@ class MachineImagesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/machine_images/v1/machine_images_connection.h b/google/cloud/compute/machine_images/v1/machine_images_connection.h index ed2ec13cfb471..b94e99dcc9b04 100644 --- a/google/cloud/compute/machine_images/v1/machine_images_connection.h +++ b/google/cloud/compute/machine_images/v1/machine_images_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_MACHINE_IMAGES_CONNECTION_H #include "google/cloud/compute/machine_images/v1/internal/machine_images_retry_traits.h" +#include "google/cloud/compute/machine_images/v1/machine_images.pb.h" #include "google/cloud/compute/machine_images/v1/machine_images_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/machine_images/v1/machine_images_connection_idempotency_policy.h b/google/cloud/compute/machine_images/v1/machine_images_connection_idempotency_policy.h index f87edd0a046d9..b24aef23d791b 100644 --- a/google/cloud/compute/machine_images/v1/machine_images_connection_idempotency_policy.h +++ b/google/cloud/compute/machine_images/v1/machine_images_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_MACHINE_IMAGES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_MACHINE_IMAGES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/machine_images/v1/machine_images.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/machine_images/v1/machine_images_proto_export.h b/google/cloud/compute/machine_images/v1/machine_images_proto_export.h index 96cec2713fe50..7252eaec96f6b 100644 --- a/google/cloud/compute/machine_images/v1/machine_images_proto_export.h +++ b/google/cloud/compute/machine_images/v1/machine_images_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,19 +26,19 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_MACHINE_IMAGES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_003.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_079.pb.h" +#include "google/cloud/compute/v1/internal/common_081.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_IMAGES_V1_MACHINE_IMAGES_PROTO_EXPORT_H diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_logging_decorator.h b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_logging_decorator.h index 4824416d561c1..e66598f8c5005 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_logging_decorator.h +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_INTERNAL_MACHINE_TYPES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h" +#include "google/cloud/compute/machine_types/v1/machine_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_metadata_decorator.h b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_metadata_decorator.h index 583e332627926..1aa64dcf4a3df 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_metadata_decorator.h +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_INTERNAL_MACHINE_TYPES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h" +#include "google/cloud/compute/machine_types/v1/machine_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc index c7b21cd6bffb8..cf333214ac8a9 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/machine_types/v1/machine_types.proto #include "google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h" +#include "google/cloud/compute/machine_types/v1/machine_types.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h index 3a96878799ee0..cd0b8f259294e 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_INTERNAL_MACHINE_TYPES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_INTERNAL_MACHINE_TYPES_REST_STUB_H +#include "google/cloud/compute/machine_types/v1/machine_types.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc b/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc index de7a314ef4b1e..a8e1f2478fa2f 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_machine_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MachineTypesTracingConnection::MachineTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -71,16 +69,12 @@ MachineTypesTracingConnection::ListMachineTypes( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMachineTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.h b/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.h index a55388a9328b1..afa620099d820 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.h +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_machine_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MachineTypesTracingConnection : public compute_machine_types_v1::MachineTypesConnection { public: @@ -58,8 +56,6 @@ class MachineTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/machine_types/v1/machine_types_connection.h b/google/cloud/compute/machine_types/v1/machine_types_connection.h index f5f084a6c91b5..69f360dca0079 100644 --- a/google/cloud/compute/machine_types/v1/machine_types_connection.h +++ b/google/cloud/compute/machine_types/v1/machine_types_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_MACHINE_TYPES_CONNECTION_H #include "google/cloud/compute/machine_types/v1/internal/machine_types_retry_traits.h" +#include "google/cloud/compute/machine_types/v1/machine_types.pb.h" #include "google/cloud/compute/machine_types/v1/machine_types_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/machine_types/v1/machine_types_connection_idempotency_policy.h b/google/cloud/compute/machine_types/v1/machine_types_connection_idempotency_policy.h index b6325bfdd63b3..9ab63d4632218 100644 --- a/google/cloud/compute/machine_types/v1/machine_types_connection_idempotency_policy.h +++ b/google/cloud/compute/machine_types/v1/machine_types_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_MACHINE_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_MACHINE_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/machine_types/v1/machine_types.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/machine_types/v1/machine_types_proto_export.h b/google/cloud/compute/machine_types/v1/machine_types_proto_export.h index f7167dbbce4c4..38e374ce17ad9 100644 --- a/google/cloud/compute/machine_types/v1/machine_types_proto_export.h +++ b/google/cloud/compute/machine_types/v1/machine_types_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_MACHINE_TYPES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_080.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_MACHINE_TYPES_V1_MACHINE_TYPES_PROTO_EXPORT_H diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_connection_impl.h b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_connection_impl.h index ed38304c328f0..c8cd084db01fe 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_connection_impl.h +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/network_attachments/v1/network_attachments_connection.h" #include "google/cloud/compute/network_attachments/v1/network_attachments_connection_idempotency_policy.h" #include "google/cloud/compute/network_attachments/v1/network_attachments_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_logging_decorator.h b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_logging_decorator.h index 34b2c090c4054..6a287f4bbd1d8 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_logging_decorator.h +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_INTERNAL_NETWORK_ATTACHMENTS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h" +#include "google/cloud/compute/network_attachments/v1/network_attachments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_metadata_decorator.h b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_metadata_decorator.h index 22eae75654e03..e64b2c46de46d 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_metadata_decorator.h +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_INTERNAL_NETWORK_ATTACHMENTS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h" +#include "google/cloud/compute/network_attachments/v1/network_attachments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc index c9128f555ed90..a1beecb1ecc43 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/network_attachments/v1/network_attachments.proto #include "google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h" +#include "google/cloud/compute/network_attachments/v1/network_attachments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h index deb7afe662acf..f91cf71688e18 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_INTERNAL_NETWORK_ATTACHMENTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_INTERNAL_NETWORK_ATTACHMENTS_REST_STUB_H +#include "google/cloud/compute/network_attachments/v1/network_attachments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc b/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc index 6e1f70f6398e0..8ab7e2777dd66 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_network_attachments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkAttachmentsTracingConnection::NetworkAttachmentsTracingConnection( std::shared_ptr< compute_network_attachments_v1::NetworkAttachmentsConnection> @@ -214,19 +212,15 @@ NetworkAttachmentsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkAttachmentsTracingConnection( std::shared_ptr< compute_network_attachments_v1::NetworkAttachmentsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.h b/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.h index abc4790d101da..a63676a0d4b0e 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.h +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_network_attachments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkAttachmentsTracingConnection : public compute_network_attachments_v1::NetworkAttachmentsConnection { public: @@ -113,8 +111,6 @@ class NetworkAttachmentsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/network_attachments/v1/network_attachments_connection.h b/google/cloud/compute/network_attachments/v1/network_attachments_connection.h index bfbe8faf9ad86..92996014a147c 100644 --- a/google/cloud/compute/network_attachments/v1/network_attachments_connection.h +++ b/google/cloud/compute/network_attachments/v1/network_attachments_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_NETWORK_ATTACHMENTS_CONNECTION_H #include "google/cloud/compute/network_attachments/v1/internal/network_attachments_retry_traits.h" +#include "google/cloud/compute/network_attachments/v1/network_attachments.pb.h" #include "google/cloud/compute/network_attachments/v1/network_attachments_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_attachments/v1/network_attachments_connection_idempotency_policy.h b/google/cloud/compute/network_attachments/v1/network_attachments_connection_idempotency_policy.h index 9eb4b1b0674ca..b5d2005935e3f 100644 --- a/google/cloud/compute/network_attachments/v1/network_attachments_connection_idempotency_policy.h +++ b/google/cloud/compute/network_attachments/v1/network_attachments_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_NETWORK_ATTACHMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_NETWORK_ATTACHMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/network_attachments/v1/network_attachments.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_attachments/v1/network_attachments_proto_export.h b/google/cloud/compute/network_attachments/v1/network_attachments_proto_export.h index f7696c5058233..e714541e48486 100644 --- a/google/cloud/compute/network_attachments/v1/network_attachments_proto_export.h +++ b/google/cloud/compute/network_attachments/v1/network_attachments_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_NETWORK_ATTACHMENTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_084.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ATTACHMENTS_V1_NETWORK_ATTACHMENTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_connection_impl.h b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_connection_impl.h index 76982de6c7539..2de773a326015 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_connection_impl.h +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection.h" #include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection_idempotency_policy.h" #include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_logging_decorator.h b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_logging_decorator.h index 870b81a59df33..4d212abe3a20c 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_logging_decorator.h +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_INTERNAL_NETWORK_EDGE_SECURITY_SERVICES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h" +#include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_metadata_decorator.h b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_metadata_decorator.h index 0fd766bc68ab6..90a1d0d2f2559 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_metadata_decorator.h +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_INTERNAL_NETWORK_EDGE_SECURITY_SERVICES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h" +#include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc index ee9ded0d7ee21..e06988ac2bf67 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.proto #include "google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h" +#include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h index 301c03bf5dcb5..2148f7c056254 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_INTERNAL_NETWORK_EDGE_SECURITY_SERVICES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_INTERNAL_NETWORK_EDGE_SECURITY_SERVICES_REST_STUB_H +#include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc index bd24ed487f782..187ea67799607 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_network_edge_security_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkEdgeSecurityServicesTracingConnection:: NetworkEdgeSecurityServicesTracingConnection( std::shared_ptrPatchNetworkEdgeSecurityService(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkEdgeSecurityServicesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.h b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.h index 9dc17abff7e72..0d36794c4712c 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.h +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_network_edge_security_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkEdgeSecurityServicesTracingConnection : public compute_network_edge_security_services_v1:: NetworkEdgeSecurityServicesConnection { @@ -106,8 +104,6 @@ class NetworkEdgeSecurityServicesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection.h b/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection.h index c7e80a684a434..95504dfcd7f42 100644 --- a/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection.h +++ b/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_NETWORK_EDGE_SECURITY_SERVICES_CONNECTION_H #include "google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_retry_traits.h" +#include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.pb.h" #include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection_idempotency_policy.h b/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection_idempotency_policy.h index 499c903239fb4..717e9c8119d3c 100644 --- a/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection_idempotency_policy.h +++ b/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_NETWORK_EDGE_SECURITY_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_NETWORK_EDGE_SECURITY_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_proto_export.h b/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_proto_export.h index 95ce79fa6fa19..3298cb4063517 100644 --- a/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_proto_export.h +++ b/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_NETWORK_EDGE_SECURITY_SERVICES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_085.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_EDGE_SECURITY_SERVICES_V1_NETWORK_EDGE_SECURITY_SERVICES_PROTO_EXPORT_H diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_connection_impl.h b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_connection_impl.h index 42b2a16c38bd4..a9d11c65b506d 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_connection_impl.h +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection.h" #include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection_idempotency_policy.h" #include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_options.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_logging_decorator.h b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_logging_decorator.h index a8f0d5f0de4e4..f8f9c9ab84ff3 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_logging_decorator.h +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_NETWORK_ENDPOINT_GROUPS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_metadata_decorator.h b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_metadata_decorator.h index 164a1b51aa094..48c2d23cf0eb6 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_NETWORK_ENDPOINT_GROUPS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc index 5238d7cc60562..32e00a2d14357 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.proto #include "google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h index 7a515334a2819..a0d3c3844b97c 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_NETWORK_ENDPOINT_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_NETWORK_ENDPOINT_GROUPS_REST_STUB_H +#include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc index a10453c668541..85030f0583f9d 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_network_endpoint_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkEndpointGroupsTracingConnection::NetworkEndpointGroupsTracingConnection( std::shared_ptr< compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection> @@ -243,20 +241,16 @@ NetworkEndpointGroupsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection> MakeNetworkEndpointGroupsTracingConnection( std::shared_ptr< compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.h b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.h index e3be63652bc00..aad7d49c58a8a 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.h +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_network_endpoint_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkEndpointGroupsTracingConnection : public compute_network_endpoint_groups_v1:: NetworkEndpointGroupsConnection { @@ -130,8 +128,6 @@ class NetworkEndpointGroupsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection.h b/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection.h index c1d8d612f3d83..a0087a40d2f92 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection.h +++ b/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_NETWORK_ENDPOINT_GROUPS_CONNECTION_H #include "google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_retry_traits.h" +#include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.pb.h" #include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection_idempotency_policy.h b/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection_idempotency_policy.h index ab4a9ee647882..fc1eb335629ae 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_NETWORK_ENDPOINT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_NETWORK_ENDPOINT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_proto_export.h b/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_proto_export.h index 1f4d84ed118cf..c878ac3acd9f5 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_proto_export.h +++ b/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_NETWORK_ENDPOINT_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_012.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_049.pb.h" +#include "google/cloud/compute/v1/internal/common_086.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_ENDPOINT_GROUPS_V1_NETWORK_ENDPOINT_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_connection_impl.h b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_connection_impl.h index 4d4ba4fd20b0b..5cace5b05cffe 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_connection_impl.h +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h" #include "google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_retry_traits.h" #include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_logging_decorator.h b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_logging_decorator.h index b454b919a989a..04fc22cade9fe 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_logging_decorator.h +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h" +#include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_metadata_decorator.h b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_metadata_decorator.h index 40b834a44cb0c..99b20572df99c 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h" +#include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc index 0e12d853ea1ac..7a8aae831c026 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.proto #include "google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h index af253efc22625..9d24c69570e8b 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_NETWORK_FIREWALL_POLICIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc index c7a67afd5e305..9168cd9f6c4c6 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_network_firewall_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkFirewallPoliciesTracingConnection:: NetworkFirewallPoliciesTracingConnection( std::shared_ptrTestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection> MakeNetworkFirewallPoliciesTracingConnection( std::shared_ptr< compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.h b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.h index 30816b042afe9..566eef2bd7757 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.h +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_network_firewall_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkFirewallPoliciesTracingConnection : public compute_network_firewall_policies_v1:: NetworkFirewallPoliciesConnection { @@ -236,8 +234,6 @@ class NetworkFirewallPoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection.h b/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection.h index 359cdb90ef565..8445b73ff879a 100644 --- a/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection.h +++ b/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_NETWORK_FIREWALL_POLICIES_CONNECTION_H #include "google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_retry_traits.h" +#include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.pb.h" #include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection_idempotency_policy.h b/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection_idempotency_policy.h index 4998b36683a7a..98f62889ec740 100644 --- a/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_NETWORK_FIREWALL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_NETWORK_FIREWALL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_proto_export.h b/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_proto_export.h index 42358007f98d8..b79d4dd7d1912 100644 --- a/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_proto_export.h +++ b/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_NETWORK_FIREWALL_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_037.pb.h" +#include "google/cloud/compute/v1/internal/common_038.pb.h" +#include "google/cloud/compute/v1/internal/common_039.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_FIREWALL_POLICIES_V1_NETWORK_FIREWALL_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_logging_decorator.h b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_logging_decorator.h index b93923715ce7e..4c836974099f4 100644 --- a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_logging_decorator.h +++ b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_INTERNAL_NETWORK_PROFILES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h" +#include "google/cloud/compute/network_profiles/v1/network_profiles.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_metadata_decorator.h b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_metadata_decorator.h index 9285c050670b2..c6a2aa2c2f5c6 100644 --- a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_metadata_decorator.h +++ b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_INTERNAL_NETWORK_PROFILES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h" +#include "google/cloud/compute/network_profiles/v1/network_profiles.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.cc b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.cc index 011e7b4777b3d..e3071fb034563 100644 --- a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.cc +++ b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/network_profiles/v1/network_profiles.proto #include "google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h" +#include "google/cloud/compute/network_profiles/v1/network_profiles.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h index df6b26d419042..fcdc08f0ec4de 100644 --- a/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h +++ b/google/cloud/compute/network_profiles/v1/internal/network_profiles_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_INTERNAL_NETWORK_PROFILES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_INTERNAL_NETWORK_PROFILES_REST_STUB_H +#include "google/cloud/compute/network_profiles/v1/network_profiles.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.cc b/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.cc index e23181efd22f8..cf6ba11d1226e 100644 --- a/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.cc +++ b/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_network_profiles_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkProfilesTracingConnection::NetworkProfilesTracingConnection( std::shared_ptr child) @@ -59,17 +57,13 @@ NetworkProfilesTracingConnection::ListNetworkProfiles( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkProfilesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.h b/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.h index 9897fe5ce1eeb..2e8c86c1286f6 100644 --- a/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.h +++ b/google/cloud/compute/network_profiles/v1/internal/network_profiles_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_network_profiles_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkProfilesTracingConnection : public compute_network_profiles_v1::NetworkProfilesConnection { public: @@ -54,8 +52,6 @@ class NetworkProfilesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/network_profiles/v1/network_profiles_connection.h b/google/cloud/compute/network_profiles/v1/network_profiles_connection.h index 7f9016cab2898..bbc77697b0761 100644 --- a/google/cloud/compute/network_profiles/v1/network_profiles_connection.h +++ b/google/cloud/compute/network_profiles/v1/network_profiles_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_NETWORK_PROFILES_CONNECTION_H #include "google/cloud/compute/network_profiles/v1/internal/network_profiles_retry_traits.h" +#include "google/cloud/compute/network_profiles/v1/network_profiles.pb.h" #include "google/cloud/compute/network_profiles/v1/network_profiles_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_profiles/v1/network_profiles_connection_idempotency_policy.h b/google/cloud/compute/network_profiles/v1/network_profiles_connection_idempotency_policy.h index 639378ba3078e..05a7200452ad9 100644 --- a/google/cloud/compute/network_profiles/v1/network_profiles_connection_idempotency_policy.h +++ b/google/cloud/compute/network_profiles/v1/network_profiles_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_NETWORK_PROFILES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_NETWORK_PROFILES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/network_profiles/v1/network_profiles.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/network_profiles/v1/network_profiles_proto_export.h b/google/cloud/compute/network_profiles/v1/network_profiles_proto_export.h index c1b26f0fd7396..859d60f5ce192 100644 --- a/google/cloud/compute/network_profiles/v1/network_profiles_proto_export.h +++ b/google/cloud/compute/network_profiles/v1/network_profiles_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_NETWORK_PROFILES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include +#include "google/cloud/compute/v1/internal/common_087.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORK_PROFILES_V1_NETWORK_PROFILES_PROTO_EXPORT_H diff --git a/google/cloud/compute/networks/v1/internal/networks_rest_connection_impl.h b/google/cloud/compute/networks/v1/internal/networks_rest_connection_impl.h index 736d168656083..f190b4f89410c 100644 --- a/google/cloud/compute/networks/v1/internal/networks_rest_connection_impl.h +++ b/google/cloud/compute/networks/v1/internal/networks_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/networks/v1/internal/networks_rest_stub.h" #include "google/cloud/compute/networks/v1/internal/networks_retry_traits.h" #include "google/cloud/compute/networks/v1/networks_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/networks/v1/internal/networks_rest_logging_decorator.h b/google/cloud/compute/networks/v1/internal/networks_rest_logging_decorator.h index e2fa39a8e24ea..534999b6e3172 100644 --- a/google/cloud/compute/networks/v1/internal/networks_rest_logging_decorator.h +++ b/google/cloud/compute/networks/v1/internal/networks_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/networks/v1/internal/networks_rest_stub.h" +#include "google/cloud/compute/networks/v1/networks.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/networks/v1/internal/networks_rest_metadata_decorator.h b/google/cloud/compute/networks/v1/internal/networks_rest_metadata_decorator.h index 52534abef42d1..1203473a96899 100644 --- a/google/cloud/compute/networks/v1/internal/networks_rest_metadata_decorator.h +++ b/google/cloud/compute/networks/v1/internal/networks_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/networks/v1/internal/networks_rest_stub.h" +#include "google/cloud/compute/networks/v1/networks.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc b/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc index 3d30b5bb27e0b..d078bfe263984 100644 --- a/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc +++ b/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/networks/v1/networks.proto #include "google/cloud/compute/networks/v1/internal/networks_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/networks/v1/networks.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/networks/v1/internal/networks_rest_stub.h b/google/cloud/compute/networks/v1/internal/networks_rest_stub.h index fc9b4ae602cfd..157f26f4f7a18 100644 --- a/google/cloud/compute/networks/v1/internal/networks_rest_stub.h +++ b/google/cloud/compute/networks/v1/internal/networks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_INTERNAL_NETWORKS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/networks/v1/networks.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc b/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc index 831be36e871fe..38cf287a271ed 100644 --- a/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc +++ b/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_networks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworksTracingConnection::NetworksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -290,16 +288,12 @@ NetworksTracingConnection::UpdatePeering( return internal::EndSpan(std::move(span), child_->UpdatePeering(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/networks/v1/internal/networks_tracing_connection.h b/google/cloud/compute/networks/v1/internal/networks_tracing_connection.h index b52c96d3857e9..7cea9949404ba 100644 --- a/google/cloud/compute/networks/v1/internal/networks_tracing_connection.h +++ b/google/cloud/compute/networks/v1/internal/networks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_networks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworksTracingConnection : public compute_networks_v1::NetworksConnection { public: @@ -147,8 +145,6 @@ class NetworksTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/networks/v1/networks_connection.h b/google/cloud/compute/networks/v1/networks_connection.h index 2ca7221dd06a4..05cb2e06f4deb 100644 --- a/google/cloud/compute/networks/v1/networks_connection.h +++ b/google/cloud/compute/networks/v1/networks_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_NETWORKS_CONNECTION_H #include "google/cloud/compute/networks/v1/internal/networks_retry_traits.h" +#include "google/cloud/compute/networks/v1/networks.pb.h" #include "google/cloud/compute/networks/v1/networks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/networks/v1/networks_connection_idempotency_policy.h b/google/cloud/compute/networks/v1/networks_connection_idempotency_policy.h index 268938d7c4e14..2700e292ffc3a 100644 --- a/google/cloud/compute/networks/v1/networks_connection_idempotency_policy.h +++ b/google/cloud/compute/networks/v1/networks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_NETWORKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_NETWORKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/networks/v1/networks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/networks/v1/networks_proto_export.h b/google/cloud/compute/networks/v1/networks_proto_export.h index 2dd2c118a950c..063a722deecb9 100644 --- a/google/cloud/compute/networks/v1/networks_proto_export.h +++ b/google/cloud/compute/networks/v1/networks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,15 +26,15 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_NETWORKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_030.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_034.pb.h" +#include "google/cloud/compute/v1/internal/common_039.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_132.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NETWORKS_V1_NETWORKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_connection_impl.h b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_connection_impl.h index b89ee7a89f5b6..49f2c8a7595f1 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_connection_impl.h +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/node_groups/v1/node_groups_connection.h" #include "google/cloud/compute/node_groups/v1/node_groups_connection_idempotency_policy.h" #include "google/cloud/compute/node_groups/v1/node_groups_options.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_logging_decorator.h b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_logging_decorator.h index 526b443960c4a..848c74dd24bcd 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_logging_decorator.h +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_INTERNAL_NODE_GROUPS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h" +#include "google/cloud/compute/node_groups/v1/node_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_metadata_decorator.h b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_metadata_decorator.h index 6576b07635232..30e0d2508db0d 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_INTERNAL_NODE_GROUPS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h" +#include "google/cloud/compute/node_groups/v1/node_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc index c136c1131e899..83faabda5ee5b 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/node_groups/v1/node_groups.proto #include "google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h" +#include "google/cloud/compute/node_groups/v1/node_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h index 83e76d2797efe..2fb884d09738b 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_INTERNAL_NODE_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_INTERNAL_NODE_GROUPS_REST_STUB_H +#include "google/cloud/compute/node_groups/v1/node_groups.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc b/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc index fa9314fba5132..8b72ee9081254 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_node_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NodeGroupsTracingConnection::NodeGroupsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -360,16 +358,12 @@ NodeGroupsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNodeGroupsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.h b/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.h index 733b81a3ce1e4..a4d17a6c3ac6c 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.h +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_node_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NodeGroupsTracingConnection : public compute_node_groups_v1::NodeGroupsConnection { public: @@ -168,8 +166,6 @@ class NodeGroupsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/node_groups/v1/node_groups_connection.h b/google/cloud/compute/node_groups/v1/node_groups_connection.h index bd96dfadcfae5..b1fd36020ccd4 100644 --- a/google/cloud/compute/node_groups/v1/node_groups_connection.h +++ b/google/cloud/compute/node_groups/v1/node_groups_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_NODE_GROUPS_CONNECTION_H #include "google/cloud/compute/node_groups/v1/internal/node_groups_retry_traits.h" +#include "google/cloud/compute/node_groups/v1/node_groups.pb.h" #include "google/cloud/compute/node_groups/v1/node_groups_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_groups/v1/node_groups_connection_idempotency_policy.h b/google/cloud/compute/node_groups/v1/node_groups_connection_idempotency_policy.h index 4dfd1c6701dcf..f408133e3ca63 100644 --- a/google/cloud/compute/node_groups/v1/node_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/node_groups/v1/node_groups_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_NODE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_NODE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/node_groups/v1/node_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_groups/v1/node_groups_proto_export.h b/google/cloud/compute/node_groups/v1/node_groups_proto_export.h index ed1b911a8940d..0c94514e229d5 100644 --- a/google/cloud/compute/node_groups/v1/node_groups_proto_export.h +++ b/google/cloud/compute/node_groups/v1/node_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,17 +26,17 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_NODE_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_058.pb.h" +#include "google/cloud/compute/v1/internal/common_078.pb.h" +#include "google/cloud/compute/v1/internal/common_120.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_146.pb.h" +#include "google/cloud/compute/v1/internal/common_152.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_GROUPS_V1_NODE_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_connection_impl.h b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_connection_impl.h index e4513335b9941..a9816dd3e0e8a 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_connection_impl.h +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/node_templates/v1/node_templates_connection.h" #include "google/cloud/compute/node_templates/v1/node_templates_connection_idempotency_policy.h" #include "google/cloud/compute/node_templates/v1/node_templates_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_logging_decorator.h b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_logging_decorator.h index 455742b49a456..500ff71eec501 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_logging_decorator.h +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_INTERNAL_NODE_TEMPLATES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h" +#include "google/cloud/compute/node_templates/v1/node_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_metadata_decorator.h b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_metadata_decorator.h index b682d77ed11ab..6a84a61901567 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_metadata_decorator.h +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_INTERNAL_NODE_TEMPLATES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h" +#include "google/cloud/compute/node_templates/v1/node_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc index ed799987f61b0..6295f70ab926a 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/node_templates/v1/node_templates.proto #include "google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h" +#include "google/cloud/compute/node_templates/v1/node_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h index d6b66d2568d33..86b062e1b148c 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_INTERNAL_NODE_TEMPLATES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_INTERNAL_NODE_TEMPLATES_REST_STUB_H +#include "google/cloud/compute/node_templates/v1/node_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc b/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc index c36da22f3066c..53667ebb45e68 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_node_templates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NodeTemplatesTracingConnection::NodeTemplatesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -165,16 +163,12 @@ NodeTemplatesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNodeTemplatesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.h b/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.h index afb6ab2953149..8e0b0513ab6ab 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.h +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_node_templates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NodeTemplatesTracingConnection : public compute_node_templates_v1::NodeTemplatesConnection { public: @@ -95,8 +93,6 @@ class NodeTemplatesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/node_templates/v1/node_templates_connection.h b/google/cloud/compute/node_templates/v1/node_templates_connection.h index 2b14e2cb3e4a6..a7c462fe60bb8 100644 --- a/google/cloud/compute/node_templates/v1/node_templates_connection.h +++ b/google/cloud/compute/node_templates/v1/node_templates_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_NODE_TEMPLATES_CONNECTION_H #include "google/cloud/compute/node_templates/v1/internal/node_templates_retry_traits.h" +#include "google/cloud/compute/node_templates/v1/node_templates.pb.h" #include "google/cloud/compute/node_templates/v1/node_templates_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_templates/v1/node_templates_connection_idempotency_policy.h b/google/cloud/compute/node_templates/v1/node_templates_connection_idempotency_policy.h index ef0a7baa3d778..dc3022056b270 100644 --- a/google/cloud/compute/node_templates/v1/node_templates_connection_idempotency_policy.h +++ b/google/cloud/compute/node_templates/v1/node_templates_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_NODE_TEMPLATES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_NODE_TEMPLATES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/node_templates/v1/node_templates.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_templates/v1/node_templates_proto_export.h b/google/cloud/compute/node_templates/v1/node_templates_proto_export.h index 36f798ee32d71..471001ad9c7a3 100644 --- a/google/cloud/compute/node_templates/v1/node_templates_proto_export.h +++ b/google/cloud/compute/node_templates/v1/node_templates_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_NODE_TEMPLATES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_078.pb.h" +#include "google/cloud/compute/v1/internal/common_088.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TEMPLATES_V1_NODE_TEMPLATES_PROTO_EXPORT_H diff --git a/google/cloud/compute/node_types/v1/internal/node_types_rest_logging_decorator.h b/google/cloud/compute/node_types/v1/internal/node_types_rest_logging_decorator.h index 58ade8ed6cab3..d7cc47b42c33c 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_rest_logging_decorator.h +++ b/google/cloud/compute/node_types/v1/internal/node_types_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_INTERNAL_NODE_TYPES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h" +#include "google/cloud/compute/node_types/v1/node_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/node_types/v1/internal/node_types_rest_metadata_decorator.h b/google/cloud/compute/node_types/v1/internal/node_types_rest_metadata_decorator.h index c17744f80c0a4..ec5cf6b0276ba 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_rest_metadata_decorator.h +++ b/google/cloud/compute/node_types/v1/internal/node_types_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_INTERNAL_NODE_TYPES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h" +#include "google/cloud/compute/node_types/v1/node_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc b/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc index 4cd4d68e05383..dba5a216b32a6 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc +++ b/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/node_types/v1/node_types.proto #include "google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h" +#include "google/cloud/compute/node_types/v1/node_types.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h b/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h index 6cbd235297a8c..e016a0095e670 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h +++ b/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_INTERNAL_NODE_TYPES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_INTERNAL_NODE_TYPES_REST_STUB_H +#include "google/cloud/compute/node_types/v1/node_types.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc b/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc index 94e47d85c4ef9..2a880afb46db2 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc +++ b/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_node_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NodeTypesTracingConnection::NodeTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -69,16 +67,12 @@ NodeTypesTracingConnection::ListNodeTypes( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNodeTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.h b/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.h index 5ab288d047296..f87fad28d5275 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.h +++ b/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_node_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NodeTypesTracingConnection : public compute_node_types_v1::NodeTypesConnection { public: @@ -57,8 +55,6 @@ class NodeTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/node_types/v1/node_types_connection.h b/google/cloud/compute/node_types/v1/node_types_connection.h index 14ab64ea4a5e6..a56008f300336 100644 --- a/google/cloud/compute/node_types/v1/node_types_connection.h +++ b/google/cloud/compute/node_types/v1/node_types_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_NODE_TYPES_CONNECTION_H #include "google/cloud/compute/node_types/v1/internal/node_types_retry_traits.h" +#include "google/cloud/compute/node_types/v1/node_types.pb.h" #include "google/cloud/compute/node_types/v1/node_types_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_types/v1/node_types_connection_idempotency_policy.h b/google/cloud/compute/node_types/v1/node_types_connection_idempotency_policy.h index 3e59700e4e472..d12a64beb7d23 100644 --- a/google/cloud/compute/node_types/v1/node_types_connection_idempotency_policy.h +++ b/google/cloud/compute/node_types/v1/node_types_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_NODE_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_NODE_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/node_types/v1/node_types.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/node_types/v1/node_types_proto_export.h b/google/cloud/compute/node_types/v1/node_types_proto_export.h index 2f8af99f8c0f9..879dc6fdf95b8 100644 --- a/google/cloud/compute/node_types/v1/node_types_proto_export.h +++ b/google/cloud/compute/node_types/v1/node_types_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_NODE_TYPES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_089.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_NODE_TYPES_V1_NODE_TYPES_PROTO_EXPORT_H diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_connection_impl.h b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_connection_impl.h index 1530a3f47a5ec..f37e4e22adbb1 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_connection_impl.h +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection.h" #include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection_idempotency_policy.h" #include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_logging_decorator.h b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_logging_decorator.h index 24bbf5eececdd..c2baf4351e7e5 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_logging_decorator.h +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_INTERNAL_PACKET_MIRRORINGS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h" +#include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_metadata_decorator.h b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_metadata_decorator.h index 050b3ab2cbe81..ccb6870fd3ec4 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_metadata_decorator.h +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_INTERNAL_PACKET_MIRRORINGS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h" +#include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc index 34ce9025b4104..8c5522ee555e8 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.proto #include "google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h" +#include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h index afb6da36bbb27..fec8188773255 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_INTERNAL_PACKET_MIRRORINGS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_INTERNAL_PACKET_MIRRORINGS_REST_STUB_H +#include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc index 90a22548f1661..bae1d0ab90686 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_packet_mirrorings_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PacketMirroringsTracingConnection::PacketMirroringsTracingConnection( std::shared_ptr child) @@ -191,17 +189,13 @@ PacketMirroringsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePacketMirroringsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.h b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.h index d6445efa2bc1e..750c7bc7754d2 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.h +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_packet_mirrorings_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PacketMirroringsTracingConnection : public compute_packet_mirrorings_v1::PacketMirroringsConnection { public: @@ -102,8 +100,6 @@ class PacketMirroringsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection.h b/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection.h index 0041f8dbd403e..a4f3e8d5f6d9f 100644 --- a/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection.h +++ b/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_PACKET_MIRRORINGS_CONNECTION_H #include "google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_retry_traits.h" +#include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.pb.h" #include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection_idempotency_policy.h b/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection_idempotency_policy.h index a1bc82484b6ca..891cf58f65e35 100644 --- a/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection_idempotency_policy.h +++ b/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_PACKET_MIRRORINGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_PACKET_MIRRORINGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_proto_export.h b/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_proto_export.h index 01f2f2a4b78ad..f410b79d44368 100644 --- a/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_proto_export.h +++ b/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_PACKET_MIRRORINGS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_093.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PACKET_MIRRORINGS_V1_PACKET_MIRRORINGS_PROTO_EXPORT_H diff --git a/google/cloud/compute/projects/v1/internal/projects_rest_connection_impl.h b/google/cloud/compute/projects/v1/internal/projects_rest_connection_impl.h index ed342d604d33b..75843d1488026 100644 --- a/google/cloud/compute/projects/v1/internal/projects_rest_connection_impl.h +++ b/google/cloud/compute/projects/v1/internal/projects_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/projects/v1/internal/projects_rest_stub.h" #include "google/cloud/compute/projects/v1/internal/projects_retry_traits.h" #include "google/cloud/compute/projects/v1/projects_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/projects/v1/internal/projects_rest_logging_decorator.h b/google/cloud/compute/projects/v1/internal/projects_rest_logging_decorator.h index 2f9576b93a57c..724cc4f058d0d 100644 --- a/google/cloud/compute/projects/v1/internal/projects_rest_logging_decorator.h +++ b/google/cloud/compute/projects/v1/internal/projects_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/projects/v1/internal/projects_rest_stub.h" +#include "google/cloud/compute/projects/v1/projects.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/projects/v1/internal/projects_rest_metadata_decorator.h b/google/cloud/compute/projects/v1/internal/projects_rest_metadata_decorator.h index c8da3ccc8ecf9..0823e2e8aba1d 100644 --- a/google/cloud/compute/projects/v1/internal/projects_rest_metadata_decorator.h +++ b/google/cloud/compute/projects/v1/internal/projects_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/projects/v1/internal/projects_rest_stub.h" +#include "google/cloud/compute/projects/v1/projects.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc b/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc index eef501c19ca98..3e47e78146aa1 100644 --- a/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc +++ b/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/projects/v1/projects.proto #include "google/cloud/compute/projects/v1/internal/projects_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/projects/v1/projects.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/projects/v1/internal/projects_rest_stub.h b/google/cloud/compute/projects/v1/internal/projects_rest_stub.h index e36ffe88a623d..302dcc76faf40 100644 --- a/google/cloud/compute/projects/v1/internal/projects_rest_stub.h +++ b/google/cloud/compute/projects/v1/internal/projects_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_INTERNAL_PROJECTS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/projects/v1/projects.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc b/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc index 1e64392ec75da..38012163162be 100644 --- a/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc +++ b/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_projects_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProjectsTracingConnection::ProjectsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -386,16 +384,12 @@ ProjectsTracingConnection::SetUsageExportBucket( child_->SetUsageExportBucket(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProjectsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/projects/v1/internal/projects_tracing_connection.h b/google/cloud/compute/projects/v1/internal/projects_tracing_connection.h index 173bd0a1ebf8b..a1f28e7714cde 100644 --- a/google/cloud/compute/projects/v1/internal/projects_tracing_connection.h +++ b/google/cloud/compute/projects/v1/internal/projects_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_projects_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProjectsTracingConnection : public compute_projects_v1::ProjectsConnection { public: @@ -188,8 +186,6 @@ class ProjectsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/projects/v1/projects_connection.h b/google/cloud/compute/projects/v1/projects_connection.h index cc2d4af46f782..32151d0ccae5a 100644 --- a/google/cloud/compute/projects/v1/projects_connection.h +++ b/google/cloud/compute/projects/v1/projects_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_PROJECTS_CONNECTION_H #include "google/cloud/compute/projects/v1/internal/projects_retry_traits.h" +#include "google/cloud/compute/projects/v1/projects.pb.h" #include "google/cloud/compute/projects/v1/projects_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/projects/v1/projects_connection_idempotency_policy.h b/google/cloud/compute/projects/v1/projects_connection_idempotency_policy.h index 37ca40331527e..4f49566616f14 100644 --- a/google/cloud/compute/projects/v1/projects_connection_idempotency_policy.h +++ b/google/cloud/compute/projects/v1/projects_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/projects/v1/projects.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/projects/v1/projects_proto_export.h b/google/cloud/compute/projects/v1/projects_proto_export.h index 96fcccfd8e974..81463ab7e1eb1 100644 --- a/google/cloud/compute/projects/v1/projects_proto_export.h +++ b/google/cloud/compute/projects/v1/projects_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_PROJECTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_025.pb.h" +#include "google/cloud/compute/v1/internal/common_081.pb.h" +#include "google/cloud/compute/v1/internal/common_098.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PROJECTS_V1_PROJECTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_connection_impl.h b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_connection_impl.h index 834fe50cd80e4..32f8c5dd3b24b 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_connection_impl.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h" #include "google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_retry_traits.h" #include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_logging_decorator.h b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_logging_decorator.h index e03ff20c62973..8e939439a649f 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_logging_decorator.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h" +#include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_metadata_decorator.h b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_metadata_decorator.h index b6941163d377f..2451f6f976f61 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_metadata_decorator.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h" +#include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc index a9ef3f3603ad3..7867609692f8b 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.proto #include "google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h index ea67b3c71de17..f3b80db3528fd 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_INTERNAL_PUBLIC_ADVERTISED_PREFIXES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc index 1fafdc1b25abd..8014b865c5da6 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_public_advertised_prefixes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublicAdvertisedPrefixesTracingConnection:: PublicAdvertisedPrefixesTracingConnection( std::shared_ptrWithdraw(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_public_advertised_prefixes_v1::PublicAdvertisedPrefixesConnection> MakePublicAdvertisedPrefixesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.h b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.h index 783b15a01dd2c..e4a5b44a03081 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_public_advertised_prefixes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublicAdvertisedPrefixesTracingConnection : public compute_public_advertised_prefixes_v1:: PublicAdvertisedPrefixesConnection { @@ -127,8 +125,6 @@ class PublicAdvertisedPrefixesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection.h b/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection.h index c1938963f04a6..b474194f209ec 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_PUBLIC_ADVERTISED_PREFIXES_CONNECTION_H #include "google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_retry_traits.h" +#include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.pb.h" #include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection_idempotency_policy.h b/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection_idempotency_policy.h index 79b101d5f144b..b97c2fb7e3739 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection_idempotency_policy.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_PUBLIC_ADVERTISED_PREFIXES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_PUBLIC_ADVERTISED_PREFIXES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_proto_export.h b/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_proto_export.h index 929a829f88b47..263f7641c7568 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_proto_export.h +++ b/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_PUBLIC_ADVERTISED_PREFIXES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_095.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_ADVERTISED_PREFIXES_V1_PUBLIC_ADVERTISED_PREFIXES_PROTO_EXPORT_H diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_connection_impl.h b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_connection_impl.h index 8df637c1d55a3..78da5b80d2474 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_connection_impl.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection.h" #include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection_idempotency_policy.h" #include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_logging_decorator.h b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_logging_decorator.h index cf8c4dd574859..7ad6b5ec41613 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_logging_decorator.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_PUBLIC_DELEGATED_PREFIXES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h" +#include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_metadata_decorator.h b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_metadata_decorator.h index 0668de27a218f..6e774cedbc0aa 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_metadata_decorator.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_PUBLIC_DELEGATED_PREFIXES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h" +#include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc index 063281250bd09..edb774667bebb 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.proto #include "google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h" +#include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h index 6b53180eb35ca..1fbb7d4899b63 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_PUBLIC_DELEGATED_PREFIXES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_INTERNAL_PUBLIC_DELEGATED_PREFIXES_REST_STUB_H +#include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc index e823e2c85b419..0409a253473ea 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_public_delegated_prefixes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublicDelegatedPrefixesTracingConnection:: PublicDelegatedPrefixesTracingConnection( std::shared_ptrWithdraw(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_public_delegated_prefixes_v1::PublicDelegatedPrefixesConnection> MakePublicDelegatedPrefixesTracingConnection( std::shared_ptr< compute_public_delegated_prefixes_v1::PublicDelegatedPrefixesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.h b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.h index a398200147c90..d9f9f53d416be 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_public_delegated_prefixes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublicDelegatedPrefixesTracingConnection : public compute_public_delegated_prefixes_v1:: PublicDelegatedPrefixesConnection { @@ -133,8 +131,6 @@ class PublicDelegatedPrefixesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection.h b/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection.h index da9cf94ae63fb..b91a5b2ca9834 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_PUBLIC_DELEGATED_PREFIXES_CONNECTION_H #include "google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_retry_traits.h" +#include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.pb.h" #include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection_idempotency_policy.h b/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection_idempotency_policy.h index 81d4c06e793e2..625595b30da49 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection_idempotency_policy.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_PUBLIC_DELEGATED_PREFIXES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_PUBLIC_DELEGATED_PREFIXES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_proto_export.h b/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_proto_export.h index 0882837c8a05b..e372bd05444bf 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_proto_export.h +++ b/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_PUBLIC_DELEGATED_PREFIXES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_096.pb.h" +#include "google/cloud/compute/v1/internal/common_097.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_PUBLIC_DELEGATED_PREFIXES_V1_PUBLIC_DELEGATED_PREFIXES_PROTO_EXPORT_H diff --git a/google/cloud/compute/quickstart/.bazelrc b/google/cloud/compute/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/compute/quickstart/.bazelrc +++ b/google/cloud/compute/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_connection_impl.h b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_connection_impl.h index 1e11e92e89ca2..48d1c1938563c 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_connection_impl.h +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection.h" #include "google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection_idempotency_policy.h" #include "google/cloud/compute/region_autoscalers/v1/region_autoscalers_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_logging_decorator.h b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_logging_decorator.h index aafbb719fe5a0..9904b8b9a74a4 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_logging_decorator.h +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_INTERNAL_REGION_AUTOSCALERS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h" +#include "google/cloud/compute/region_autoscalers/v1/region_autoscalers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_metadata_decorator.h b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_metadata_decorator.h index 0ad1e7f0c02ee..2c348291d45a5 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_metadata_decorator.h +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_INTERNAL_REGION_AUTOSCALERS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h" +#include "google/cloud/compute/region_autoscalers/v1/region_autoscalers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc index fa52326022849..0debfa6e740cf 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/region_autoscalers/v1/region_autoscalers.proto #include "google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h" +#include "google/cloud/compute/region_autoscalers/v1/region_autoscalers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h index 4b7c5a1dc9a55..05ea74a003823 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_INTERNAL_REGION_AUTOSCALERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_INTERNAL_REGION_AUTOSCALERS_REST_STUB_H +#include "google/cloud/compute/region_autoscalers/v1/region_autoscalers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc index 417f40967f98c..38c91e7b3ea57 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_autoscalers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionAutoscalersTracingConnection::RegionAutoscalersTracingConnection( std::shared_ptr child) @@ -194,18 +192,14 @@ RegionAutoscalersTracingConnection::UpdateAutoscaler( child_->UpdateAutoscaler(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionAutoscalersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.h b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.h index f5285ce7e1259..ae8399daf9f67 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.h +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_autoscalers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionAutoscalersTracingConnection : public compute_region_autoscalers_v1::RegionAutoscalersConnection { public: @@ -99,8 +97,6 @@ class RegionAutoscalersTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection.h b/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection.h index 56d6790d4156c..8e27b4b0b13df 100644 --- a/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection.h +++ b/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_REGION_AUTOSCALERS_CONNECTION_H #include "google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_retry_traits.h" +#include "google/cloud/compute/region_autoscalers/v1/region_autoscalers.pb.h" #include "google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection_idempotency_policy.h b/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection_idempotency_policy.h index 7ba6dec19f201..edcca9e61ae84 100644 --- a/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection_idempotency_policy.h +++ b/google/cloud/compute/region_autoscalers/v1/region_autoscalers_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_REGION_AUTOSCALERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_REGION_AUTOSCALERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_autoscalers/v1/region_autoscalers.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_autoscalers/v1/region_autoscalers_proto_export.h b/google/cloud/compute/region_autoscalers/v1/region_autoscalers_proto_export.h index 9b007ec76e1ec..96b540cda01b4 100644 --- a/google/cloud/compute/region_autoscalers/v1/region_autoscalers_proto_export.h +++ b/google/cloud/compute/region_autoscalers/v1/region_autoscalers_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_REGION_AUTOSCALERS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_008.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_040.pb.h" +#include "google/cloud/compute/v1/internal/common_100.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_AUTOSCALERS_V1_REGION_AUTOSCALERS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_connection_impl.h b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_connection_impl.h index 89b4c9f042bbf..19c5a3bce6955 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_connection_impl.h +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_backend_services/v1/region_backend_services_connection.h" #include "google/cloud/compute/region_backend_services/v1/region_backend_services_connection_idempotency_policy.h" #include "google/cloud/compute/region_backend_services/v1/region_backend_services_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_logging_decorator.h b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_logging_decorator.h index d4f089e08961d..7ec9edec79598 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_logging_decorator.h +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_INTERNAL_REGION_BACKEND_SERVICES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h" +#include "google/cloud/compute/region_backend_services/v1/region_backend_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_metadata_decorator.h b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_metadata_decorator.h index 282407fd4c3c8..973f7564da386 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_metadata_decorator.h +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_INTERNAL_REGION_BACKEND_SERVICES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h" +#include "google/cloud/compute/region_backend_services/v1/region_backend_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc index 5e319e8091b2a..b0fbb4a4e0201 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_backend_services/v1/region_backend_services.proto #include "google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h" +#include "google/cloud/compute/region_backend_services/v1/region_backend_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h index 3265cc5cca3af..5d29518182e5b 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_INTERNAL_REGION_BACKEND_SERVICES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_INTERNAL_REGION_BACKEND_SERVICES_REST_STUB_H +#include "google/cloud/compute/region_backend_services/v1/region_backend_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc index 1fe377b01c0f6..1a2eb7c53e712 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_backend_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionBackendServicesTracingConnection::RegionBackendServicesTracingConnection( std::shared_ptr< compute_region_backend_services_v1::RegionBackendServicesConnection> @@ -293,20 +291,16 @@ RegionBackendServicesTracingConnection::UpdateBackendService( child_->UpdateBackendService(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_backend_services_v1::RegionBackendServicesConnection> MakeRegionBackendServicesTracingConnection( std::shared_ptr< compute_region_backend_services_v1::RegionBackendServicesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.h b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.h index 2807dfb5dc7fb..52eaa8a0f4915 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.h +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_backend_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionBackendServicesTracingConnection : public compute_region_backend_services_v1:: RegionBackendServicesConnection { @@ -142,8 +140,6 @@ class RegionBackendServicesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_backend_services/v1/region_backend_services_connection.h b/google/cloud/compute/region_backend_services/v1/region_backend_services_connection.h index 639eef6247102..8852ea311c4e3 100644 --- a/google/cloud/compute/region_backend_services/v1/region_backend_services_connection.h +++ b/google/cloud/compute/region_backend_services/v1/region_backend_services_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_REGION_BACKEND_SERVICES_CONNECTION_H #include "google/cloud/compute/region_backend_services/v1/internal/region_backend_services_retry_traits.h" +#include "google/cloud/compute/region_backend_services/v1/region_backend_services.pb.h" #include "google/cloud/compute/region_backend_services/v1/region_backend_services_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_backend_services/v1/region_backend_services_connection_idempotency_policy.h b/google/cloud/compute/region_backend_services/v1/region_backend_services_connection_idempotency_policy.h index bfddece424f8d..928c1274ab2d1 100644 --- a/google/cloud/compute/region_backend_services/v1/region_backend_services_connection_idempotency_policy.h +++ b/google/cloud/compute/region_backend_services/v1/region_backend_services_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_REGION_BACKEND_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_REGION_BACKEND_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_backend_services/v1/region_backend_services.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_backend_services/v1/region_backend_services_proto_export.h b/google/cloud/compute/region_backend_services/v1/region_backend_services_proto_export.h index 2478f4420fb94..d049495648f3a 100644 --- a/google/cloud/compute/region_backend_services/v1/region_backend_services_proto_export.h +++ b/google/cloud/compute/region_backend_services/v1/region_backend_services_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,15 +26,15 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_REGION_BACKEND_SERVICES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_000.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_052.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_118.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_BACKEND_SERVICES_V1_REGION_BACKEND_SERVICES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_connection_impl.h b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_connection_impl.h index deb7f25f550bd..949e8c048cc2d 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_connection_impl.h +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/region_commitments/v1/region_commitments_connection.h" #include "google/cloud/compute/region_commitments/v1/region_commitments_connection_idempotency_policy.h" #include "google/cloud/compute/region_commitments/v1/region_commitments_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_logging_decorator.h b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_logging_decorator.h index c74ab99ba439c..b0d3c0e9165ed 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_logging_decorator.h +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_INTERNAL_REGION_COMMITMENTS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h" +#include "google/cloud/compute/region_commitments/v1/region_commitments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_metadata_decorator.h b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_metadata_decorator.h index 995c44380ee37..381e0e1e5cd79 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_metadata_decorator.h +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_INTERNAL_REGION_COMMITMENTS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h" +#include "google/cloud/compute/region_commitments/v1/region_commitments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc index 5da166f40d922..24c60f013a02f 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/region_commitments/v1/region_commitments.proto #include "google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h" +#include "google/cloud/compute/region_commitments/v1/region_commitments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h index 034e10a3dd738..1ae63de7e6401 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_INTERNAL_REGION_COMMITMENTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_INTERNAL_REGION_COMMITMENTS_REST_STUB_H +#include "google/cloud/compute/region_commitments/v1/region_commitments.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc b/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc index 21ae5e97d329a..fbb2013b40ddf 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_commitments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionCommitmentsTracingConnection::RegionCommitmentsTracingConnection( std::shared_ptr child) @@ -142,18 +140,14 @@ RegionCommitmentsTracingConnection::UpdateCommitment( child_->UpdateCommitment(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionCommitmentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.h b/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.h index dee2c8bc1bdb2..c10340d8ea5c8 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.h +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_commitments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionCommitmentsTracingConnection : public compute_region_commitments_v1::RegionCommitmentsConnection { public: @@ -83,8 +81,6 @@ class RegionCommitmentsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_commitments/v1/region_commitments_connection.h b/google/cloud/compute/region_commitments/v1/region_commitments_connection.h index 3fe0cbde09ae0..dfba56afc3491 100644 --- a/google/cloud/compute/region_commitments/v1/region_commitments_connection.h +++ b/google/cloud/compute/region_commitments/v1/region_commitments_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_REGION_COMMITMENTS_CONNECTION_H #include "google/cloud/compute/region_commitments/v1/internal/region_commitments_retry_traits.h" +#include "google/cloud/compute/region_commitments/v1/region_commitments.pb.h" #include "google/cloud/compute/region_commitments/v1/region_commitments_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_commitments/v1/region_commitments_connection_idempotency_policy.h b/google/cloud/compute/region_commitments/v1/region_commitments_connection_idempotency_policy.h index 1b5cf2cd7c590..7c9b367a02ccf 100644 --- a/google/cloud/compute/region_commitments/v1/region_commitments_connection_idempotency_policy.h +++ b/google/cloud/compute/region_commitments/v1/region_commitments_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_REGION_COMMITMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_REGION_COMMITMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_commitments/v1/region_commitments.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_commitments/v1/region_commitments_proto_export.h b/google/cloud/compute/region_commitments/v1/region_commitments_proto_export.h index 02853679510f2..6f39ec34042f9 100644 --- a/google/cloud/compute/region_commitments/v1/region_commitments_proto_export.h +++ b/google/cloud/compute/region_commitments/v1/region_commitments_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_REGION_COMMITMENTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_006.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_019.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_048.pb.h" +#include "google/cloud/compute/v1/internal/common_120.pb.h" +#include "google/cloud/compute/v1/internal/common_146.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_COMMITMENTS_V1_REGION_COMMITMENTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_logging_decorator.h b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_logging_decorator.h index a511b8345bc82..5f7d3edb3dda5 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_logging_decorator.h +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_INTERNAL_REGION_DISK_TYPES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h" +#include "google/cloud/compute/region_disk_types/v1/region_disk_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_metadata_decorator.h b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_metadata_decorator.h index ecb93e942deb8..ecd292495146f 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_metadata_decorator.h +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_INTERNAL_REGION_DISK_TYPES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h" +#include "google/cloud/compute/region_disk_types/v1/region_disk_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc index 52e9e07a8cce5..48a9a2032ff31 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/region_disk_types/v1/region_disk_types.proto #include "google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h" +#include "google/cloud/compute/region_disk_types/v1/region_disk_types.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h index 2c84de16bf84a..386eaf7c9dbb1 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_INTERNAL_REGION_DISK_TYPES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_INTERNAL_REGION_DISK_TYPES_REST_STUB_H +#include "google/cloud/compute/region_disk_types/v1/region_disk_types.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc index 45e9859eda60f..8250831a99fc2 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_disk_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionDiskTypesTracingConnection::RegionDiskTypesTracingConnection( std::shared_ptr child) @@ -58,17 +56,13 @@ RegionDiskTypesTracingConnection::ListRegionDiskTypes( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionDiskTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.h b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.h index bfdd9b9241bde..bfe4a7ea4e6f4 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.h +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_disk_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionDiskTypesTracingConnection : public compute_region_disk_types_v1::RegionDiskTypesConnection { public: @@ -54,8 +52,6 @@ class RegionDiskTypesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_disk_types/v1/region_disk_types_connection.h b/google/cloud/compute/region_disk_types/v1/region_disk_types_connection.h index 6680af5546f43..db75dfa537f3a 100644 --- a/google/cloud/compute/region_disk_types/v1/region_disk_types_connection.h +++ b/google/cloud/compute/region_disk_types/v1/region_disk_types_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_REGION_DISK_TYPES_CONNECTION_H #include "google/cloud/compute/region_disk_types/v1/internal/region_disk_types_retry_traits.h" +#include "google/cloud/compute/region_disk_types/v1/region_disk_types.pb.h" #include "google/cloud/compute/region_disk_types/v1/region_disk_types_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_disk_types/v1/region_disk_types_connection_idempotency_policy.h b/google/cloud/compute/region_disk_types/v1/region_disk_types_connection_idempotency_policy.h index c33be9d7c239a..fc49f6cd766d8 100644 --- a/google/cloud/compute/region_disk_types/v1/region_disk_types_connection_idempotency_policy.h +++ b/google/cloud/compute/region_disk_types/v1/region_disk_types_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_REGION_DISK_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_REGION_DISK_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_disk_types/v1/region_disk_types.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_disk_types/v1/region_disk_types_proto_export.h b/google/cloud/compute/region_disk_types/v1/region_disk_types_proto_export.h index 76c63148a8b62..fc8d3d29cffe4 100644 --- a/google/cloud/compute/region_disk_types/v1/region_disk_types_proto_export.h +++ b/google/cloud/compute/region_disk_types/v1/region_disk_types_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_REGION_DISK_TYPES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_026.pb.h" +#include "google/cloud/compute/v1/internal/common_101.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISK_TYPES_V1_REGION_DISK_TYPES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_connection_impl.h b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_connection_impl.h index b51bc9c76cf03..a336f0ac2bd92 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_connection_impl.h +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/region_disks/v1/region_disks_connection.h" #include "google/cloud/compute/region_disks/v1/region_disks_connection_idempotency_policy.h" #include "google/cloud/compute/region_disks/v1/region_disks_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_logging_decorator.h b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_logging_decorator.h index 6af0965e2f1ef..6e6b773edf131 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_logging_decorator.h +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_INTERNAL_REGION_DISKS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h" +#include "google/cloud/compute/region_disks/v1/region_disks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_metadata_decorator.h b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_metadata_decorator.h index f12668f7c878b..fb0315454a9f3 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_metadata_decorator.h +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_INTERNAL_REGION_DISKS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h" +#include "google/cloud/compute/region_disks/v1/region_disks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc index 8f9582451f017..a0379906c7007 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/region_disks/v1/region_disks.proto #include "google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h" +#include "google/cloud/compute/region_disks/v1/region_disks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h index f897937372206..051309674f6a6 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_INTERNAL_REGION_DISKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_INTERNAL_REGION_DISKS_REST_STUB_H +#include "google/cloud/compute/region_disks/v1/region_disks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc b/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc index 29adc384a34fc..2b85dac179a6b 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_disks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionDisksTracingConnection::RegionDisksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -459,16 +457,12 @@ RegionDisksTracingConnection::UpdateDisk( return internal::EndSpan(std::move(span), child_->UpdateDisk(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionDisksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.h b/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.h index c916c4f429799..ebc54d08a6128 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.h +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_disks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionDisksTracingConnection : public compute_region_disks_v1::RegionDisksConnection { public: @@ -211,8 +209,6 @@ class RegionDisksTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_disks/v1/region_disks_connection.h b/google/cloud/compute/region_disks/v1/region_disks_connection.h index c5f96da313317..c216eadeeaab9 100644 --- a/google/cloud/compute/region_disks/v1/region_disks_connection.h +++ b/google/cloud/compute/region_disks/v1/region_disks_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_REGION_DISKS_CONNECTION_H #include "google/cloud/compute/region_disks/v1/internal/region_disks_retry_traits.h" +#include "google/cloud/compute/region_disks/v1/region_disks.pb.h" #include "google/cloud/compute/region_disks/v1/region_disks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_disks/v1/region_disks_connection_idempotency_policy.h b/google/cloud/compute/region_disks/v1/region_disks_connection_idempotency_policy.h index cd8e146f6b735..c683ec6a17696 100644 --- a/google/cloud/compute/region_disks/v1/region_disks_connection_idempotency_policy.h +++ b/google/cloud/compute/region_disks/v1/region_disks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_REGION_DISKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_REGION_DISKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_disks/v1/region_disks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_disks/v1/region_disks_proto_export.h b/google/cloud/compute/region_disks/v1/region_disks_proto_export.h index 82e6b73feea98..ef63807d80d40 100644 --- a/google/cloud/compute/region_disks/v1/region_disks_proto_export.h +++ b/google/cloud/compute/region_disks/v1/region_disks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,16 +26,16 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_REGION_DISKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_014.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_102.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_122.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_DISKS_V1_REGION_DISKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_connection_impl.h b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_connection_impl.h index db5b0386c9471..62eda76e04b2c 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_connection_impl.h +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection.h" #include "google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection_idempotency_policy.h" #include "google/cloud/compute/region_health_check_services/v1/region_health_check_services_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_logging_decorator.h b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_logging_decorator.h index 3a7088377446b..ab266db99d23b 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_logging_decorator.h +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_INTERNAL_REGION_HEALTH_CHECK_SERVICES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h" +#include "google/cloud/compute/region_health_check_services/v1/region_health_check_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_metadata_decorator.h b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_metadata_decorator.h index 5b5b7659809c5..669298532b390 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_metadata_decorator.h +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_INTERNAL_REGION_HEALTH_CHECK_SERVICES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h" +#include "google/cloud/compute/region_health_check_services/v1/region_health_check_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc index d681012da5878..dfc1b091a0a29 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_health_check_services/v1/region_health_check_services.proto #include "google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h" +#include "google/cloud/compute/region_health_check_services/v1/region_health_check_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h index 31c032acd579e..225bb02adafcb 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_INTERNAL_REGION_HEALTH_CHECK_SERVICES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_INTERNAL_REGION_HEALTH_CHECK_SERVICES_REST_STUB_H +#include "google/cloud/compute/region_health_check_services/v1/region_health_check_services.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc index 51502f080d59d..45054b8035ae3 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_health_check_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionHealthCheckServicesTracingConnection:: RegionHealthCheckServicesTracingConnection( std::shared_ptrPatchHealthCheckService(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionHealthCheckServicesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.h b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.h index e86ba2661c051..4385443e7406c 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.h +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_health_check_services_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionHealthCheckServicesTracingConnection : public compute_region_health_check_services_v1:: RegionHealthCheckServicesConnection { @@ -102,8 +100,6 @@ class RegionHealthCheckServicesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection.h b/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection.h index 38c21a6c89064..af3889b1f8351 100644 --- a/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection.h +++ b/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_REGION_HEALTH_CHECK_SERVICES_CONNECTION_H #include "google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_retry_traits.h" +#include "google/cloud/compute/region_health_check_services/v1/region_health_check_services.pb.h" #include "google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection_idempotency_policy.h b/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection_idempotency_policy.h index 6a469b7642189..cfda50f881cbf 100644 --- a/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection_idempotency_policy.h +++ b/google/cloud/compute/region_health_check_services/v1/region_health_check_services_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_REGION_HEALTH_CHECK_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_REGION_HEALTH_CHECK_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_health_check_services/v1/region_health_check_services.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_health_check_services/v1/region_health_check_services_proto_export.h b/google/cloud/compute/region_health_check_services/v1/region_health_check_services_proto_export.h index 82f771030892a..6ecb9638ff449 100644 --- a/google/cloud/compute/region_health_check_services/v1/region_health_check_services_proto_export.h +++ b/google/cloud/compute/region_health_check_services/v1/region_health_check_services_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_REGION_HEALTH_CHECK_SERVICES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_050.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECK_SERVICES_V1_REGION_HEALTH_CHECK_SERVICES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_connection_impl.h b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_connection_impl.h index fc6a140822d9b..f0e2b6ec4d1c1 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_connection_impl.h +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_health_checks/v1/region_health_checks_connection.h" #include "google/cloud/compute/region_health_checks/v1/region_health_checks_connection_idempotency_policy.h" #include "google/cloud/compute/region_health_checks/v1/region_health_checks_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_logging_decorator.h b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_logging_decorator.h index 7a24eefb2a5ad..a7bb9261e8593 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_logging_decorator.h +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_INTERNAL_REGION_HEALTH_CHECKS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h" +#include "google/cloud/compute/region_health_checks/v1/region_health_checks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_metadata_decorator.h b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_metadata_decorator.h index 57074cc3a495d..659d15aabdd1c 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_metadata_decorator.h +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_INTERNAL_REGION_HEALTH_CHECKS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h" +#include "google/cloud/compute/region_health_checks/v1/region_health_checks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc index 9f3650216197a..2bc11ce8993f9 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_health_checks/v1/region_health_checks.proto #include "google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h" +#include "google/cloud/compute/region_health_checks/v1/region_health_checks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h index 2fbd07f3c69dd..43bc9934e03c0 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_INTERNAL_REGION_HEALTH_CHECKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_INTERNAL_REGION_HEALTH_CHECKS_REST_STUB_H +#include "google/cloud/compute/region_health_checks/v1/region_health_checks.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc index cb70f4c7f5652..de5360789d69a 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionHealthChecksTracingConnection::RegionHealthChecksTracingConnection( std::shared_ptr< compute_region_health_checks_v1::RegionHealthChecksConnection> @@ -197,19 +195,15 @@ RegionHealthChecksTracingConnection::UpdateHealthCheck( child_->UpdateHealthCheck(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionHealthChecksTracingConnection( std::shared_ptr< compute_region_health_checks_v1::RegionHealthChecksConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.h b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.h index f30add004db7c..ed58f596b6f06 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.h +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_health_checks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionHealthChecksTracingConnection : public compute_region_health_checks_v1::RegionHealthChecksConnection { public: @@ -103,8 +101,6 @@ class RegionHealthChecksTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_health_checks/v1/region_health_checks_connection.h b/google/cloud/compute/region_health_checks/v1/region_health_checks_connection.h index c4d6ae18dc95f..f97036dcd60b0 100644 --- a/google/cloud/compute/region_health_checks/v1/region_health_checks_connection.h +++ b/google/cloud/compute/region_health_checks/v1/region_health_checks_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_REGION_HEALTH_CHECKS_CONNECTION_H #include "google/cloud/compute/region_health_checks/v1/internal/region_health_checks_retry_traits.h" +#include "google/cloud/compute/region_health_checks/v1/region_health_checks.pb.h" #include "google/cloud/compute/region_health_checks/v1/region_health_checks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_health_checks/v1/region_health_checks_connection_idempotency_policy.h b/google/cloud/compute/region_health_checks/v1/region_health_checks_connection_idempotency_policy.h index 3c4e68e4df5af..2b81e53261701 100644 --- a/google/cloud/compute/region_health_checks/v1/region_health_checks_connection_idempotency_policy.h +++ b/google/cloud/compute/region_health_checks/v1/region_health_checks_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_REGION_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_REGION_HEALTH_CHECKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_health_checks/v1/region_health_checks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_health_checks/v1/region_health_checks_proto_export.h b/google/cloud/compute/region_health_checks/v1/region_health_checks_proto_export.h index 77278374573c5..31816f7f7222a 100644 --- a/google/cloud/compute/region_health_checks/v1/region_health_checks_proto_export.h +++ b/google/cloud/compute/region_health_checks/v1/region_health_checks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_REGION_HEALTH_CHECKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_043.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_HEALTH_CHECKS_V1_REGION_HEALTH_CHECKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_connection_impl.h b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_connection_impl.h index f15bff944a455..2e8e972c00850 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_connection_impl.h +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection.h" #include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection_idempotency_policy.h" #include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_logging_decorator.h b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_logging_decorator.h index 510f72198a7c1..aaf5ed8ffdb20 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_logging_decorator.h +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_REGION_INSTANCE_GROUP_MANAGERS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h" +#include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_metadata_decorator.h b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_metadata_decorator.h index 119526b877143..2b297b4850c8c 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_metadata_decorator.h +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_REGION_INSTANCE_GROUP_MANAGERS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h" +#include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc index 461e1eb05d79d..f4df56057b1fa 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.proto #include "google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h" +#include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h index 14babb7f4b35a..1eb90909520ba 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_REGION_INSTANCE_GROUP_MANAGERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_INTERNAL_REGION_INSTANCE_GROUP_MANAGERS_REST_STUB_H +#include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc index e98d43b002f59..faa34535df4ba 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_instance_group_managers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionInstanceGroupManagersTracingConnection:: RegionInstanceGroupManagersTracingConnection( std::shared_ptrUpdatePerInstanceConfigs(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionInstanceGroupManagersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.h b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.h index 6fc7c181fe055..024596a8480b8 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.h +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_instance_group_managers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionInstanceGroupManagersTracingConnection : public compute_region_instance_group_managers_v1:: RegionInstanceGroupManagersConnection { @@ -301,8 +299,6 @@ class RegionInstanceGroupManagersTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection.h b/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection.h index ab8a55e081bb7..fe533657c8b4f 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection.h +++ b/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_REGION_INSTANCE_GROUP_MANAGERS_CONNECTION_H #include "google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_retry_traits.h" +#include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.pb.h" #include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection_idempotency_policy.h b/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection_idempotency_policy.h index 1526d304648be..9e96c2de407c6 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection_idempotency_policy.h +++ b/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_REGION_INSTANCE_GROUP_MANAGERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_REGION_INSTANCE_GROUP_MANAGERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_proto_export.h b/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_proto_export.h index f22f38efc4678..6c0131758eb73 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_proto_export.h +++ b/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_REGION_INSTANCE_GROUP_MANAGERS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_028.pb.h" +#include "google/cloud/compute/v1/internal/common_040.pb.h" +#include "google/cloud/compute/v1/internal/common_083.pb.h" +#include "google/cloud/compute/v1/internal/common_104.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUP_MANAGERS_V1_REGION_INSTANCE_GROUP_MANAGERS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_connection_impl.h b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_connection_impl.h index 18bdc0e81af89..3733d12e46f43 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_connection_impl.h +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection.h" #include "google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection_idempotency_policy.h" #include "google/cloud/compute/region_instance_groups/v1/region_instance_groups_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_logging_decorator.h b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_logging_decorator.h index 6ccabc4d85b09..4f1eeb87ad946 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_logging_decorator.h +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_INTERNAL_REGION_INSTANCE_GROUPS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h" +#include "google/cloud/compute/region_instance_groups/v1/region_instance_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_metadata_decorator.h b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_metadata_decorator.h index 3988c56a24e0d..ca8f31e0721e7 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_INTERNAL_REGION_INSTANCE_GROUPS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h" +#include "google/cloud/compute/region_instance_groups/v1/region_instance_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc index c0d90241f54fd..7f390e8462984 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_instance_groups/v1/region_instance_groups.proto #include "google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h" +#include "google/cloud/compute/region_instance_groups/v1/region_instance_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h index 47874ed90ada9..3adbce621927b 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_INTERNAL_REGION_INSTANCE_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_INTERNAL_REGION_INSTANCE_GROUPS_REST_STUB_H +#include "google/cloud/compute/region_instance_groups/v1/region_instance_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc index 9dd70d5cca64b..b6772a08d0e94 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_instance_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionInstanceGroupsTracingConnection::RegionInstanceGroupsTracingConnection( std::shared_ptr< compute_region_instance_groups_v1::RegionInstanceGroupsConnection> @@ -107,20 +105,16 @@ RegionInstanceGroupsTracingConnection::SetNamedPorts( return internal::EndSpan(std::move(span), child_->SetNamedPorts(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_instance_groups_v1::RegionInstanceGroupsConnection> MakeRegionInstanceGroupsTracingConnection( std::shared_ptr< compute_region_instance_groups_v1::RegionInstanceGroupsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.h b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.h index d330ef6103090..b938be2124e93 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.h +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_instance_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionInstanceGroupsTracingConnection : public compute_region_instance_groups_v1::RegionInstanceGroupsConnection { public: @@ -73,8 +71,6 @@ class RegionInstanceGroupsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection.h b/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection.h index c2586ee09b8aa..4f674000595ec 100644 --- a/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection.h +++ b/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_REGION_INSTANCE_GROUPS_CONNECTION_H #include "google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_retry_traits.h" +#include "google/cloud/compute/region_instance_groups/v1/region_instance_groups.pb.h" #include "google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection_idempotency_policy.h b/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection_idempotency_policy.h index 519e25253cf6e..d2002fc52f5d9 100644 --- a/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/region_instance_groups/v1/region_instance_groups_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_REGION_INSTANCE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_REGION_INSTANCE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_instance_groups/v1/region_instance_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_groups/v1/region_instance_groups_proto_export.h b/google/cloud/compute/region_instance_groups/v1/region_instance_groups_proto_export.h index b1499cc4e0973..4d1785ab2e343 100644 --- a/google/cloud/compute/region_instance_groups/v1/region_instance_groups_proto_export.h +++ b/google/cloud/compute/region_instance_groups/v1/region_instance_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_REGION_INSTANCE_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_059.pb.h" +#include "google/cloud/compute/v1/internal/common_083.pb.h" +#include "google/cloud/compute/v1/internal/common_103.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_GROUPS_V1_REGION_INSTANCE_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_connection_impl.h b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_connection_impl.h index 8afd9a333e982..5cddc900d3a0a 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_connection_impl.h +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection.h" #include "google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection_idempotency_policy.h" #include "google/cloud/compute/region_instance_templates/v1/region_instance_templates_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_logging_decorator.h b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_logging_decorator.h index 347a9b031dd4b..3e50e1c683d5f 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_logging_decorator.h +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_INTERNAL_REGION_INSTANCE_TEMPLATES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h" +#include "google/cloud/compute/region_instance_templates/v1/region_instance_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_metadata_decorator.h b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_metadata_decorator.h index d2c780b1807e2..b780da0f6eb87 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_metadata_decorator.h +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_INTERNAL_REGION_INSTANCE_TEMPLATES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h" +#include "google/cloud/compute/region_instance_templates/v1/region_instance_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc index 83438f4fb4cd9..fcb64bd89683f 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_instance_templates/v1/region_instance_templates.proto #include "google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h" +#include "google/cloud/compute/region_instance_templates/v1/region_instance_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h index a43f580905f17..d8e83f0c49138 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_INTERNAL_REGION_INSTANCE_TEMPLATES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_INTERNAL_REGION_INSTANCE_TEMPLATES_REST_STUB_H +#include "google/cloud/compute/region_instance_templates/v1/region_instance_templates.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc index 891d7268f7dac..2be0f27f6de40 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_instance_templates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionInstanceTemplatesTracingConnection:: RegionInstanceTemplatesTracingConnection( std::shared_ptr MakeRegionInstanceTemplatesTracingConnection( std::shared_ptr< compute_region_instance_templates_v1::RegionInstanceTemplatesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.h b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.h index 59ac012eb1475..06b1bf44432c1 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.h +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_instance_templates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionInstanceTemplatesTracingConnection : public compute_region_instance_templates_v1:: RegionInstanceTemplatesConnection { @@ -86,8 +84,6 @@ class RegionInstanceTemplatesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection.h b/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection.h index 6be30c80ced53..b38d16ffd9021 100644 --- a/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection.h +++ b/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_REGION_INSTANCE_TEMPLATES_CONNECTION_H #include "google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_retry_traits.h" +#include "google/cloud/compute/region_instance_templates/v1/region_instance_templates.pb.h" #include "google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection_idempotency_policy.h b/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection_idempotency_policy.h index 511ed02697a01..7675b61136356 100644 --- a/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection_idempotency_policy.h +++ b/google/cloud/compute/region_instance_templates/v1/region_instance_templates_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_REGION_INSTANCE_TEMPLATES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_REGION_INSTANCE_TEMPLATES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_instance_templates/v1/region_instance_templates.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instance_templates/v1/region_instance_templates_proto_export.h b/google/cloud/compute/region_instance_templates/v1/region_instance_templates_proto_export.h index f0edd7469c75d..dcfd45d71cbce 100644 --- a/google/cloud/compute/region_instance_templates/v1/region_instance_templates_proto_export.h +++ b/google/cloud/compute/region_instance_templates/v1/region_instance_templates_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_REGION_INSTANCE_TEMPLATES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_003.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_024.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_081.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCE_TEMPLATES_V1_REGION_INSTANCE_TEMPLATES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_connection_impl.h b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_connection_impl.h index 7fdd4e30cde97..99656c48da093 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_connection_impl.h +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_connection_impl.h @@ -24,12 +24,12 @@ #include "google/cloud/compute/region_instances/v1/region_instances_connection.h" #include "google/cloud/compute/region_instances/v1/region_instances_connection_idempotency_policy.h" #include "google/cloud/compute/region_instances/v1/region_instances_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_logging_decorator.h b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_logging_decorator.h index 72f1397f28770..35047d264517b 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_logging_decorator.h +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_INTERNAL_REGION_INSTANCES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h" +#include "google/cloud/compute/region_instances/v1/region_instances.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_metadata_decorator.h b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_metadata_decorator.h index aabd7730761dc..2a169ef765a96 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_metadata_decorator.h +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_INTERNAL_REGION_INSTANCES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h" +#include "google/cloud/compute/region_instances/v1/region_instances.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.cc b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.cc index 1b1348fff5a94..1e1ed2a7fb1ee 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.cc +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/region_instances/v1/region_instances.proto #include "google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h" +#include "google/cloud/compute/region_instances/v1/region_instances.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h index 6ef14264de647..99bd1076ce7e1 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_INTERNAL_REGION_INSTANCES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_INTERNAL_REGION_INSTANCES_REST_STUB_H +#include "google/cloud/compute/region_instances/v1/region_instances.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc b/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc index 0efa1b72a8631..32813d7b98b17 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace compute_region_instances_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionInstancesTracingConnection::RegionInstancesTracingConnection( std::shared_ptr child) @@ -63,17 +61,13 @@ RegionInstancesTracingConnection::BulkInsert( return internal::EndSpan(std::move(span), child_->BulkInsert(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionInstancesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.h b/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.h index 76fb4a3c1a356..c7106ccf5ad23 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.h +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_instances_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionInstancesTracingConnection : public compute_region_instances_v1::RegionInstancesConnection { public: @@ -57,8 +55,6 @@ class RegionInstancesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_instances/v1/region_instances_connection.h b/google/cloud/compute/region_instances/v1/region_instances_connection.h index c1571fc93186e..52d8215f7601c 100644 --- a/google/cloud/compute/region_instances/v1/region_instances_connection.h +++ b/google/cloud/compute/region_instances/v1/region_instances_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_REGION_INSTANCES_CONNECTION_H #include "google/cloud/compute/region_instances/v1/internal/region_instances_retry_traits.h" +#include "google/cloud/compute/region_instances/v1/region_instances.pb.h" #include "google/cloud/compute/region_instances/v1/region_instances_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -29,7 +30,6 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instances/v1/region_instances_connection_idempotency_policy.h b/google/cloud/compute/region_instances/v1/region_instances_connection_idempotency_policy.h index fd7e2555f0d55..1ac8c327f5aa3 100644 --- a/google/cloud/compute/region_instances/v1/region_instances_connection_idempotency_policy.h +++ b/google/cloud/compute/region_instances/v1/region_instances_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_REGION_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_REGION_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_instances/v1/region_instances.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instances/v1/region_instances_proto_export.h b/google/cloud/compute/region_instances/v1/region_instances_proto_export.h index 7ef9fc52b6d02..d80a7bdcbaec8 100644 --- a/google/cloud/compute/region_instances/v1/region_instances_proto_export.h +++ b/google/cloud/compute/region_instances/v1/region_instances_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_REGION_INSTANCES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_003.pb.h" +#include "google/cloud/compute/v1/internal/common_015.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_033.pb.h" +#include "google/cloud/compute/v1/internal/common_081.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANCES_V1_REGION_INSTANCES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_connection_impl.h b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_connection_impl.h index 4e40f4c02183e..75eae69cb131b 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_connection_impl.h +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection.h" #include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection_idempotency_policy.h" #include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_logging_decorator.h b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_logging_decorator.h index 6cb5f53f8b338..4549881263db8 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_logging_decorator.h +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_INTERNAL_REGION_INSTANT_SNAPSHOTS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h" +#include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_metadata_decorator.h b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_metadata_decorator.h index 5eb3dd1942a86..cbba5fd972294 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_metadata_decorator.h +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_INTERNAL_REGION_INSTANT_SNAPSHOTS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h" +#include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.cc b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.cc index db95810560da9..b88ad79b37b03 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.cc +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.proto #include "google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h" +#include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h index 56b65c0da5f5c..02eb11ae742fb 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_INTERNAL_REGION_INSTANT_SNAPSHOTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_INTERNAL_REGION_INSTANT_SNAPSHOTS_REST_STUB_H +#include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.cc b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.cc index 22ef4a8f86a1e..fe968db893167 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.cc +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_instant_snapshots_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionInstantSnapshotsTracingConnection:: RegionInstantSnapshotsTracingConnection( std::shared_ptrTestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_instant_snapshots_v1::RegionInstantSnapshotsConnection> MakeRegionInstantSnapshotsTracingConnection( std::shared_ptr< compute_region_instant_snapshots_v1::RegionInstantSnapshotsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.h b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.h index 331394e917294..b57b60df77c88 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.h +++ b/google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_instant_snapshots_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionInstantSnapshotsTracingConnection : public compute_region_instant_snapshots_v1:: RegionInstantSnapshotsConnection { @@ -108,8 +106,6 @@ class RegionInstantSnapshotsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection.h b/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection.h index fcbf100d61250..62cb69203513f 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection.h +++ b/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_REGION_INSTANT_SNAPSHOTS_CONNECTION_H #include "google/cloud/compute/region_instant_snapshots/v1/internal/region_instant_snapshots_retry_traits.h" +#include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.pb.h" #include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection_idempotency_policy.h b/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection_idempotency_policy.h index f9b1f3359ba5d..4e26507123edf 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection_idempotency_policy.h +++ b/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_REGION_INSTANT_SNAPSHOTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_REGION_INSTANT_SNAPSHOTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_proto_export.h b/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_proto_export.h index 9fffbbb1d664a..1bbe01062fe9c 100644 --- a/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_proto_export.h +++ b/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_REGION_INSTANT_SNAPSHOTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_066.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_INSTANT_SNAPSHOTS_V1_REGION_INSTANT_SNAPSHOTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_connection_impl.h b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_connection_impl.h index 9616b4986d6fd..c857890c484bc 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_connection_impl.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection.h" #include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection_idempotency_policy.h" #include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_logging_decorator.h b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_logging_decorator.h index 1629b48b61701..a5b91e13ab7a3 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_logging_decorator.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_REGION_NETWORK_ENDPOINT_GROUPS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_metadata_decorator.h b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_metadata_decorator.h index 60dd9b0398816..3f1eb58cf087b 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_metadata_decorator.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_REGION_NETWORK_ENDPOINT_GROUPS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc index 8a25dae5f4cab..1b7cdd83c524d 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.proto #include "google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h" +#include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h index 837b9fbef1366..a085cb8df0d1b 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_REGION_NETWORK_ENDPOINT_GROUPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_INTERNAL_REGION_NETWORK_ENDPOINT_GROUPS_REST_STUB_H +#include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc index 3d5b9fb0a7db2..a5b360e840b79 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_network_endpoint_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionNetworkEndpointGroupsTracingConnection:: RegionNetworkEndpointGroupsTracingConnection( std::shared_ptr MakeRegionNetworkEndpointGroupsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.h b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.h index 90d32a22d22d8..e7cb4c8ba8ccb 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_network_endpoint_groups_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionNetworkEndpointGroupsTracingConnection : public compute_region_network_endpoint_groups_v1:: RegionNetworkEndpointGroupsConnection { @@ -123,8 +121,6 @@ class RegionNetworkEndpointGroupsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection.h b/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection.h index 65b1af822ef2c..e17d51fa1b18b 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_REGION_NETWORK_ENDPOINT_GROUPS_CONNECTION_H #include "google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_retry_traits.h" +#include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.pb.h" #include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection_idempotency_policy.h b/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection_idempotency_policy.h index edc2c52269283..95a817d926c44 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection_idempotency_policy.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_REGION_NETWORK_ENDPOINT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_REGION_NETWORK_ENDPOINT_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_proto_export.h b/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_proto_export.h index 8c1e493ad1f9c..6e5138a5e1c7f 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_proto_export.h +++ b/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_REGION_NETWORK_ENDPOINT_GROUPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_012.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_049.pb.h" +#include "google/cloud/compute/v1/internal/common_105.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_ENDPOINT_GROUPS_V1_REGION_NETWORK_ENDPOINT_GROUPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_connection_impl.h b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_connection_impl.h index 52e98a20d13eb..de615b7d79a0a 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_connection_impl.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection.h" #include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection_idempotency_policy.h" #include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_logging_decorator.h b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_logging_decorator.h index 5cc0408569f4d..c54d0bbac6b44 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_logging_decorator.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_REGION_NETWORK_FIREWALL_POLICIES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h" +#include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_metadata_decorator.h b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_metadata_decorator.h index b0b7d59b7b2ae..74d186d0bd399 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_REGION_NETWORK_FIREWALL_POLICIES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h" +#include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc index def7c0c3c64bf..7dfbd0e3c3add 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.proto #include "google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h" +#include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h index 2fe963e5da0ab..6846c3a013a23 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_REGION_NETWORK_FIREWALL_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_INTERNAL_REGION_NETWORK_FIREWALL_POLICIES_REST_STUB_H +#include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc index 07833d6e9c957..747ca7fe4641e 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_network_firewall_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionNetworkFirewallPoliciesTracingConnection:: RegionNetworkFirewallPoliciesTracingConnection( std::shared_ptrTestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionNetworkFirewallPoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.h b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.h index a6d88540b935b..a4aac5082683c 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_network_firewall_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionNetworkFirewallPoliciesTracingConnection : public compute_region_network_firewall_policies_v1:: RegionNetworkFirewallPoliciesConnection { @@ -202,8 +200,6 @@ class RegionNetworkFirewallPoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection.h b/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection.h index 4ed7837008e41..0106ca9ebc1da 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_REGION_NETWORK_FIREWALL_POLICIES_CONNECTION_H #include "google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_retry_traits.h" +#include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.pb.h" #include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection_idempotency_policy.h b/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection_idempotency_policy.h index ac1b9d0c34140..4137bfaabfce7 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_REGION_NETWORK_FIREWALL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_REGION_NETWORK_FIREWALL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_proto_export.h b/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_proto_export.h index 080803d93fa6a..e46e7cb4a6351 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_proto_export.h +++ b/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,15 +26,15 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_REGION_NETWORK_FIREWALL_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_034.pb.h" +#include "google/cloud/compute/v1/internal/common_038.pb.h" +#include "google/cloud/compute/v1/internal/common_039.pb.h" +#include "google/cloud/compute/v1/internal/common_106.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NETWORK_FIREWALL_POLICIES_V1_REGION_NETWORK_FIREWALL_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_connection_impl.h b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_connection_impl.h index 7644011e8c620..889aca9930472 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_connection_impl.h +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_connection_impl.h @@ -25,13 +25,13 @@ #include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection.h" #include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection_idempotency_policy.h" #include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_options.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_logging_decorator.h b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_logging_decorator.h index 7e902b7049fb7..5f2f1501ee2e5 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_logging_decorator.h +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_logging_decorator.h @@ -21,12 +21,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_INTERNAL_REGION_NOTIFICATION_ENDPOINTS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h" +#include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_metadata_decorator.h b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_metadata_decorator.h index 924e3a7dc623b..d149fd3e3fa23 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_metadata_decorator.h +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_metadata_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_INTERNAL_REGION_NOTIFICATION_ENDPOINTS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h" +#include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc index bc6635cdd1cc7..621e084aeb301 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.proto #include "google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h" +#include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h index 574e758373f81..ceb581c607627 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_INTERNAL_REGION_NOTIFICATION_ENDPOINTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_INTERNAL_REGION_NOTIFICATION_ENDPOINTS_REST_STUB_H +#include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.pb.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc index dce894c7b37d6..72e64f5209ed5 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_notification_endpoints_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionNotificationEndpointsTracingConnection:: RegionNotificationEndpointsTracingConnection( std::shared_ptr MakeRegionNotificationEndpointsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.h b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.h index b75adcb18aa4b..e11257bce71fd 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.h +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_notification_endpoints_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionNotificationEndpointsTracingConnection : public compute_region_notification_endpoints_v1:: RegionNotificationEndpointsConnection { @@ -90,8 +88,6 @@ class RegionNotificationEndpointsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection.h b/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection.h index 2d4baa9080b36..1f3f39fb505c2 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection.h +++ b/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_REGION_NOTIFICATION_ENDPOINTS_CONNECTION_H #include "google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_retry_traits.h" +#include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.pb.h" #include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection_idempotency_policy.h b/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection_idempotency_policy.h index ba4915ecb49db..363d843a52fb6 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection_idempotency_policy.h +++ b/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_REGION_NOTIFICATION_ENDPOINTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_REGION_NOTIFICATION_ENDPOINTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_proto_export.h b/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_proto_export.h index 3df9371e6522c..f2db8aff21857 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_proto_export.h +++ b/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_REGION_NOTIFICATION_ENDPOINTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_090.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_NOTIFICATION_ENDPOINTS_V1_REGION_NOTIFICATION_ENDPOINTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_logging_decorator.h b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_logging_decorator.h index dadd5cfdc6a69..d2a94a8cb0867 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_logging_decorator.h +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_INTERNAL_REGION_OPERATIONS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_metadata_decorator.h b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_metadata_decorator.h index 19a5ba64f9c6e..8758a2d5b26d0 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_metadata_decorator.h +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_INTERNAL_REGION_OPERATIONS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc index f8a7b1b90bf79..7e50d256c8c45 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/region_operations/v1/region_operations.proto #include "google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h index fefd0b193a9f2..7d61dd7eb9d47 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_INTERNAL_REGION_OPERATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_INTERNAL_REGION_OPERATIONS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc b/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc index 10667a410b1c5..800d1d67330a2 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionOperationsTracingConnection::RegionOperationsTracingConnection( std::shared_ptr child) @@ -78,17 +76,13 @@ RegionOperationsTracingConnection::Wait( return internal::EndSpan(*span, child_->Wait(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionOperationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.h b/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.h index c6d906f7d6164..76032a4425601 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.h +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionOperationsTracingConnection : public compute_region_operations_v1::RegionOperationsConnection { public: @@ -61,8 +59,6 @@ class RegionOperationsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_operations/v1/region_operations_connection.h b/google/cloud/compute/region_operations/v1/region_operations_connection.h index e4cdf15fb0d28..50e3d5d6345da 100644 --- a/google/cloud/compute/region_operations/v1/region_operations_connection.h +++ b/google/cloud/compute/region_operations/v1/region_operations_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_REGION_OPERATIONS_CONNECTION_H #include "google/cloud/compute/region_operations/v1/internal/region_operations_retry_traits.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_operations/v1/region_operations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_operations/v1/region_operations_connection_idempotency_policy.h b/google/cloud/compute/region_operations/v1/region_operations_connection_idempotency_policy.h index add5932223a06..4892e13f90f84 100644 --- a/google/cloud/compute/region_operations/v1/region_operations_connection_idempotency_policy.h +++ b/google/cloud/compute/region_operations/v1/region_operations_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_REGION_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_REGION_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_operations/v1/region_operations_proto_export.h b/google/cloud/compute/region_operations/v1/region_operations_proto_export.h index a69ad75e4a0d2..16e0afa4ae4e8 100644 --- a/google/cloud/compute/region_operations/v1/region_operations_proto_export.h +++ b/google/cloud/compute/region_operations/v1/region_operations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_REGION_OPERATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_092.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_OPERATIONS_V1_REGION_OPERATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_connection_impl.h b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_connection_impl.h index b2ebd2f39e5a7..61c410d2366c4 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_connection_impl.h +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h" #include "google/cloud/compute/region_security_policies/v1/internal/region_security_policies_retry_traits.h" #include "google/cloud/compute/region_security_policies/v1/region_security_policies_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_logging_decorator.h b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_logging_decorator.h index 2872615f3c161..60db561a97938 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_logging_decorator.h +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h" +#include "google/cloud/compute/region_security_policies/v1/region_security_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_metadata_decorator.h b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_metadata_decorator.h index a14ae6357de2c..0a61951a6917b 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h" +#include "google/cloud/compute/region_security_policies/v1/region_security_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc index adf76b8fd70d4..74494b65c70ad 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_security_policies/v1/region_security_policies.proto #include "google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_security_policies/v1/region_security_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h index 8f2b65ae1165e..b5a097bfdcf04 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_INTERNAL_REGION_SECURITY_POLICIES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_security_policies/v1/region_security_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc index 05574e88e5415..f9ed523bd7552 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_security_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionSecurityPoliciesTracingConnection:: RegionSecurityPoliciesTracingConnection( std::shared_ptrSetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_security_policies_v1::RegionSecurityPoliciesConnection> MakeRegionSecurityPoliciesTracingConnection( std::shared_ptr< compute_region_security_policies_v1::RegionSecurityPoliciesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.h b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.h index 2de11377df9c5..d417429bfebd0 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.h +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_security_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionSecurityPoliciesTracingConnection : public compute_region_security_policies_v1:: RegionSecurityPoliciesConnection { @@ -146,8 +144,6 @@ class RegionSecurityPoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_security_policies/v1/region_security_policies_connection.h b/google/cloud/compute/region_security_policies/v1/region_security_policies_connection.h index f39d281e9e424..df42296c04197 100644 --- a/google/cloud/compute/region_security_policies/v1/region_security_policies_connection.h +++ b/google/cloud/compute/region_security_policies/v1/region_security_policies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_REGION_SECURITY_POLICIES_CONNECTION_H #include "google/cloud/compute/region_security_policies/v1/internal/region_security_policies_retry_traits.h" +#include "google/cloud/compute/region_security_policies/v1/region_security_policies.pb.h" #include "google/cloud/compute/region_security_policies/v1/region_security_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_security_policies/v1/region_security_policies_connection_idempotency_policy.h b/google/cloud/compute/region_security_policies/v1/region_security_policies_connection_idempotency_policy.h index dc89ae9b910b5..b74ad9dbe4b94 100644 --- a/google/cloud/compute/region_security_policies/v1/region_security_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/region_security_policies/v1/region_security_policies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_REGION_SECURITY_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_REGION_SECURITY_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_security_policies/v1/region_security_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_security_policies/v1/region_security_policies_proto_export.h b/google/cloud/compute/region_security_policies/v1/region_security_policies_proto_export.h index 32dce40c47df9..dc572e34b9865 100644 --- a/google/cloud/compute/region_security_policies/v1/region_security_policies_proto_export.h +++ b/google/cloud/compute/region_security_policies/v1/region_security_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_REGION_SECURITY_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_117.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SECURITY_POLICIES_V1_REGION_SECURITY_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_connection_impl.h b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_connection_impl.h index 889be4fbf896f..27b2ddfc9e149 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_connection_impl.h +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h" #include "google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_retry_traits.h" #include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_logging_decorator.h b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_logging_decorator.h index d2b7ab2d21ac5..e23d99b69db84 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_logging_decorator.h +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h" +#include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_metadata_decorator.h b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_metadata_decorator.h index c99e103112dcd..f402de9c3309c 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_metadata_decorator.h +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h" +#include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc index e206a396b718f..d22a67f60ae35 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.proto #include "google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h index 740ae7115f490..38fe32cbecbbd 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_INTERNAL_REGION_SSL_CERTIFICATES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc index f9bf20c533d30..53849fada216c 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_ssl_certificates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionSslCertificatesTracingConnection::RegionSslCertificatesTracingConnection( std::shared_ptr< compute_region_ssl_certificates_v1::RegionSslCertificatesConnection> @@ -131,20 +129,16 @@ RegionSslCertificatesTracingConnection::ListRegionSslCertificates( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_ssl_certificates_v1::RegionSslCertificatesConnection> MakeRegionSslCertificatesTracingConnection( std::shared_ptr< compute_region_ssl_certificates_v1::RegionSslCertificatesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.h b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.h index dd281b6fefcd7..c71615b356e9b 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.h +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_ssl_certificates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionSslCertificatesTracingConnection : public compute_region_ssl_certificates_v1:: RegionSslCertificatesConnection { @@ -85,8 +83,6 @@ class RegionSslCertificatesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection.h b/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection.h index 0eca5b1a03b88..4d2aadedf8d21 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection.h +++ b/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_REGION_SSL_CERTIFICATES_CONNECTION_H #include "google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_retry_traits.h" +#include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.pb.h" #include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection_idempotency_policy.h b/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection_idempotency_policy.h index 95de6079594be..e19d4988a4e45 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection_idempotency_policy.h +++ b/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_REGION_SSL_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_REGION_SSL_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_proto_export.h b/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_proto_export.h index c69c5f831c727..53f07c86c3bab 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_proto_export.h +++ b/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_REGION_SSL_CERTIFICATES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_125.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_CERTIFICATES_V1_REGION_SSL_CERTIFICATES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_connection_impl.h b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_connection_impl.h index dd4dfb8a4749c..7aba2b9a7d079 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_connection_impl.h +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h" #include "google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_retry_traits.h" #include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_logging_decorator.h b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_logging_decorator.h index 32cafd8bf7a23..0ca98dc103178 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_logging_decorator.h +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h" +#include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_metadata_decorator.h b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_metadata_decorator.h index 4193441636897..4f7fa6d7d8ade 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h" +#include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc index 5232e384a6b5a..e736ab642b5f8 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.proto #include "google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h index 127383c34e39c..6b97f77a54e68 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_INTERNAL_REGION_SSL_POLICIES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc index 7c47d434c1a0d..9684473e78494 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_ssl_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionSslPoliciesTracingConnection::RegionSslPoliciesTracingConnection( std::shared_ptr child) @@ -170,18 +168,14 @@ RegionSslPoliciesTracingConnection::PatchSslPolicy( return internal::EndSpan(std::move(span), child_->PatchSslPolicy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionSslPoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.h b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.h index b2a4d540befed..0e845fbaf3fb9 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.h +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_ssl_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionSslPoliciesTracingConnection : public compute_region_ssl_policies_v1::RegionSslPoliciesConnection { public: @@ -94,8 +92,6 @@ class RegionSslPoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection.h b/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection.h index 15aa268f40c18..a016f0f17e7eb 100644 --- a/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection.h +++ b/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_REGION_SSL_POLICIES_CONNECTION_H #include "google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_retry_traits.h" +#include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.pb.h" #include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection_idempotency_policy.h b/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection_idempotency_policy.h index bdb01636d1845..76cc1400f5f1f 100644 --- a/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_REGION_SSL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_REGION_SSL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_proto_export.h b/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_proto_export.h index d839a4f024f42..d14a283cdc0f8 100644 --- a/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_proto_export.h +++ b/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_REGION_SSL_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_128.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_SSL_POLICIES_V1_REGION_SSL_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_connection_impl.h b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_connection_impl.h index 9e5c672d88a45..db13c2cf0adc8 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_connection_impl.h +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h" #include "google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_retry_traits.h" #include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_logging_decorator.h b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_logging_decorator.h index e0de07cda6486..52754dac4b277 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h" +#include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_metadata_decorator.h b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_metadata_decorator.h index bfbeb0615b1ac..b4ef5df49c81f 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h" +#include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc index c0925bcb97c35..f23012ba1df3a 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.proto #include "google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h index 4da5a139dc961..8c6e2981a5faf 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_INTERNAL_REGION_TARGET_HTTP_PROXIES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc index a61563788ad34..0072cfda416d1 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_target_http_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionTargetHttpProxiesTracingConnection:: RegionTargetHttpProxiesTracingConnection( std::shared_ptrSetUrlMap(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_target_http_proxies_v1::RegionTargetHttpProxiesConnection> MakeRegionTargetHttpProxiesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.h b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.h index 1c72fa6bd9aa2..ecb629dca46c3 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.h +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_target_http_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionTargetHttpProxiesTracingConnection : public compute_region_target_http_proxies_v1:: RegionTargetHttpProxiesConnection { @@ -96,8 +94,6 @@ class RegionTargetHttpProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection.h b/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection.h index 1b65284352522..df33511f671be 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection.h +++ b/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_REGION_TARGET_HTTP_PROXIES_CONNECTION_H #include "google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_retry_traits.h" +#include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.pb.h" #include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection_idempotency_policy.h b/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection_idempotency_policy.h index 7e1ff31d5abe4..d6aaf0ad065f2 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_REGION_TARGET_HTTP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_REGION_TARGET_HTTP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_proto_export.h b/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_proto_export.h index 754ff87456051..7a536280922ea 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_proto_export.h +++ b/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_REGION_TARGET_HTTP_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_135.pb.h" +#include "google/cloud/compute/v1/internal/common_147.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTP_PROXIES_V1_REGION_TARGET_HTTP_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_connection_impl.h b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_connection_impl.h index 47763b1858083..356567c35e6e9 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_connection_impl.h +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h" #include "google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_retry_traits.h" #include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_logging_decorator.h b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_logging_decorator.h index 236d510557e47..6730930c89d05 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h" +#include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_metadata_decorator.h b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_metadata_decorator.h index 52f94cec09cd1..3874bd162f1b9 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h" +#include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc index 63865a21f9c33..9ce85be315ecd 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.proto #include "google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h index 24fe0d2d11446..7cd465f4fbfe4 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_INTERNAL_REGION_TARGET_HTTPS_PROXIES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc index 2d3a8debc542c..82d85ef0408bb 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_target_https_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionTargetHttpsProxiesTracingConnection:: RegionTargetHttpsProxiesTracingConnection( std::shared_ptrSetUrlMap(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_region_target_https_proxies_v1::RegionTargetHttpsProxiesConnection> MakeRegionTargetHttpsProxiesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.h b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.h index d7ed4f56a0265..5f18d3b132efb 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.h +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_target_https_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionTargetHttpsProxiesTracingConnection : public compute_region_target_https_proxies_v1:: RegionTargetHttpsProxiesConnection { @@ -122,8 +120,6 @@ class RegionTargetHttpsProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection.h b/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection.h index 56e0bfcd55c8d..30864e4abc260 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection.h +++ b/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_REGION_TARGET_HTTPS_PROXIES_CONNECTION_H #include "google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_retry_traits.h" +#include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.pb.h" #include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection_idempotency_policy.h b/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection_idempotency_policy.h index 216ed83e7baa9..cb4b94b98581c 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_REGION_TARGET_HTTPS_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_REGION_TARGET_HTTPS_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_proto_export.h b/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_proto_export.h index b4c347234702c..ae98cca47bc24 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_proto_export.h +++ b/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_REGION_TARGET_HTTPS_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_109.pb.h" +#include "google/cloud/compute/v1/internal/common_137.pb.h" +#include "google/cloud/compute/v1/internal/common_147.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_HTTPS_PROXIES_V1_REGION_TARGET_HTTPS_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_connection_impl.h b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_connection_impl.h index ad9b643fec77d..27f8eeeab7a06 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_connection_impl.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h" #include "google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_retry_traits.h" #include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_logging_decorator.h b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_logging_decorator.h index 8b7837df07e3e..d517b3b76d207 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h" +#include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_metadata_decorator.h b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_metadata_decorator.h index 37ef6c3bd457e..84e897ce39bc1 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h" +#include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc index e6dc95929b12e..571395a5ec9b5 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.proto #include "google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h index 52599646d0c76..bb9f7887e23b2 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_INTERNAL_REGION_TARGET_TCP_PROXIES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc index f5d55bd564c76..5041660227d35 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_target_tcp_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionTargetTcpProxiesTracingConnection:: RegionTargetTcpProxiesTracingConnection( std::shared_ptr MakeRegionTargetTcpProxiesTracingConnection( std::shared_ptr< compute_region_target_tcp_proxies_v1::RegionTargetTcpProxiesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.h b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.h index ad6d2171c35f9..e29fb1bc98bf7 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_region_target_tcp_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionTargetTcpProxiesTracingConnection : public compute_region_target_tcp_proxies_v1:: RegionTargetTcpProxiesConnection { @@ -85,8 +83,6 @@ class RegionTargetTcpProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection.h b/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection.h index 1e643be7ca735..9a189e8570c5f 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_REGION_TARGET_TCP_PROXIES_CONNECTION_H #include "google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_retry_traits.h" +#include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.pb.h" #include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection_idempotency_policy.h b/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection_idempotency_policy.h index 23cda2e9ba754..704d0664e0702 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_REGION_TARGET_TCP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_REGION_TARGET_TCP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_proto_export.h b/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_proto_export.h index e7ab0d5cbacdc..cb711e208aa3c 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_proto_export.h +++ b/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_REGION_TARGET_TCP_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_143.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_TARGET_TCP_PROXIES_V1_REGION_TARGET_TCP_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_connection_impl.h b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_connection_impl.h index 9f0789e442d12..edff4e69e81f0 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_connection_impl.h +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h" #include "google/cloud/compute/region_url_maps/v1/internal/region_url_maps_retry_traits.h" #include "google/cloud/compute/region_url_maps/v1/region_url_maps_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_logging_decorator.h b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_logging_decorator.h index 0560b92eef0ef..82b3103928393 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_logging_decorator.h +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h" +#include "google/cloud/compute/region_url_maps/v1/region_url_maps.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_metadata_decorator.h b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_metadata_decorator.h index 73b9dc263c0ca..1191b054ffb6d 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_metadata_decorator.h +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h" +#include "google/cloud/compute/region_url_maps/v1/region_url_maps.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc index ca48cc6305336..124128df97c02 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/region_url_maps/v1/region_url_maps.proto #include "google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_url_maps/v1/region_url_maps.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h index 0cf691e2d3aa6..44e90fa7d0a41 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_INTERNAL_REGION_URL_MAPS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/region_url_maps/v1/region_url_maps.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc index 0766ca6488ede..a5ba4d18ea4c8 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_url_maps_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionUrlMapsTracingConnection::RegionUrlMapsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -185,16 +183,12 @@ RegionUrlMapsTracingConnection::Validate( return internal::EndSpan(*span, child_->Validate(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionUrlMapsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.h b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.h index 3b6b4a818558d..9ed4e1937d235 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.h +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_url_maps_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionUrlMapsTracingConnection : public compute_region_url_maps_v1::RegionUrlMapsConnection { public: @@ -101,8 +99,6 @@ class RegionUrlMapsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_url_maps/v1/region_url_maps_connection.h b/google/cloud/compute/region_url_maps/v1/region_url_maps_connection.h index 17fdde1c66f88..f0fd222601661 100644 --- a/google/cloud/compute/region_url_maps/v1/region_url_maps_connection.h +++ b/google/cloud/compute/region_url_maps/v1/region_url_maps_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_REGION_URL_MAPS_CONNECTION_H #include "google/cloud/compute/region_url_maps/v1/internal/region_url_maps_retry_traits.h" +#include "google/cloud/compute/region_url_maps/v1/region_url_maps.pb.h" #include "google/cloud/compute/region_url_maps/v1/region_url_maps_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_url_maps/v1/region_url_maps_connection_idempotency_policy.h b/google/cloud/compute/region_url_maps/v1/region_url_maps_connection_idempotency_policy.h index 190c97b25b9e1..0e3a8c02f8bc7 100644 --- a/google/cloud/compute/region_url_maps/v1/region_url_maps_connection_idempotency_policy.h +++ b/google/cloud/compute/region_url_maps/v1/region_url_maps_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_REGION_URL_MAPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_REGION_URL_MAPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_url_maps/v1/region_url_maps.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_url_maps/v1/region_url_maps_proto_export.h b/google/cloud/compute/region_url_maps/v1/region_url_maps_proto_export.h index 692fd4ee85601..f37775f1a5030 100644 --- a/google/cloud/compute/region_url_maps/v1/region_url_maps_proto_export.h +++ b/google/cloud/compute/region_url_maps/v1/region_url_maps_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_REGION_URL_MAPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_020.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_082.pb.h" +#include "google/cloud/compute/v1/internal/common_110.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_URL_MAPS_V1_REGION_URL_MAPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_logging_decorator.h b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_logging_decorator.h index f2d0529d4c1af..647504969e2b7 100644 --- a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_logging_decorator.h +++ b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_INTERNAL_REGION_ZONES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h" +#include "google/cloud/compute/region_zones/v1/region_zones.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_metadata_decorator.h b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_metadata_decorator.h index 9173cd1a8b801..5d1774ab430ef 100644 --- a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_metadata_decorator.h +++ b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_INTERNAL_REGION_ZONES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h" +#include "google/cloud/compute/region_zones/v1/region_zones.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc index d75d70d7f2a9c..0ce41b7ca9c7d 100644 --- a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc +++ b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/region_zones/v1/region_zones.proto #include "google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h" +#include "google/cloud/compute/region_zones/v1/region_zones.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h index 1b6c75379fca2..3af45d3f2b610 100644 --- a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h +++ b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_INTERNAL_REGION_ZONES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_INTERNAL_REGION_ZONES_REST_STUB_H +#include "google/cloud/compute/region_zones/v1/region_zones.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.cc b/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.cc index e49791b34788d..0ca1edfb279f2 100644 --- a/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.cc +++ b/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_region_zones_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionZonesTracingConnection::RegionZonesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -45,16 +43,12 @@ RegionZonesTracingConnection::ListRegionZones( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionZonesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.h b/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.h index 38f57b54bcd08..331b830abfd9b 100644 --- a/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.h +++ b/google/cloud/compute/region_zones/v1/internal/region_zones_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_region_zones_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionZonesTracingConnection : public compute_region_zones_v1::RegionZonesConnection { public: @@ -48,8 +46,6 @@ class RegionZonesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/region_zones/v1/region_zones_connection.h b/google/cloud/compute/region_zones/v1/region_zones_connection.h index 16589cbc982e3..916ce9883b55a 100644 --- a/google/cloud/compute/region_zones/v1/region_zones_connection.h +++ b/google/cloud/compute/region_zones/v1/region_zones_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_REGION_ZONES_CONNECTION_H #include "google/cloud/compute/region_zones/v1/internal/region_zones_retry_traits.h" +#include "google/cloud/compute/region_zones/v1/region_zones.pb.h" #include "google/cloud/compute/region_zones/v1/region_zones_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_zones/v1/region_zones_connection_idempotency_policy.h b/google/cloud/compute/region_zones/v1/region_zones_connection_idempotency_policy.h index 35c1e8f5dc634..ebc78bb595c9f 100644 --- a/google/cloud/compute/region_zones/v1/region_zones_connection_idempotency_policy.h +++ b/google/cloud/compute/region_zones/v1/region_zones_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_REGION_ZONES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_REGION_ZONES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/region_zones/v1/region_zones.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/region_zones/v1/region_zones_proto_export.h b/google/cloud/compute/region_zones/v1/region_zones_proto_export.h index 313674342836f..de43f725c90f7 100644 --- a/google/cloud/compute/region_zones/v1/region_zones_proto_export.h +++ b/google/cloud/compute/region_zones/v1/region_zones_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_REGION_ZONES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_150.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGION_ZONES_V1_REGION_ZONES_PROTO_EXPORT_H diff --git a/google/cloud/compute/regions/v1/internal/regions_rest_logging_decorator.h b/google/cloud/compute/regions/v1/internal/regions_rest_logging_decorator.h index 24e36a6091cc8..3f7122b2f8794 100644 --- a/google/cloud/compute/regions/v1/internal/regions_rest_logging_decorator.h +++ b/google/cloud/compute/regions/v1/internal/regions_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_INTERNAL_REGIONS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/regions/v1/internal/regions_rest_stub.h" +#include "google/cloud/compute/regions/v1/regions.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/regions/v1/internal/regions_rest_metadata_decorator.h b/google/cloud/compute/regions/v1/internal/regions_rest_metadata_decorator.h index e1e26b32200b8..f614911eeca5f 100644 --- a/google/cloud/compute/regions/v1/internal/regions_rest_metadata_decorator.h +++ b/google/cloud/compute/regions/v1/internal/regions_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_INTERNAL_REGIONS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/regions/v1/internal/regions_rest_stub.h" +#include "google/cloud/compute/regions/v1/regions.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc b/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc index 9d907fef4b2fe..d0884616f2ff1 100644 --- a/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc +++ b/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/regions/v1/regions.proto #include "google/cloud/compute/regions/v1/internal/regions_rest_stub.h" +#include "google/cloud/compute/regions/v1/regions.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/regions/v1/internal/regions_rest_stub.h b/google/cloud/compute/regions/v1/internal/regions_rest_stub.h index 58b19443ecbe9..0c326d4dfd032 100644 --- a/google/cloud/compute/regions/v1/internal/regions_rest_stub.h +++ b/google/cloud/compute/regions/v1/internal/regions_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_INTERNAL_REGIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_INTERNAL_REGIONS_REST_STUB_H +#include "google/cloud/compute/regions/v1/regions.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc b/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc index a83c58e3e9ddc..9c7a97e0c382d 100644 --- a/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc +++ b/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_regions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegionsTracingConnection::RegionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -53,16 +51,12 @@ RegionsTracingConnection::ListRegions( google::cloud::cpp::compute::v1::Region>(std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/regions/v1/internal/regions_tracing_connection.h b/google/cloud/compute/regions/v1/internal/regions_tracing_connection.h index 83ac35c355a9e..b57d28d45ab96 100644 --- a/google/cloud/compute/regions/v1/internal/regions_tracing_connection.h +++ b/google/cloud/compute/regions/v1/internal/regions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_regions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegionsTracingConnection : public compute_regions_v1::RegionsConnection { public: ~RegionsTracingConnection() override = default; @@ -51,8 +49,6 @@ class RegionsTracingConnection : public compute_regions_v1::RegionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/regions/v1/regions_connection.h b/google/cloud/compute/regions/v1/regions_connection.h index 9ac789bce5581..fe8a251a90d55 100644 --- a/google/cloud/compute/regions/v1/regions_connection.h +++ b/google/cloud/compute/regions/v1/regions_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_REGIONS_CONNECTION_H #include "google/cloud/compute/regions/v1/internal/regions_retry_traits.h" +#include "google/cloud/compute/regions/v1/regions.pb.h" #include "google/cloud/compute/regions/v1/regions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/regions/v1/regions_connection_idempotency_policy.h b/google/cloud/compute/regions/v1/regions_connection_idempotency_policy.h index 935e679fa5de6..5c45d2533acae 100644 --- a/google/cloud/compute/regions/v1/regions_connection_idempotency_policy.h +++ b/google/cloud/compute/regions/v1/regions_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_REGIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_REGIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/regions/v1/regions.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/regions/v1/regions_proto_export.h b/google/cloud/compute/regions/v1/regions_proto_export.h index 8419a142d3838..e9ffa0bc8fed5 100644 --- a/google/cloud/compute/regions/v1/regions_proto_export.h +++ b/google/cloud/compute/regions/v1/regions_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_REGIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_098.pb.h" +#include "google/cloud/compute/v1/internal/common_099.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_REGIONS_V1_REGIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_connection_impl.h b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_connection_impl.h index 609be6aa738a3..b862535751efe 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_connection_impl.h +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection.h" #include "google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection_idempotency_policy.h" #include "google/cloud/compute/reservation_blocks/v1/reservation_blocks_options.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_logging_decorator.h b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_logging_decorator.h index 3209d2b0d7f89..471b3be22cc85 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_logging_decorator.h +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_INTERNAL_RESERVATION_BLOCKS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h" +#include "google/cloud/compute/reservation_blocks/v1/reservation_blocks.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_metadata_decorator.h b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_metadata_decorator.h index a3eed725b9c50..05cb920355fb1 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_metadata_decorator.h +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_INTERNAL_RESERVATION_BLOCKS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h" +#include "google/cloud/compute/reservation_blocks/v1/reservation_blocks.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.cc b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.cc index ba872ca13ba8a..d8f7531fd0cc0 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.cc +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/reservation_blocks/v1/reservation_blocks.proto #include "google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h" +#include "google/cloud/compute/reservation_blocks/v1/reservation_blocks.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h index 6f3775648df42..fe3b18c2e2b31 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_INTERNAL_RESERVATION_BLOCKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_INTERNAL_RESERVATION_BLOCKS_REST_STUB_H +#include "google/cloud/compute/reservation_blocks/v1/reservation_blocks.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.cc b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.cc index ae407f0b7943c..be03952d3f5b7 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.cc +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_reservation_blocks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReservationBlocksTracingConnection::ReservationBlocksTracingConnection( std::shared_ptr child) @@ -95,18 +93,14 @@ ReservationBlocksTracingConnection::PerformMaintenance( child_->PerformMaintenance(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReservationBlocksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.h b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.h index f2aa5692d8792..923b20756ae42 100644 --- a/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.h +++ b/google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_reservation_blocks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReservationBlocksTracingConnection : public compute_reservation_blocks_v1::ReservationBlocksConnection { public: @@ -68,8 +66,6 @@ class ReservationBlocksTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection.h b/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection.h index fffde3656dbe5..511fb51c96896 100644 --- a/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection.h +++ b/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_RESERVATION_BLOCKS_CONNECTION_H #include "google/cloud/compute/reservation_blocks/v1/internal/reservation_blocks_retry_traits.h" +#include "google/cloud/compute/reservation_blocks/v1/reservation_blocks.pb.h" #include "google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection_idempotency_policy.h b/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection_idempotency_policy.h index cb522fc225312..3d89167901ea1 100644 --- a/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection_idempotency_policy.h +++ b/google/cloud/compute/reservation_blocks/v1/reservation_blocks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_RESERVATION_BLOCKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_RESERVATION_BLOCKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/reservation_blocks/v1/reservation_blocks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservation_blocks/v1/reservation_blocks_proto_export.h b/google/cloud/compute/reservation_blocks/v1/reservation_blocks_proto_export.h index 28e1cddaf8079..88aca6ea49b87 100644 --- a/google/cloud/compute/reservation_blocks/v1/reservation_blocks_proto_export.h +++ b/google/cloud/compute/reservation_blocks/v1/reservation_blocks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_RESERVATION_BLOCKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_048.pb.h" +#include "google/cloud/compute/v1/internal/common_112.pb.h" +#include "google/cloud/compute/v1/internal/common_146.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_BLOCKS_V1_RESERVATION_BLOCKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_logging_decorator.h b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_logging_decorator.h index 0583afc63ff54..237897f601e72 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_logging_decorator.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_logging_decorator.h @@ -21,11 +21,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_INTERNAL_RESERVATION_SUB_BLOCKS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h" +#include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_metadata_decorator.h b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_metadata_decorator.h index 380d16e1f3a83..178b7e76cb1f0 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_metadata_decorator.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_metadata_decorator.h @@ -21,10 +21,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_INTERNAL_RESERVATION_SUB_BLOCKS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h" +#include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.cc b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.cc index 5bdaa067fae12..07d74251e354c 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.cc +++ b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.cc @@ -18,11 +18,11 @@ // google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.proto #include "google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h" +#include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h index dcbf778613d27..a469779eb964d 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_rest_stub.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_INTERNAL_RESERVATION_SUB_BLOCKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_INTERNAL_RESERVATION_SUB_BLOCKS_REST_STUB_H +#include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.cc b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.cc index 4a155cb612158..19c78d6bb1833 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.cc +++ b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_reservation_sub_blocks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReservationSubBlocksTracingConnection::ReservationSubBlocksTracingConnection( std::shared_ptr< compute_reservation_sub_blocks_v1::ReservationSubBlocksConnection> @@ -62,20 +60,16 @@ ReservationSubBlocksTracingConnection::ListReservationSubBlocks( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr< compute_reservation_sub_blocks_v1::ReservationSubBlocksConnection> MakeReservationSubBlocksTracingConnection( std::shared_ptr< compute_reservation_sub_blocks_v1::ReservationSubBlocksConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.h b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.h index 633507cc2d7a0..a9f931da2eaff 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_reservation_sub_blocks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReservationSubBlocksTracingConnection : public compute_reservation_sub_blocks_v1::ReservationSubBlocksConnection { public: @@ -59,8 +57,6 @@ class ReservationSubBlocksTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection.h b/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection.h index bbfc4aecc4db9..4a5f11208dc3a 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_RESERVATION_SUB_BLOCKS_CONNECTION_H #include "google/cloud/compute/reservation_sub_blocks/v1/internal/reservation_sub_blocks_retry_traits.h" +#include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.pb.h" #include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection_idempotency_policy.h b/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection_idempotency_policy.h index 99069bb8746fa..43d85621d4f68 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection_idempotency_policy.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_RESERVATION_SUB_BLOCKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_RESERVATION_SUB_BLOCKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_proto_export.h b/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_proto_export.h index 74b24fe462cf8..182c254584614 100644 --- a/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_proto_export.h +++ b/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_RESERVATION_SUB_BLOCKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include +#include "google/cloud/compute/v1/internal/common_113.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATION_SUB_BLOCKS_V1_RESERVATION_SUB_BLOCKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/reservations/v1/internal/reservations_rest_connection_impl.h b/google/cloud/compute/reservations/v1/internal/reservations_rest_connection_impl.h index 3149b6294a36d..5bf187ea0d533 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_rest_connection_impl.h +++ b/google/cloud/compute/reservations/v1/internal/reservations_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/reservations/v1/reservations_connection.h" #include "google/cloud/compute/reservations/v1/reservations_connection_idempotency_policy.h" #include "google/cloud/compute/reservations/v1/reservations_options.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservations/v1/internal/reservations_rest_logging_decorator.h b/google/cloud/compute/reservations/v1/internal/reservations_rest_logging_decorator.h index a168132d98dd0..b124b6128f968 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_rest_logging_decorator.h +++ b/google/cloud/compute/reservations/v1/internal/reservations_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_INTERNAL_RESERVATIONS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h" +#include "google/cloud/compute/reservations/v1/reservations.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/reservations/v1/internal/reservations_rest_metadata_decorator.h b/google/cloud/compute/reservations/v1/internal/reservations_rest_metadata_decorator.h index 0c2871287747e..6521d2b9318e8 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_rest_metadata_decorator.h +++ b/google/cloud/compute/reservations/v1/internal/reservations_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_INTERNAL_RESERVATIONS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h" +#include "google/cloud/compute/reservations/v1/reservations.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc b/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc index c716ea8d158f1..23748b224fba0 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc +++ b/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/reservations/v1/reservations.proto #include "google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h" +#include "google/cloud/compute/reservations/v1/reservations.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h b/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h index dd7a58443aab8..774c2c5624b2d 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h +++ b/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_INTERNAL_RESERVATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_INTERNAL_RESERVATIONS_REST_STUB_H +#include "google/cloud/compute/reservations/v1/reservations.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc b/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc index 92376aa94882c..a28d3e2b04c47 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc +++ b/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_reservations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReservationsTracingConnection::ReservationsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -256,16 +254,12 @@ ReservationsTracingConnection::UpdateReservation( child_->UpdateReservation(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReservationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.h b/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.h index 6e39bee02a69d..1cb4f1d5f359c 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.h +++ b/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_reservations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReservationsTracingConnection : public compute_reservations_v1::ReservationsConnection { public: @@ -130,8 +128,6 @@ class ReservationsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/reservations/v1/reservations_connection.h b/google/cloud/compute/reservations/v1/reservations_connection.h index 97bdb9598f486..d710da0aea180 100644 --- a/google/cloud/compute/reservations/v1/reservations_connection.h +++ b/google/cloud/compute/reservations/v1/reservations_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_RESERVATIONS_CONNECTION_H #include "google/cloud/compute/reservations/v1/internal/reservations_retry_traits.h" +#include "google/cloud/compute/reservations/v1/reservations.pb.h" #include "google/cloud/compute/reservations/v1/reservations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservations/v1/reservations_connection_idempotency_policy.h b/google/cloud/compute/reservations/v1/reservations_connection_idempotency_policy.h index 5401741fe28fa..6f357dc330149 100644 --- a/google/cloud/compute/reservations/v1/reservations_connection_idempotency_policy.h +++ b/google/cloud/compute/reservations/v1/reservations_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_RESERVATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_RESERVATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/reservations/v1/reservations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/reservations/v1/reservations_proto_export.h b/google/cloud/compute/reservations/v1/reservations_proto_export.h index 0aab2b4a48d5b..62ac023a86131 100644 --- a/google/cloud/compute/reservations/v1/reservations_proto_export.h +++ b/google/cloud/compute/reservations/v1/reservations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,18 +26,18 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_RESERVATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_001.pb.h" +#include "google/cloud/compute/v1/internal/common_006.pb.h" +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_048.pb.h" +#include "google/cloud/compute/v1/internal/common_111.pb.h" +#include "google/cloud/compute/v1/internal/common_120.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_146.pb.h" +#include "google/cloud/compute/v1/internal/common_152.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESERVATIONS_V1_RESERVATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_connection_impl.h b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_connection_impl.h index 11a97b0d679b4..38103191661ba 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_connection_impl.h +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h" #include "google/cloud/compute/resource_policies/v1/internal/resource_policies_retry_traits.h" #include "google/cloud/compute/resource_policies/v1/resource_policies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_logging_decorator.h b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_logging_decorator.h index 472abdb64f2af..2b00a08679171 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_logging_decorator.h +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h" +#include "google/cloud/compute/resource_policies/v1/resource_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_metadata_decorator.h b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_metadata_decorator.h index 4711b974a30ec..85c434e06d9fc 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h" +#include "google/cloud/compute/resource_policies/v1/resource_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc index f0ba2ea4aa1c6..204e32f85f850 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/resource_policies/v1/resource_policies.proto #include "google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/resource_policies/v1/resource_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h index abaca69ce51d6..12d8c10eff247 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_INTERNAL_RESOURCE_POLICIES_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/resource_policies/v1/resource_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc b/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc index c058576ebb84b..e3e9aa0ddec0f 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_resource_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ResourcePoliciesTracingConnection::ResourcePoliciesTracingConnection( std::shared_ptr child) @@ -211,17 +209,13 @@ ResourcePoliciesTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeResourcePoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.h b/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.h index a71d26a73c141..5719108e08b81 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.h +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_resource_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ResourcePoliciesTracingConnection : public compute_resource_policies_v1::ResourcePoliciesConnection { public: @@ -108,8 +106,6 @@ class ResourcePoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/resource_policies/v1/resource_policies_connection.h b/google/cloud/compute/resource_policies/v1/resource_policies_connection.h index c8fa418e08162..ab90573a2f082 100644 --- a/google/cloud/compute/resource_policies/v1/resource_policies_connection.h +++ b/google/cloud/compute/resource_policies/v1/resource_policies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_RESOURCE_POLICIES_CONNECTION_H #include "google/cloud/compute/resource_policies/v1/internal/resource_policies_retry_traits.h" +#include "google/cloud/compute/resource_policies/v1/resource_policies.pb.h" #include "google/cloud/compute/resource_policies/v1/resource_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/resource_policies/v1/resource_policies_connection_idempotency_policy.h b/google/cloud/compute/resource_policies/v1/resource_policies_connection_idempotency_policy.h index 4c7ef4dffa090..7d43a94d8954e 100644 --- a/google/cloud/compute/resource_policies/v1/resource_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/resource_policies/v1/resource_policies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_RESOURCE_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_RESOURCE_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/resource_policies/v1/resource_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/resource_policies/v1/resource_policies_proto_export.h b/google/cloud/compute/resource_policies/v1/resource_policies_proto_export.h index d777ef12168d6..1863bee555dcf 100644 --- a/google/cloud/compute/resource_policies/v1/resource_policies_proto_export.h +++ b/google/cloud/compute/resource_policies/v1/resource_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_RESOURCE_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_114.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_RESOURCE_POLICIES_V1_RESOURCE_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/routers/v1/internal/routers_rest_connection_impl.h b/google/cloud/compute/routers/v1/internal/routers_rest_connection_impl.h index 2d4a617742330..9b52454754c99 100644 --- a/google/cloud/compute/routers/v1/internal/routers_rest_connection_impl.h +++ b/google/cloud/compute/routers/v1/internal/routers_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/routers/v1/internal/routers_rest_stub.h" #include "google/cloud/compute/routers/v1/internal/routers_retry_traits.h" #include "google/cloud/compute/routers/v1/routers_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/routers/v1/internal/routers_rest_logging_decorator.h b/google/cloud/compute/routers/v1/internal/routers_rest_logging_decorator.h index b876b086b397c..eb10d4f068f4c 100644 --- a/google/cloud/compute/routers/v1/internal/routers_rest_logging_decorator.h +++ b/google/cloud/compute/routers/v1/internal/routers_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/routers/v1/internal/routers_rest_stub.h" +#include "google/cloud/compute/routers/v1/routers.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/routers/v1/internal/routers_rest_metadata_decorator.h b/google/cloud/compute/routers/v1/internal/routers_rest_metadata_decorator.h index 2a5e45f2ec56a..3c31e3febaaff 100644 --- a/google/cloud/compute/routers/v1/internal/routers_rest_metadata_decorator.h +++ b/google/cloud/compute/routers/v1/internal/routers_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/routers/v1/internal/routers_rest_stub.h" +#include "google/cloud/compute/routers/v1/routers.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc b/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc index 2606040dcf5dd..38fed9fab8426 100644 --- a/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc +++ b/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/routers/v1/routers.proto #include "google/cloud/compute/routers/v1/internal/routers_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/routers/v1/routers.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/routers/v1/internal/routers_rest_stub.h b/google/cloud/compute/routers/v1/internal/routers_rest_stub.h index 383e2eb8e5f6c..261af1927e8c7 100644 --- a/google/cloud/compute/routers/v1/internal/routers_rest_stub.h +++ b/google/cloud/compute/routers/v1/internal/routers_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_INTERNAL_ROUTERS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/routers/v1/routers.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc b/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc index a19829b029e33..bec02c39781d1 100644 --- a/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc +++ b/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_routers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RoutersTracingConnection::RoutersTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -352,16 +350,12 @@ RoutersTracingConnection::UpdateRoutePolicy( child_->UpdateRoutePolicy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRoutersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/routers/v1/internal/routers_tracing_connection.h b/google/cloud/compute/routers/v1/internal/routers_tracing_connection.h index ea37526f9b7ab..ffbf63a3f295b 100644 --- a/google/cloud/compute/routers/v1/internal/routers_tracing_connection.h +++ b/google/cloud/compute/routers/v1/internal/routers_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_routers_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RoutersTracingConnection : public compute_routers_v1::RoutersConnection { public: ~RoutersTracingConnection() override = default; @@ -177,8 +175,6 @@ class RoutersTracingConnection : public compute_routers_v1::RoutersConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/routers/v1/routers_connection.h b/google/cloud/compute/routers/v1/routers_connection.h index 4df108018dfea..21f9c3e2fad74 100644 --- a/google/cloud/compute/routers/v1/routers_connection.h +++ b/google/cloud/compute/routers/v1/routers_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_ROUTERS_CONNECTION_H #include "google/cloud/compute/routers/v1/internal/routers_retry_traits.h" +#include "google/cloud/compute/routers/v1/routers.pb.h" #include "google/cloud/compute/routers/v1/routers_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/routers/v1/routers_connection_idempotency_policy.h b/google/cloud/compute/routers/v1/routers_connection_idempotency_policy.h index 41b4649d0cc1e..f1de3e599d65b 100644 --- a/google/cloud/compute/routers/v1/routers_connection_idempotency_policy.h +++ b/google/cloud/compute/routers/v1/routers_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_ROUTERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_ROUTERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/routers/v1/routers.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/routers/v1/routers_proto_export.h b/google/cloud/compute/routers/v1/routers_proto_export.h index 65f6365b77db2..405c57335485c 100644 --- a/google/cloud/compute/routers/v1/routers_proto_export.h +++ b/google/cloud/compute/routers/v1/routers_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_ROUTERS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_013.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_115.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTERS_V1_ROUTERS_PROTO_EXPORT_H diff --git a/google/cloud/compute/routes/v1/internal/routes_rest_connection_impl.h b/google/cloud/compute/routes/v1/internal/routes_rest_connection_impl.h index 484d1ba128eaa..115a2ef2757ef 100644 --- a/google/cloud/compute/routes/v1/internal/routes_rest_connection_impl.h +++ b/google/cloud/compute/routes/v1/internal/routes_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/routes/v1/internal/routes_rest_stub.h" #include "google/cloud/compute/routes/v1/internal/routes_retry_traits.h" #include "google/cloud/compute/routes/v1/routes_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/routes/v1/internal/routes_rest_logging_decorator.h b/google/cloud/compute/routes/v1/internal/routes_rest_logging_decorator.h index 619698a3ac8d6..7a8a9ea8ed26f 100644 --- a/google/cloud/compute/routes/v1/internal/routes_rest_logging_decorator.h +++ b/google/cloud/compute/routes/v1/internal/routes_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/routes/v1/internal/routes_rest_stub.h" +#include "google/cloud/compute/routes/v1/routes.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/routes/v1/internal/routes_rest_metadata_decorator.h b/google/cloud/compute/routes/v1/internal/routes_rest_metadata_decorator.h index d24bd8673ec9f..50258b5aad3bc 100644 --- a/google/cloud/compute/routes/v1/internal/routes_rest_metadata_decorator.h +++ b/google/cloud/compute/routes/v1/internal/routes_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/routes/v1/internal/routes_rest_stub.h" +#include "google/cloud/compute/routes/v1/routes.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc b/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc index d0fff81074c4e..14e909c5433a8 100644 --- a/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc +++ b/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/routes/v1/routes.proto #include "google/cloud/compute/routes/v1/internal/routes_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/routes/v1/routes.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/routes/v1/internal/routes_rest_stub.h b/google/cloud/compute/routes/v1/internal/routes_rest_stub.h index 9a21682581483..9ed3cd9f4246d 100644 --- a/google/cloud/compute/routes/v1/internal/routes_rest_stub.h +++ b/google/cloud/compute/routes/v1/internal/routes_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_INTERNAL_ROUTES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/routes/v1/routes.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc b/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc index 0e2c9e08c513e..5b0b2b32276be 100644 --- a/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc +++ b/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_routes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RoutesTracingConnection::RoutesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -113,16 +111,12 @@ RoutesTracingConnection::ListRoutes( google::cloud::cpp::compute::v1::Route>(std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRoutesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/routes/v1/internal/routes_tracing_connection.h b/google/cloud/compute/routes/v1/internal/routes_tracing_connection.h index 23be80fbfceba..9fa1a83a198a2 100644 --- a/google/cloud/compute/routes/v1/internal/routes_tracing_connection.h +++ b/google/cloud/compute/routes/v1/internal/routes_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_routes_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RoutesTracingConnection : public compute_routes_v1::RoutesConnection { public: ~RoutesTracingConnection() override = default; @@ -75,8 +73,6 @@ class RoutesTracingConnection : public compute_routes_v1::RoutesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/routes/v1/routes_connection.h b/google/cloud/compute/routes/v1/routes_connection.h index b950e3ec2013f..1ee615c1fa68f 100644 --- a/google/cloud/compute/routes/v1/routes_connection.h +++ b/google/cloud/compute/routes/v1/routes_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_ROUTES_CONNECTION_H #include "google/cloud/compute/routes/v1/internal/routes_retry_traits.h" +#include "google/cloud/compute/routes/v1/routes.pb.h" #include "google/cloud/compute/routes/v1/routes_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/routes/v1/routes_connection_idempotency_policy.h b/google/cloud/compute/routes/v1/routes_connection_idempotency_policy.h index 1ad279af6c4e9..bdbd0ca4e2128 100644 --- a/google/cloud/compute/routes/v1/routes_connection_idempotency_policy.h +++ b/google/cloud/compute/routes/v1/routes_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_ROUTES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_ROUTES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/routes/v1/routes.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/routes/v1/routes_proto_export.h b/google/cloud/compute/routes/v1/routes_proto_export.h index 679ed38680a44..f6371fbf47845 100644 --- a/google/cloud/compute/routes/v1/routes_proto_export.h +++ b/google/cloud/compute/routes/v1/routes_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_ROUTES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_115.pb.h" +#include "google/cloud/compute/v1/internal/common_116.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ROUTES_V1_ROUTES_PROTO_EXPORT_H diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_connection_impl.h b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_connection_impl.h index d18a7a3c59f8a..41877dba25db3 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_connection_impl.h +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h" #include "google/cloud/compute/security_policies/v1/internal/security_policies_retry_traits.h" #include "google/cloud/compute/security_policies/v1/security_policies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_logging_decorator.h b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_logging_decorator.h index ba82168ad1ee9..20402dde3f2e7 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_logging_decorator.h +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h" +#include "google/cloud/compute/security_policies/v1/security_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_metadata_decorator.h b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_metadata_decorator.h index 45a67bbddfc09..6332448222e4b 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h" +#include "google/cloud/compute/security_policies/v1/security_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc index be4f6427460df..c345d977521f0 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/security_policies/v1/security_policies.proto #include "google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/security_policies/v1/security_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h index d31b2a64a9bcc..ef24bddad43fc 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_INTERNAL_SECURITY_POLICIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/security_policies/v1/security_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc b/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc index 6d76f78379fcd..4ba0ffb3c9261 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_security_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityPoliciesTracingConnection::SecurityPoliciesTracingConnection( std::shared_ptr child) @@ -323,17 +321,13 @@ SecurityPoliciesTracingConnection::SetLabels( return internal::EndSpan(std::move(span), child_->SetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityPoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.h b/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.h index 09b5130bad045..71f273778d6d3 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.h +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_security_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityPoliciesTracingConnection : public compute_security_policies_v1::SecurityPoliciesConnection { public: @@ -151,8 +149,6 @@ class SecurityPoliciesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/security_policies/v1/security_policies_connection.h b/google/cloud/compute/security_policies/v1/security_policies_connection.h index 021f303f2b437..97ed465bd69df 100644 --- a/google/cloud/compute/security_policies/v1/security_policies_connection.h +++ b/google/cloud/compute/security_policies/v1/security_policies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_SECURITY_POLICIES_CONNECTION_H #include "google/cloud/compute/security_policies/v1/internal/security_policies_retry_traits.h" +#include "google/cloud/compute/security_policies/v1/security_policies.pb.h" #include "google/cloud/compute/security_policies/v1/security_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/security_policies/v1/security_policies_connection_idempotency_policy.h b/google/cloud/compute/security_policies/v1/security_policies_connection_idempotency_policy.h index 4e69ed4712483..ad6e6e97bf2d8 100644 --- a/google/cloud/compute/security_policies/v1/security_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/security_policies/v1/security_policies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_SECURITY_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_SECURITY_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/security_policies/v1/security_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/security_policies/v1/security_policies_proto_export.h b/google/cloud/compute/security_policies/v1/security_policies_proto_export.h index cde97bec3a0d1..bd3ba6eb69771 100644 --- a/google/cloud/compute/security_policies/v1/security_policies_proto_export.h +++ b/google/cloud/compute/security_policies/v1/security_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_SECURITY_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_094.pb.h" +#include "google/cloud/compute/v1/internal/common_117.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SECURITY_POLICIES_V1_SECURITY_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_connection_impl.h b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_connection_impl.h index 04b4d22712703..001324131fa5a 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_connection_impl.h +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h" #include "google/cloud/compute/service_attachments/v1/internal/service_attachments_retry_traits.h" #include "google/cloud/compute/service_attachments/v1/service_attachments_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_logging_decorator.h b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_logging_decorator.h index f236ea0db0817..b601ccafddd24 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_logging_decorator.h +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h" +#include "google/cloud/compute/service_attachments/v1/service_attachments.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_metadata_decorator.h b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_metadata_decorator.h index 7ad94d39f421d..87b5c3684efe9 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_metadata_decorator.h +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h" +#include "google/cloud/compute/service_attachments/v1/service_attachments.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc index 9506c084d0663..04596aeb6baa3 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/service_attachments/v1/service_attachments.proto #include "google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/service_attachments/v1/service_attachments.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h index b010812dd769e..39e99d0b95e38 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_INTERNAL_SERVICE_ATTACHMENTS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/service_attachments/v1/service_attachments.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc b/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc index ce618d8c07900..928899ba92544 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_service_attachments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceAttachmentsTracingConnection::ServiceAttachmentsTracingConnection( std::shared_ptr< compute_service_attachments_v1::ServiceAttachmentsConnection> @@ -214,19 +212,15 @@ ServiceAttachmentsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceAttachmentsTracingConnection( std::shared_ptr< compute_service_attachments_v1::ServiceAttachmentsConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.h b/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.h index 6a1fd76e5bdbd..4f3c9dfc6f891 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.h +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_service_attachments_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceAttachmentsTracingConnection : public compute_service_attachments_v1::ServiceAttachmentsConnection { public: @@ -113,8 +111,6 @@ class ServiceAttachmentsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/service_attachments/v1/service_attachments_connection.h b/google/cloud/compute/service_attachments/v1/service_attachments_connection.h index 721b78f8eb962..85212762222ef 100644 --- a/google/cloud/compute/service_attachments/v1/service_attachments_connection.h +++ b/google/cloud/compute/service_attachments/v1/service_attachments_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_SERVICE_ATTACHMENTS_CONNECTION_H #include "google/cloud/compute/service_attachments/v1/internal/service_attachments_retry_traits.h" +#include "google/cloud/compute/service_attachments/v1/service_attachments.pb.h" #include "google/cloud/compute/service_attachments/v1/service_attachments_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/service_attachments/v1/service_attachments_connection_idempotency_policy.h b/google/cloud/compute/service_attachments/v1/service_attachments_connection_idempotency_policy.h index 765cff96dec10..058b89907d6d6 100644 --- a/google/cloud/compute/service_attachments/v1/service_attachments_connection_idempotency_policy.h +++ b/google/cloud/compute/service_attachments/v1/service_attachments_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_SERVICE_ATTACHMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_SERVICE_ATTACHMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/service_attachments/v1/service_attachments.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/service_attachments/v1/service_attachments_proto_export.h b/google/cloud/compute/service_attachments/v1/service_attachments_proto_export.h index 4362da45ed9c1..4d61226dba6e7 100644 --- a/google/cloud/compute/service_attachments/v1/service_attachments_proto_export.h +++ b/google/cloud/compute/service_attachments/v1/service_attachments_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_SERVICE_ATTACHMENTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_119.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SERVICE_ATTACHMENTS_V1_SERVICE_ATTACHMENTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_connection_impl.h b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_connection_impl.h index d1338ef861d1e..b444560d92439 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_connection_impl.h +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h" #include "google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_retry_traits.h" #include "google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection.h" @@ -29,7 +30,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_logging_decorator.h b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_logging_decorator.h index 19593ffd28765..7233f2e6f389f 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_logging_decorator.h +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h" +#include "google/cloud/compute/snapshot_settings/v1/snapshot_settings.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_metadata_decorator.h b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_metadata_decorator.h index 52b906f692891..2853c9eb7da28 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_metadata_decorator.h +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h" +#include "google/cloud/compute/snapshot_settings/v1/snapshot_settings.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.cc b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.cc index 87279b266ce64..89698e3d15e6b 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.cc +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/snapshot_settings/v1/snapshot_settings.proto #include "google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/snapshot_settings/v1/snapshot_settings.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h index deb40a51e5de8..0a0935a601700 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_INTERNAL_SNAPSHOT_SETTINGS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/snapshot_settings/v1/snapshot_settings.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.cc b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.cc index 222d7416233b6..368d500162005 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.cc +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace compute_snapshot_settings_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SnapshotSettingsTracingConnection::SnapshotSettingsTracingConnection( std::shared_ptr child) @@ -79,17 +77,13 @@ SnapshotSettingsTracingConnection::PatchSnapshotSettings( child_->PatchSnapshotSettings(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSnapshotSettingsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.h b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.h index 0da5df1399c62..8f1864998229f 100644 --- a/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.h +++ b/google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_snapshot_settings_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SnapshotSettingsTracingConnection : public compute_snapshot_settings_v1::SnapshotSettingsConnection { public: @@ -63,8 +61,6 @@ class SnapshotSettingsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection.h b/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection.h index 0e3c39e4ef327..15f2323e63bde 100644 --- a/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection.h +++ b/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_SNAPSHOT_SETTINGS_CONNECTION_H #include "google/cloud/compute/snapshot_settings/v1/internal/snapshot_settings_retry_traits.h" +#include "google/cloud/compute/snapshot_settings/v1/snapshot_settings.pb.h" #include "google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -29,7 +30,6 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection_idempotency_policy.h b/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection_idempotency_policy.h index d05e1ddfc2e8e..706a47cb52204 100644 --- a/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection_idempotency_policy.h +++ b/google/cloud/compute/snapshot_settings/v1/snapshot_settings_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_SNAPSHOT_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_SNAPSHOT_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/snapshot_settings/v1/snapshot_settings.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/snapshot_settings/v1/snapshot_settings_proto_export.h b/google/cloud/compute/snapshot_settings/v1/snapshot_settings_proto_export.h index 9a227ae25ed1c..cff16a8f85b49 100644 --- a/google/cloud/compute/snapshot_settings/v1/snapshot_settings_proto_export.h +++ b/google/cloud/compute/snapshot_settings/v1/snapshot_settings_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_SNAPSHOT_SETTINGS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_124.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOT_SETTINGS_V1_SNAPSHOT_SETTINGS_PROTO_EXPORT_H diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_connection_impl.h b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_connection_impl.h index 60e4dbe01161f..845f6fdd46732 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_connection_impl.h +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h" #include "google/cloud/compute/snapshots/v1/internal/snapshots_retry_traits.h" #include "google/cloud/compute/snapshots/v1/snapshots_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_logging_decorator.h b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_logging_decorator.h index bf10795f30cc5..bd987a7bea166 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_logging_decorator.h +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h" +#include "google/cloud/compute/snapshots/v1/snapshots.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_metadata_decorator.h b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_metadata_decorator.h index 103fc8cc1b7c9..10a45c4d89a56 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_metadata_decorator.h +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h" +#include "google/cloud/compute/snapshots/v1/snapshots.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc index 814221457f5e5..6082ec9280e9d 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/snapshots/v1/snapshots.proto #include "google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/snapshots/v1/snapshots.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h index 3e50a7f6e427a..875ac41116211 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_INTERNAL_SNAPSHOTS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/snapshots/v1/snapshots.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc b/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc index 4b51382eed3a6..45fc0a248e50d 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_snapshots_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SnapshotsTracingConnection::SnapshotsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -177,16 +175,12 @@ SnapshotsTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSnapshotsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.h b/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.h index e367a41bad8bb..ce137314de40b 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.h +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_snapshots_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SnapshotsTracingConnection : public compute_snapshots_v1::SnapshotsConnection { public: @@ -100,8 +98,6 @@ class SnapshotsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/snapshots/v1/snapshots_connection.h b/google/cloud/compute/snapshots/v1/snapshots_connection.h index 7a0ddd4fb2902..c8478224c89bd 100644 --- a/google/cloud/compute/snapshots/v1/snapshots_connection.h +++ b/google/cloud/compute/snapshots/v1/snapshots_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_SNAPSHOTS_CONNECTION_H #include "google/cloud/compute/snapshots/v1/internal/snapshots_retry_traits.h" +#include "google/cloud/compute/snapshots/v1/snapshots.pb.h" #include "google/cloud/compute/snapshots/v1/snapshots_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/snapshots/v1/snapshots_connection_idempotency_policy.h b/google/cloud/compute/snapshots/v1/snapshots_connection_idempotency_policy.h index 25d19847ebcfa..f3d7fed50796b 100644 --- a/google/cloud/compute/snapshots/v1/snapshots_connection_idempotency_policy.h +++ b/google/cloud/compute/snapshots/v1/snapshots_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_SNAPSHOTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_SNAPSHOTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/snapshots/v1/snapshots.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/snapshots/v1/snapshots_proto_export.h b/google/cloud/compute/snapshots/v1/snapshots_proto_export.h index 98dc0d88f86ed..20047a2da893a 100644 --- a/google/cloud/compute/snapshots/v1/snapshots_proto_export.h +++ b/google/cloud/compute/snapshots/v1/snapshots_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,15 +26,15 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_SNAPSHOTS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_021.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_046.pb.h" +#include "google/cloud/compute/v1/internal/common_047.pb.h" +#include "google/cloud/compute/v1/internal/common_122.pb.h" +#include "google/cloud/compute/v1/internal/common_123.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SNAPSHOTS_V1_SNAPSHOTS_PROTO_EXPORT_H diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_connection_impl.h b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_connection_impl.h index e4f8115f2e3b1..7dfbfbf90da44 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_connection_impl.h +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h" #include "google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_retry_traits.h" #include "google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_logging_decorator.h b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_logging_decorator.h index 0fce342ed2dfc..59006b0a7867f 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_logging_decorator.h +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h" +#include "google/cloud/compute/ssl_certificates/v1/ssl_certificates.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_metadata_decorator.h b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_metadata_decorator.h index 91b2e1d60788f..8a0ae79059425 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_metadata_decorator.h +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h" +#include "google/cloud/compute/ssl_certificates/v1/ssl_certificates.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc index f2a92215a56f9..ea2be4696676d 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/ssl_certificates/v1/ssl_certificates.proto #include "google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/ssl_certificates/v1/ssl_certificates.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h index 71889b1b82c70..61263482b4664 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_INTERNAL_SSL_CERTIFICATES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/ssl_certificates/v1/ssl_certificates.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc index 269484d7d4a5c..d2734728e653d 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_ssl_certificates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SslCertificatesTracingConnection::SslCertificatesTracingConnection( std::shared_ptr child) @@ -144,17 +142,13 @@ SslCertificatesTracingConnection::ListSslCertificates( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSslCertificatesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.h b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.h index 4d2572c714c1d..2785c8c2ce6f7 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.h +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_ssl_certificates_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SslCertificatesTracingConnection : public compute_ssl_certificates_v1::SslCertificatesConnection { public: @@ -84,8 +82,6 @@ class SslCertificatesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection.h b/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection.h index b6aa5e0baeef1..150fd82c2ffff 100644 --- a/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection.h +++ b/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_SSL_CERTIFICATES_CONNECTION_H #include "google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_retry_traits.h" +#include "google/cloud/compute/ssl_certificates/v1/ssl_certificates.pb.h" #include "google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection_idempotency_policy.h b/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection_idempotency_policy.h index ae8a6493b25bb..53b45f5828937 100644 --- a/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection_idempotency_policy.h +++ b/google/cloud/compute/ssl_certificates/v1/ssl_certificates_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_SSL_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_SSL_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/ssl_certificates/v1/ssl_certificates.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/ssl_certificates/v1/ssl_certificates_proto_export.h b/google/cloud/compute/ssl_certificates/v1/ssl_certificates_proto_export.h index 8617dcd826d85..35f1555726484 100644 --- a/google/cloud/compute/ssl_certificates/v1/ssl_certificates_proto_export.h +++ b/google/cloud/compute/ssl_certificates/v1/ssl_certificates_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_SSL_CERTIFICATES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_125.pb.h" +#include "google/cloud/compute/v1/internal/common_126.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_CERTIFICATES_V1_SSL_CERTIFICATES_PROTO_EXPORT_H diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_connection_impl.h b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_connection_impl.h index 66e08e0f7d810..1a81b577fea29 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_connection_impl.h +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h" #include "google/cloud/compute/ssl_policies/v1/internal/ssl_policies_retry_traits.h" #include "google/cloud/compute/ssl_policies/v1/ssl_policies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_logging_decorator.h b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_logging_decorator.h index 9617bc2f94b60..f7a33160a4dd6 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_logging_decorator.h +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h" +#include "google/cloud/compute/ssl_policies/v1/ssl_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_metadata_decorator.h b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_metadata_decorator.h index 300cbc935368e..7c2c82c11b6c4 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_metadata_decorator.h +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h" +#include "google/cloud/compute/ssl_policies/v1/ssl_policies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc index 8487fbf07d40e..2348b4fb6b32e 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/ssl_policies/v1/ssl_policies.proto #include "google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/ssl_policies/v1/ssl_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h index 895e5b1211abd..fafd63f2f5c11 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_INTERNAL_SSL_POLICIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/ssl_policies/v1/ssl_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc index 43e0610506760..d38edaad6881b 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_ssl_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SslPoliciesTracingConnection::SslPoliciesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -175,16 +173,12 @@ SslPoliciesTracingConnection::PatchSslPolicy( return internal::EndSpan(std::move(span), child_->PatchSslPolicy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSslPoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.h b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.h index f6086b5de18b4..2a121ea1839b4 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.h +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_ssl_policies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SslPoliciesTracingConnection : public compute_ssl_policies_v1::SslPoliciesConnection { public: @@ -97,8 +95,6 @@ class SslPoliciesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/ssl_policies/v1/ssl_policies_connection.h b/google/cloud/compute/ssl_policies/v1/ssl_policies_connection.h index d4efb50ebc6b7..cc89ae5f2a99a 100644 --- a/google/cloud/compute/ssl_policies/v1/ssl_policies_connection.h +++ b/google/cloud/compute/ssl_policies/v1/ssl_policies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_SSL_POLICIES_CONNECTION_H #include "google/cloud/compute/ssl_policies/v1/internal/ssl_policies_retry_traits.h" +#include "google/cloud/compute/ssl_policies/v1/ssl_policies.pb.h" #include "google/cloud/compute/ssl_policies/v1/ssl_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/ssl_policies/v1/ssl_policies_connection_idempotency_policy.h b/google/cloud/compute/ssl_policies/v1/ssl_policies_connection_idempotency_policy.h index e38e222418383..7f7445b21ba6b 100644 --- a/google/cloud/compute/ssl_policies/v1/ssl_policies_connection_idempotency_policy.h +++ b/google/cloud/compute/ssl_policies/v1/ssl_policies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_SSL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_SSL_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/ssl_policies/v1/ssl_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/ssl_policies/v1/ssl_policies_proto_export.h b/google/cloud/compute/ssl_policies/v1/ssl_policies_proto_export.h index e36745595086c..c5cb512953f3d 100644 --- a/google/cloud/compute/ssl_policies/v1/ssl_policies_proto_export.h +++ b/google/cloud/compute/ssl_policies/v1/ssl_policies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_SSL_POLICIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_127.pb.h" +#include "google/cloud/compute/v1/internal/common_128.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SSL_POLICIES_V1_SSL_POLICIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_logging_decorator.h b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_logging_decorator.h index 3bd434aedeae5..89b91d60289ac 100644 --- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_logging_decorator.h +++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_INTERNAL_STORAGE_POOL_TYPES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h" +#include "google/cloud/compute/storage_pool_types/v1/storage_pool_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_metadata_decorator.h b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_metadata_decorator.h index 77c5cfb8ae4c0..9ef90834cbb1f 100644 --- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_metadata_decorator.h +++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_INTERNAL_STORAGE_POOL_TYPES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h" +#include "google/cloud/compute/storage_pool_types/v1/storage_pool_types.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc index 28b70f327f00e..497b36893900d 100644 --- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc +++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/storage_pool_types/v1/storage_pool_types.proto #include "google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h" +#include "google/cloud/compute/storage_pool_types/v1/storage_pool_types.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h index a72c5dc6e00d2..8021b63c39a98 100644 --- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h +++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_INTERNAL_STORAGE_POOL_TYPES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_INTERNAL_STORAGE_POOL_TYPES_REST_STUB_H +#include "google/cloud/compute/storage_pool_types/v1/storage_pool_types.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.cc b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.cc index 8fafca8623ab4..5177345d42b05 100644 --- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.cc +++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_storage_pool_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StoragePoolTypesTracingConnection::StoragePoolTypesTracingConnection( std::shared_ptr child) @@ -75,17 +73,13 @@ StoragePoolTypesTracingConnection::ListStoragePoolTypes( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStoragePoolTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.h b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.h index b4a273c0487b4..24a0397124d3f 100644 --- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.h +++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_storage_pool_types_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StoragePoolTypesTracingConnection : public compute_storage_pool_types_v1::StoragePoolTypesConnection { public: @@ -60,8 +58,6 @@ class StoragePoolTypesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection.h b/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection.h index 868fb2c4ca682..bb4d5f0a4571a 100644 --- a/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection.h +++ b/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_STORAGE_POOL_TYPES_CONNECTION_H #include "google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_retry_traits.h" +#include "google/cloud/compute/storage_pool_types/v1/storage_pool_types.pb.h" #include "google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection_idempotency_policy.h b/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection_idempotency_policy.h index c0265dedcd281..2d23895180a56 100644 --- a/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection_idempotency_policy.h +++ b/google/cloud/compute/storage_pool_types/v1/storage_pool_types_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_STORAGE_POOL_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_STORAGE_POOL_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/storage_pool_types/v1/storage_pool_types.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/storage_pool_types/v1/storage_pool_types_proto_export.h b/google/cloud/compute/storage_pool_types/v1/storage_pool_types_proto_export.h index 7f9cb4c64f9fa..b335bef741dec 100644 --- a/google/cloud/compute/storage_pool_types/v1/storage_pool_types_proto_export.h +++ b/google/cloud/compute/storage_pool_types/v1/storage_pool_types_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_STORAGE_POOL_TYPES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_131.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOL_TYPES_V1_STORAGE_POOL_TYPES_PROTO_EXPORT_H diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_connection_impl.h b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_connection_impl.h index c7eb039d14090..9dad6a3f1e269 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_connection_impl.h +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/storage_pools/v1/storage_pools_connection.h" #include "google/cloud/compute/storage_pools/v1/storage_pools_connection_idempotency_policy.h" #include "google/cloud/compute/storage_pools/v1/storage_pools_options.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_logging_decorator.h b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_logging_decorator.h index 027bc70a422ca..a8442275af8dd 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_logging_decorator.h +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_INTERNAL_STORAGE_POOLS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h" +#include "google/cloud/compute/storage_pools/v1/storage_pools.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_metadata_decorator.h b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_metadata_decorator.h index 701b0d0c51e7f..1d6d51c26bb4b 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_metadata_decorator.h +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_INTERNAL_STORAGE_POOLS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h" +#include "google/cloud/compute/storage_pools/v1/storage_pools.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc index 6b4ebe5fe9e77..99ce478609115 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/storage_pools/v1/storage_pools.proto #include "google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h" +#include "google/cloud/compute/storage_pools/v1/storage_pools.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h index 2b7a03b8a434c..6928896246d59 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_INTERNAL_STORAGE_POOLS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_INTERNAL_STORAGE_POOLS_REST_STUB_H +#include "google/cloud/compute/storage_pools/v1/storage_pools.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.cc b/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.cc index d37e1bfd59181..c64f202eee49a 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.cc +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_storage_pools_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StoragePoolsTracingConnection::StoragePoolsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -206,16 +204,12 @@ StoragePoolsTracingConnection::UpdateStoragePool( child_->UpdateStoragePool(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStoragePoolsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.h b/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.h index d88ba62517969..c27ba99f705bf 100644 --- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.h +++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_storage_pools_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StoragePoolsTracingConnection : public compute_storage_pools_v1::StoragePoolsConnection { public: @@ -110,8 +108,6 @@ class StoragePoolsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/storage_pools/v1/storage_pools_connection.h b/google/cloud/compute/storage_pools/v1/storage_pools_connection.h index e82a9ccfc40bf..90e78ad16a73f 100644 --- a/google/cloud/compute/storage_pools/v1/storage_pools_connection.h +++ b/google/cloud/compute/storage_pools/v1/storage_pools_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_STORAGE_POOLS_CONNECTION_H #include "google/cloud/compute/storage_pools/v1/internal/storage_pools_retry_traits.h" +#include "google/cloud/compute/storage_pools/v1/storage_pools.pb.h" #include "google/cloud/compute/storage_pools/v1/storage_pools_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/storage_pools/v1/storage_pools_connection_idempotency_policy.h b/google/cloud/compute/storage_pools/v1/storage_pools_connection_idempotency_policy.h index ae4627eaaf1e2..406c5c4f08121 100644 --- a/google/cloud/compute/storage_pools/v1/storage_pools_connection_idempotency_policy.h +++ b/google/cloud/compute/storage_pools/v1/storage_pools_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_STORAGE_POOLS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_STORAGE_POOLS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/storage_pools/v1/storage_pools.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/storage_pools/v1/storage_pools_proto_export.h b/google/cloud/compute/storage_pools/v1/storage_pools_proto_export.h index bab2aade712ba..d71ea8cc40522 100644 --- a/google/cloud/compute/storage_pools/v1/storage_pools_proto_export.h +++ b/google/cloud/compute/storage_pools/v1/storage_pools_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_STORAGE_POOLS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_130.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_152.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_STORAGE_POOLS_V1_STORAGE_POOLS_PROTO_EXPORT_H diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_connection_impl.h b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_connection_impl.h index 21401e6b8675c..26fca92487fef 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_connection_impl.h +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h" #include "google/cloud/compute/subnetworks/v1/internal/subnetworks_retry_traits.h" #include "google/cloud/compute/subnetworks/v1/subnetworks_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_logging_decorator.h b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_logging_decorator.h index c7333e5f7f466..d044611ce4e04 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_logging_decorator.h +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h" +#include "google/cloud/compute/subnetworks/v1/subnetworks.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_metadata_decorator.h b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_metadata_decorator.h index f195d2f7d5344..76345e12056ee 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_metadata_decorator.h +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h" +#include "google/cloud/compute/subnetworks/v1/subnetworks.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc index 9ed1f5bc9e6b7..fb1af787978ab 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/subnetworks/v1/subnetworks.proto #include "google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/subnetworks/v1/subnetworks.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h index 601a3a721e417..cee167ab6cbed 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_INTERNAL_SUBNETWORKS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/subnetworks/v1/subnetworks.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc b/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc index a27467785dd2f..863c6b620715c 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_subnetworks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SubnetworksTracingConnection::SubnetworksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -274,16 +272,12 @@ SubnetworksTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSubnetworksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.h b/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.h index aae0a52e66a98..a5b5ae00137f7 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.h +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_subnetworks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SubnetworksTracingConnection : public compute_subnetworks_v1::SubnetworksConnection { public: @@ -132,8 +130,6 @@ class SubnetworksTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/subnetworks/v1/subnetworks_connection.h b/google/cloud/compute/subnetworks/v1/subnetworks_connection.h index a6af885b51c65..2042868c07f47 100644 --- a/google/cloud/compute/subnetworks/v1/subnetworks_connection.h +++ b/google/cloud/compute/subnetworks/v1/subnetworks_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_SUBNETWORKS_CONNECTION_H #include "google/cloud/compute/subnetworks/v1/internal/subnetworks_retry_traits.h" +#include "google/cloud/compute/subnetworks/v1/subnetworks.pb.h" #include "google/cloud/compute/subnetworks/v1/subnetworks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/subnetworks/v1/subnetworks_connection_idempotency_policy.h b/google/cloud/compute/subnetworks/v1/subnetworks_connection_idempotency_policy.h index 69d0684bcc15e..6ad7b3b4b2614 100644 --- a/google/cloud/compute/subnetworks/v1/subnetworks_connection_idempotency_policy.h +++ b/google/cloud/compute/subnetworks/v1/subnetworks_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_SUBNETWORKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_SUBNETWORKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/subnetworks/v1/subnetworks.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/subnetworks/v1/subnetworks_proto_export.h b/google/cloud/compute/subnetworks/v1/subnetworks_proto_export.h index 79ef2f919f9d1..34e22f287766b 100644 --- a/google/cloud/compute/subnetworks/v1/subnetworks_proto_export.h +++ b/google/cloud/compute/subnetworks/v1/subnetworks_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_SUBNETWORKS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_007.pb.h" +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_031.pb.h" +#include "google/cloud/compute/v1/internal/common_108.pb.h" +#include "google/cloud/compute/v1/internal/common_132.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_SUBNETWORKS_V1_SUBNETWORKS_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_connection_impl.h b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_connection_impl.h index 8ef88006ed55c..a98d34d8cd89a 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_connection_impl.h +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h" #include "google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_retry_traits.h" #include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_logging_decorator.h b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_logging_decorator.h index c0d10a20fe64a..95a05698bddd4 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h" +#include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_metadata_decorator.h b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_metadata_decorator.h index 963a174cbffe6..69fe12c2bfb55 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h" +#include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc index 66fbcb7c4b237..1d3902d7a8aed 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.proto #include "google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h index 00a9c31f24392..5391b5c66221e 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_INTERNAL_TARGET_GRPC_PROXIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc index 3806e729907c9..707184eb1e07e 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_grpc_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetGrpcProxiesTracingConnection::TargetGrpcProxiesTracingConnection( std::shared_ptr child) @@ -164,18 +162,14 @@ TargetGrpcProxiesTracingConnection::PatchTargetGrpcProxy( child_->PatchTargetGrpcProxy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetGrpcProxiesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.h b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.h index 7dbc5bee69a20..c0c5c26b9281d 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.h +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_grpc_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetGrpcProxiesTracingConnection : public compute_target_grpc_proxies_v1::TargetGrpcProxiesConnection { public: @@ -93,8 +91,6 @@ class TargetGrpcProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection.h b/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection.h index 4879df0421d8b..ed109627165a4 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection.h +++ b/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_TARGET_GRPC_PROXIES_CONNECTION_H #include "google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_retry_traits.h" +#include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.pb.h" #include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection_idempotency_policy.h b/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection_idempotency_policy.h index a38b196c604d7..c6f23ae610eca 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_TARGET_GRPC_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_TARGET_GRPC_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_proto_export.h b/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_proto_export.h index f965bef8456c7..d59c48640a678 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_proto_export.h +++ b/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_TARGET_GRPC_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_133.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_GRPC_PROXIES_V1_TARGET_GRPC_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_connection_impl.h b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_connection_impl.h index 25dcf12c64a77..61218148da9c0 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_connection_impl.h +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h" #include "google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_retry_traits.h" #include "google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_logging_decorator.h b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_logging_decorator.h index b67788e056eed..ccab17a999154 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h" +#include "google/cloud/compute/target_http_proxies/v1/target_http_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_metadata_decorator.h b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_metadata_decorator.h index 84dd2f2a3ba5b..9eb912a9c67b1 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h" +#include "google/cloud/compute/target_http_proxies/v1/target_http_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc index 12b5e8a5e5cea..d2d0f92625bbd 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_http_proxies/v1/target_http_proxies.proto #include "google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_http_proxies/v1/target_http_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h index 220758080d1ba..add5b5fda859c 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_INTERNAL_TARGET_HTTP_PROXIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_http_proxies/v1/target_http_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc index 7e5bc76f1dce7..be30397ac8c9a 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_http_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetHttpProxiesTracingConnection::TargetHttpProxiesTracingConnection( std::shared_ptr child) @@ -209,18 +207,14 @@ TargetHttpProxiesTracingConnection::SetUrlMap( return internal::EndSpan(std::move(span), child_->SetUrlMap(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetHttpProxiesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.h b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.h index 2a90ae4579aa0..fe8b9d3d7050b 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.h +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_http_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetHttpProxiesTracingConnection : public compute_target_http_proxies_v1::TargetHttpProxiesConnection { public: @@ -111,8 +109,6 @@ class TargetHttpProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection.h b/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection.h index 3a28cd0a442f5..fe2b3355f8786 100644 --- a/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection.h +++ b/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_TARGET_HTTP_PROXIES_CONNECTION_H #include "google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_retry_traits.h" +#include "google/cloud/compute/target_http_proxies/v1/target_http_proxies.pb.h" #include "google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection_idempotency_policy.h b/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection_idempotency_policy.h index 7c6cf422c574e..37e384de31c50 100644 --- a/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/target_http_proxies/v1/target_http_proxies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_TARGET_HTTP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_TARGET_HTTP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_http_proxies/v1/target_http_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_http_proxies/v1/target_http_proxies_proto_export.h b/google/cloud/compute/target_http_proxies/v1/target_http_proxies_proto_export.h index 4226998faa807..98f1de712447b 100644 --- a/google/cloud/compute/target_http_proxies/v1/target_http_proxies_proto_export.h +++ b/google/cloud/compute/target_http_proxies/v1/target_http_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_TARGET_HTTP_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_134.pb.h" +#include "google/cloud/compute/v1/internal/common_135.pb.h" +#include "google/cloud/compute/v1/internal/common_147.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTP_PROXIES_V1_TARGET_HTTP_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_connection_impl.h b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_connection_impl.h index d459270712994..b545920ebce98 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_connection_impl.h +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_connection_impl.h @@ -20,6 +20,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h" #include "google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_retry_traits.h" #include "google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_logging_decorator.h b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_logging_decorator.h index 695e8dcab4b22..fafd52b30f5b9 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_logging_decorator.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h" +#include "google/cloud/compute/target_https_proxies/v1/target_https_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_metadata_decorator.h b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_metadata_decorator.h index 66ced86a67312..d04093c0c2303 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_metadata_decorator.h @@ -20,12 +20,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h" +#include "google/cloud/compute/target_https_proxies/v1/target_https_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc index b944461c8df24..a9288624ec240 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc @@ -18,12 +18,12 @@ // google/cloud/compute/target_https_proxies/v1/target_https_proxies.proto #include "google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_https_proxies/v1/target_https_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h index f200b5782ffe3..bfb36ac6112ab 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.h @@ -20,13 +20,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_INTERNAL_TARGET_HTTPS_PROXIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_https_proxies/v1/target_https_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc index 23000669654cc..5e88c40d576af 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_https_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetHttpsProxiesTracingConnection::TargetHttpsProxiesTracingConnection( std::shared_ptr< compute_target_https_proxies_v1::TargetHttpsProxiesConnection> @@ -348,19 +346,15 @@ TargetHttpsProxiesTracingConnection::SetUrlMap( return internal::EndSpan(std::move(span), child_->SetUrlMap(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetHttpsProxiesTracingConnection( std::shared_ptr< compute_target_https_proxies_v1::TargetHttpsProxiesConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.h b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.h index 3985209fb2b68..075ec6d7ce00c 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.h +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace compute_target_https_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetHttpsProxiesTracingConnection : public compute_target_https_proxies_v1::TargetHttpsProxiesConnection { public: @@ -159,8 +157,6 @@ class TargetHttpsProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection.h b/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection.h index 63653f3bfd723..8902f47b1f666 100644 --- a/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection.h +++ b/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_TARGET_HTTPS_PROXIES_CONNECTION_H #include "google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_retry_traits.h" +#include "google/cloud/compute/target_https_proxies/v1/target_https_proxies.pb.h" #include "google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -31,7 +32,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection_idempotency_policy.h b/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection_idempotency_policy.h index 8329a21af5e5b..f7dc253e31e08 100644 --- a/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/target_https_proxies/v1/target_https_proxies_connection_idempotency_policy.h @@ -20,9 +20,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_TARGET_HTTPS_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_TARGET_HTTPS_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_https_proxies/v1/target_https_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_https_proxies/v1/target_https_proxies_proto_export.h b/google/cloud/compute/target_https_proxies/v1/target_https_proxies_proto_export.h index ec551c842c66a..3bff5a44ef7e2 100644 --- a/google/cloud/compute/target_https_proxies/v1/target_https_proxies_proto_export.h +++ b/google/cloud/compute/target_https_proxies/v1/target_https_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_TARGET_HTTPS_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_129.pb.h" +#include "google/cloud/compute/v1/internal/common_136.pb.h" +#include "google/cloud/compute/v1/internal/common_137.pb.h" +#include "google/cloud/compute/v1/internal/common_147.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_HTTPS_PROXIES_V1_TARGET_HTTPS_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_connection_impl.h b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_connection_impl.h index 64b401bfa7e8e..fafcfee77c7e1 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_connection_impl.h +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_connection_impl.h @@ -24,13 +24,13 @@ #include "google/cloud/compute/target_instances/v1/target_instances_connection.h" #include "google/cloud/compute/target_instances/v1/target_instances_connection_idempotency_policy.h" #include "google/cloud/compute/target_instances/v1/target_instances_options.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_logging_decorator.h b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_logging_decorator.h index 84e63190b3c64..10706071bd783 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_logging_decorator.h +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_logging_decorator.h @@ -20,12 +20,12 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_INTERNAL_TARGET_INSTANCES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h" +#include "google/cloud/compute/target_instances/v1/target_instances.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_metadata_decorator.h b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_metadata_decorator.h index b7781db0572aa..ed4a4d6342af1 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_metadata_decorator.h +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_metadata_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_INTERNAL_TARGET_INSTANCES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h" +#include "google/cloud/compute/target_instances/v1/target_instances.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc index 3404912888203..dd4307fbd8091 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_instances/v1/target_instances.proto #include "google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h" +#include "google/cloud/compute/target_instances/v1/target_instances.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h index cf846f1ac808b..dbf138d5470af 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_INTERNAL_TARGET_INSTANCES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_INTERNAL_TARGET_INSTANCES_REST_STUB_H +#include "google/cloud/compute/target_instances/v1/target_instances.pb.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc b/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc index fb0bfa139bd90..938a614b5f807 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_instances_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetInstancesTracingConnection::TargetInstancesTracingConnection( std::shared_ptr child) @@ -178,17 +176,13 @@ TargetInstancesTracingConnection::SetSecurityPolicy( child_->SetSecurityPolicy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetInstancesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.h b/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.h index 8d8ef6d65b7ce..049586b689e60 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.h +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_instances_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetInstancesTracingConnection : public compute_target_instances_v1::TargetInstancesConnection { public: @@ -96,8 +94,6 @@ class TargetInstancesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_instances/v1/target_instances_connection.h b/google/cloud/compute/target_instances/v1/target_instances_connection.h index aacef0d8e12c4..18eb77a6bdd44 100644 --- a/google/cloud/compute/target_instances/v1/target_instances_connection.h +++ b/google/cloud/compute/target_instances/v1/target_instances_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_TARGET_INSTANCES_CONNECTION_H #include "google/cloud/compute/target_instances/v1/internal/target_instances_retry_traits.h" +#include "google/cloud/compute/target_instances/v1/target_instances.pb.h" #include "google/cloud/compute/target_instances/v1/target_instances_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_instances/v1/target_instances_connection_idempotency_policy.h b/google/cloud/compute/target_instances/v1/target_instances_connection_idempotency_policy.h index debcb3fc7ce9f..766e3771e1fc4 100644 --- a/google/cloud/compute/target_instances/v1/target_instances_connection_idempotency_policy.h +++ b/google/cloud/compute/target_instances/v1/target_instances_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_TARGET_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_TARGET_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_instances/v1/target_instances.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_instances/v1/target_instances_proto_export.h b/google/cloud/compute/target_instances/v1/target_instances_proto_export.h index e40b4a44d80ee..4c9edebaabaf2 100644 --- a/google/cloud/compute/target_instances/v1/target_instances_proto_export.h +++ b/google/cloud/compute/target_instances/v1/target_instances_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_TARGET_INSTANCES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_118.pb.h" +#include "google/cloud/compute/v1/internal/common_138.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_INSTANCES_V1_TARGET_INSTANCES_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_connection_impl.h b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_connection_impl.h index 3209854375ee7..e564a34d379c8 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_connection_impl.h +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h" #include "google/cloud/compute/target_pools/v1/internal/target_pools_retry_traits.h" #include "google/cloud/compute/target_pools/v1/target_pools_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_logging_decorator.h b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_logging_decorator.h index 8237059e64fd2..1db83a1253083 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_logging_decorator.h +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h" +#include "google/cloud/compute/target_pools/v1/target_pools.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_metadata_decorator.h b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_metadata_decorator.h index 42e5116a3d807..7d31c4e6af8af 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_metadata_decorator.h +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h" +#include "google/cloud/compute/target_pools/v1/target_pools.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc index b1473a9493ec4..aa152d007abfa 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_pools/v1/target_pools.proto #include "google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/target_pools/v1/target_pools.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h index 2ae04cc765284..6f6691f901265 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_INTERNAL_TARGET_POOLS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/target_pools/v1/target_pools.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc b/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc index 4742233bcb6db..793b6810d6017 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_pools_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetPoolsTracingConnection::TargetPoolsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -327,16 +325,12 @@ TargetPoolsTracingConnection::SetSecurityPolicy( child_->SetSecurityPolicy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetPoolsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.h b/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.h index ac6d45abd3037..f119b0ba11fb4 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.h +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_pools_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetPoolsTracingConnection : public compute_target_pools_v1::TargetPoolsConnection { public: @@ -154,8 +152,6 @@ class TargetPoolsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_pools/v1/target_pools_connection.h b/google/cloud/compute/target_pools/v1/target_pools_connection.h index 41b1fae1dcf94..4cb09cef7221a 100644 --- a/google/cloud/compute/target_pools/v1/target_pools_connection.h +++ b/google/cloud/compute/target_pools/v1/target_pools_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_TARGET_POOLS_CONNECTION_H #include "google/cloud/compute/target_pools/v1/internal/target_pools_retry_traits.h" +#include "google/cloud/compute/target_pools/v1/target_pools.pb.h" #include "google/cloud/compute/target_pools/v1/target_pools_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_pools/v1/target_pools_connection_idempotency_policy.h b/google/cloud/compute/target_pools/v1/target_pools_connection_idempotency_policy.h index 2a286426640e4..fd9dafc079137 100644 --- a/google/cloud/compute/target_pools/v1/target_pools_connection_idempotency_policy.h +++ b/google/cloud/compute/target_pools/v1/target_pools_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_TARGET_POOLS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_TARGET_POOLS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_pools/v1/target_pools.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_pools/v1/target_pools_proto_export.h b/google/cloud/compute/target_pools/v1/target_pools_proto_export.h index 5372cb74bd4dd..c38bcff3b167b 100644 --- a/google/cloud/compute/target_pools/v1/target_pools_proto_export.h +++ b/google/cloud/compute/target_pools/v1/target_pools_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_TARGET_POOLS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_049.pb.h" +#include "google/cloud/compute/v1/internal/common_052.pb.h" +#include "google/cloud/compute/v1/internal/common_063.pb.h" +#include "google/cloud/compute/v1/internal/common_118.pb.h" +#include "google/cloud/compute/v1/internal/common_139.pb.h" +#include "google/cloud/compute/v1/internal/common_140.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_POOLS_V1_TARGET_POOLS_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_connection_impl.h b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_connection_impl.h index 9052641469070..978f6954b4b4e 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_connection_impl.h +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h" #include "google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_retry_traits.h" #include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_logging_decorator.h b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_logging_decorator.h index be5db1f1706e6..590327bf0e574 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h" +#include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_metadata_decorator.h b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_metadata_decorator.h index a92c472a72108..89f83ebe7df1e 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h" +#include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc index 7f45b90ab5bc1..8ceb97776cf32 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.proto #include "google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h index 2e92f6191edfd..9ce8af0d9b570 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_INTERNAL_TARGET_SSL_PROXIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc index 79138a9bd7a0b..c6f282c81fea4 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_ssl_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetSslProxiesTracingConnection::TargetSslProxiesTracingConnection( std::shared_ptr child) @@ -297,17 +295,13 @@ TargetSslProxiesTracingConnection::SetSslPolicy( return internal::EndSpan(std::move(span), child_->SetSslPolicy(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetSslProxiesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.h b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.h index 6baa93fcf5e82..57feb389d0b73 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.h +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_ssl_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetSslProxiesTracingConnection : public compute_target_ssl_proxies_v1::TargetSslProxiesConnection { public: @@ -136,8 +134,6 @@ class TargetSslProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection.h b/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection.h index 864cbdcc0046a..f616b746a18a3 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection.h +++ b/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_TARGET_SSL_PROXIES_CONNECTION_H #include "google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_retry_traits.h" +#include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.pb.h" #include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection_idempotency_policy.h b/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection_idempotency_policy.h index 27d03f7e67e98..354e5032c8d85 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_TARGET_SSL_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_TARGET_SSL_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_proto_export.h b/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_proto_export.h index 3684ffdecce99..2518416d36cba 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_proto_export.h +++ b/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_TARGET_SSL_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_129.pb.h" +#include "google/cloud/compute/v1/internal/common_141.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_SSL_PROXIES_V1_TARGET_SSL_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_connection_impl.h b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_connection_impl.h index bf8db86620175..8db7fb3d62c69 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_connection_impl.h +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h" #include "google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_retry_traits.h" #include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_logging_decorator.h b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_logging_decorator.h index cca46f131d861..32a13953a0756 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_logging_decorator.h +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h" +#include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_metadata_decorator.h b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_metadata_decorator.h index 787320a69916a..857d0dbd28f4f 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_metadata_decorator.h +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h" +#include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc index fb0b05a9f65bc..902f3ba175ee2 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.proto #include "google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h index 208143b989f97..4b88f8554ec80 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_INTERNAL_TARGET_TCP_PROXIES_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc index 63b252994d77b..90c2c77e2bf1a 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_tcp_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetTcpProxiesTracingConnection::TargetTcpProxiesTracingConnection( std::shared_ptr child) @@ -212,17 +210,13 @@ TargetTcpProxiesTracingConnection::SetProxyHeader( return internal::EndSpan(std::move(span), child_->SetProxyHeader(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetTcpProxiesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.h b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.h index e2ec695e6a367..7e47641266caa 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.h +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_tcp_proxies_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetTcpProxiesTracingConnection : public compute_target_tcp_proxies_v1::TargetTcpProxiesConnection { public: @@ -107,8 +105,6 @@ class TargetTcpProxiesTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection.h b/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection.h index e7adcffc8205c..a03358010eee0 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection.h +++ b/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_TARGET_TCP_PROXIES_CONNECTION_H #include "google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_retry_traits.h" +#include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.pb.h" #include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection_idempotency_policy.h b/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection_idempotency_policy.h index 920e1640f65d9..71168c8ed4cb7 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection_idempotency_policy.h +++ b/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_TARGET_TCP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_TARGET_TCP_PROXIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_proto_export.h b/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_proto_export.h index 0ad9170d5f09c..d8adacff18dd7 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_proto_export.h +++ b/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_TARGET_TCP_PROXIES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_142.pb.h" +#include "google/cloud/compute/v1/internal/common_143.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_TCP_PROXIES_V1_TARGET_TCP_PROXIES_PROTO_EXPORT_H diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_connection_impl.h b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_connection_impl.h index 3d04e1d1dd402..7ededcd86ba8e 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_connection_impl.h +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h" #include "google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_retry_traits.h" #include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_logging_decorator.h b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_logging_decorator.h index eed118e6869b8..d4fc9b9eae80b 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_logging_decorator.h +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h" +#include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_metadata_decorator.h b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_metadata_decorator.h index e86bd8cc995c5..64a040462ccee 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_metadata_decorator.h +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h" +#include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc index 1b735cc8bb792..fb094bd964c07 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.proto #include "google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h index 6fc29d3fefe78..22ecf1e2a45a8 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_INTERNAL_TARGET_VPN_GATEWAYS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc index 41b830f04bd44..fcabd315ecc39 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_target_vpn_gateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TargetVpnGatewaysTracingConnection::TargetVpnGatewaysTracingConnection( std::shared_ptr child) @@ -174,18 +172,14 @@ TargetVpnGatewaysTracingConnection::SetLabels( return internal::EndSpan(std::move(span), child_->SetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTargetVpnGatewaysTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.h b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.h index 3ad02e905d0de..bdf08a300fe40 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.h +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_target_vpn_gateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TargetVpnGatewaysTracingConnection : public compute_target_vpn_gateways_v1::TargetVpnGatewaysConnection { public: @@ -99,8 +97,6 @@ class TargetVpnGatewaysTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection.h b/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection.h index 86d100d21d472..cbb8ce8b44c82 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection.h +++ b/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_TARGET_VPN_GATEWAYS_CONNECTION_H #include "google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_retry_traits.h" +#include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.pb.h" #include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection_idempotency_policy.h b/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection_idempotency_policy.h index cd40af3fe791a..3b1c3ddd31dcc 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection_idempotency_policy.h +++ b/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_TARGET_VPN_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_TARGET_VPN_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_proto_export.h b/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_proto_export.h index a940d03ac1396..ccdd2e817d00b 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_proto_export.h +++ b/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_TARGET_VPN_GATEWAYS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_144.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_TARGET_VPN_GATEWAYS_V1_TARGET_VPN_GATEWAYS_PROTO_EXPORT_H diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_connection_impl.h b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_connection_impl.h index dc9a2d253b7f2..082b0038ea46b 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_connection_impl.h +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h" #include "google/cloud/compute/url_maps/v1/internal/url_maps_retry_traits.h" #include "google/cloud/compute/url_maps/v1/url_maps_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_logging_decorator.h b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_logging_decorator.h index 4d176a04d960a..8bf58112f8054 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_logging_decorator.h +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h" +#include "google/cloud/compute/url_maps/v1/url_maps.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_metadata_decorator.h b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_metadata_decorator.h index aa770354fe8d6..62eeb60893749 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_metadata_decorator.h +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" #include "google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h" +#include "google/cloud/compute/url_maps/v1/url_maps.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc index a7268e89a6cc2..109b19c49c895 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/url_maps/v1/url_maps.proto #include "google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h" +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/url_maps/v1/url_maps.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h index b7dd4fa6fb8e3..553a9cd6c7ae4 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_INTERNAL_URL_MAPS_REST_STUB_H +#include "google/cloud/compute/global_operations/v1/global_operations.pb.h" +#include "google/cloud/compute/url_maps/v1/url_maps.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc b/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc index 36eb502e47f0f..ffb4a9cc3bd15 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_url_maps_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UrlMapsTracingConnection::UrlMapsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -228,16 +226,12 @@ UrlMapsTracingConnection::Validate( return internal::EndSpan(*span, child_->Validate(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUrlMapsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.h b/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.h index b80fc54b84daa..a4c4382c763d7 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.h +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_url_maps_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UrlMapsTracingConnection : public compute_url_maps_v1::UrlMapsConnection { public: ~UrlMapsTracingConnection() override = default; @@ -121,8 +119,6 @@ class UrlMapsTracingConnection : public compute_url_maps_v1::UrlMapsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/url_maps/v1/url_maps_connection.h b/google/cloud/compute/url_maps/v1/url_maps_connection.h index 49b249a0b4c39..931d51d72d425 100644 --- a/google/cloud/compute/url_maps/v1/url_maps_connection.h +++ b/google/cloud/compute/url_maps/v1/url_maps_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_URL_MAPS_CONNECTION_H #include "google/cloud/compute/url_maps/v1/internal/url_maps_retry_traits.h" +#include "google/cloud/compute/url_maps/v1/url_maps.pb.h" #include "google/cloud/compute/url_maps/v1/url_maps_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/url_maps/v1/url_maps_connection_idempotency_policy.h b/google/cloud/compute/url_maps/v1/url_maps_connection_idempotency_policy.h index 18342e33017f6..b22ff0bec4526 100644 --- a/google/cloud/compute/url_maps/v1/url_maps_connection_idempotency_policy.h +++ b/google/cloud/compute/url_maps/v1/url_maps_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_URL_MAPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_URL_MAPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/url_maps/v1/url_maps.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/url_maps/v1/url_maps_proto_export.h b/google/cloud/compute/url_maps/v1/url_maps_proto_export.h index 973a78197771f..074ac7e920b9c 100644 --- a/google/cloud/compute/url_maps/v1/url_maps_proto_export.h +++ b/google/cloud/compute/url_maps/v1/url_maps_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_URL_MAPS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_018.pb.h" +#include "google/cloud/compute/v1/internal/common_020.pb.h" +#include "google/cloud/compute/v1/internal/common_029.pb.h" +#include "google/cloud/compute/v1/internal/common_082.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_URL_MAPS_V1_URL_MAPS_PROTO_EXPORT_H diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_connection_impl.h b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_connection_impl.h index bf6ce1ab85e12..6c564608a821e 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_connection_impl.h +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h" #include "google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_retry_traits.h" #include "google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_logging_decorator.h b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_logging_decorator.h index bf2dca5445bf4..3ccfa5e3ffa92 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_logging_decorator.h +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h" +#include "google/cloud/compute/vpn_gateways/v1/vpn_gateways.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_metadata_decorator.h b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_metadata_decorator.h index f9ba0a6838a8a..c8fbae65e9b6c 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_metadata_decorator.h +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h" +#include "google/cloud/compute/vpn_gateways/v1/vpn_gateways.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc index ea1ead991e1af..57b792de59674 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/vpn_gateways/v1/vpn_gateways.proto #include "google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/vpn_gateways/v1/vpn_gateways.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h index b5f76079a2939..961bb88a11bd6 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_INTERNAL_VPN_GATEWAYS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/vpn_gateways/v1/vpn_gateways.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc index efea810f31237..4933537e60b8f 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_vpn_gateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VpnGatewaysTracingConnection::VpnGatewaysTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -183,16 +181,12 @@ VpnGatewaysTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVpnGatewaysTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.h b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.h index 3091e646922e8..df23fbb318111 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.h +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_vpn_gateways_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VpnGatewaysTracingConnection : public compute_vpn_gateways_v1::VpnGatewaysConnection { public: @@ -101,8 +99,6 @@ class VpnGatewaysTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection.h b/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection.h index 20a67db7e0f4d..0e06980fcf430 100644 --- a/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection.h +++ b/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_VPN_GATEWAYS_CONNECTION_H #include "google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_retry_traits.h" +#include "google/cloud/compute/vpn_gateways/v1/vpn_gateways.pb.h" #include "google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection_idempotency_policy.h b/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection_idempotency_policy.h index 79798c432f4fc..a9b9405463746 100644 --- a/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection_idempotency_policy.h +++ b/google/cloud/compute/vpn_gateways/v1/vpn_gateways_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_VPN_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_VPN_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/vpn_gateways/v1/vpn_gateways.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/vpn_gateways/v1/vpn_gateways_proto_export.h b/google/cloud/compute/vpn_gateways/v1/vpn_gateways_proto_export.h index 52b47e7fecbc0..4511d005df643 100644 --- a/google/cloud/compute/vpn_gateways/v1/vpn_gateways_proto_export.h +++ b/google/cloud/compute/vpn_gateways/v1/vpn_gateways_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_VPN_GATEWAYS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_145.pb.h" +#include "google/cloud/compute/v1/internal/common_148.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_GATEWAYS_V1_VPN_GATEWAYS_PROTO_EXPORT_H diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_connection_impl.h b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_connection_impl.h index a88211da6df67..f0a101cc83ac2 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_connection_impl.h +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_connection_impl.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_CONNECTION_IMPL_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_CONNECTION_IMPL_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h" #include "google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_retry_traits.h" #include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_logging_decorator.h b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_logging_decorator.h index 94de8dff3ac73..517dd0cb0deec 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_logging_decorator.h +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_logging_decorator.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_LOGGING_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h" +#include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include #include #include #include diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_metadata_decorator.h b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_metadata_decorator.h index 66f310c5eaaf9..96c8394dbe23f 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_metadata_decorator.h +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_metadata_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_METADATA_DECORATOR_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" #include "google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h" +#include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc index 1b88c250ed773..2066822f335c0 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc @@ -17,12 +17,12 @@ // source: google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.proto #include "google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h" +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include #include #include diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h index 0cd3f46fd6d22..0c0a379bd8033 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_INTERNAL_VPN_TUNNELS_REST_STUB_H +#include "google/cloud/compute/region_operations/v1/region_operations.pb.h" +#include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc index 705de28107c23..d4fce79e45a66 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_vpn_tunnels_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VpnTunnelsTracingConnection::VpnTunnelsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -162,16 +160,12 @@ VpnTunnelsTracingConnection::SetLabels( return internal::EndSpan(std::move(span), child_->SetLabels(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVpnTunnelsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.h b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.h index 8ebf213bf5267..a3458246108cf 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.h +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_vpn_tunnels_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VpnTunnelsTracingConnection : public compute_vpn_tunnels_v1::VpnTunnelsConnection { public: @@ -92,8 +90,6 @@ class VpnTunnelsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection.h b/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection.h index 99b2340e052df..b07b7b38c371d 100644 --- a/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection.h +++ b/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_VPN_TUNNELS_CONNECTION_H #include "google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_retry_traits.h" +#include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.pb.h" #include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,7 +31,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection_idempotency_policy.h b/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection_idempotency_policy.h index 5bf3eca60b723..5921d87a9869b 100644 --- a/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection_idempotency_policy.h +++ b/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_VPN_TUNNELS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_VPN_TUNNELS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_proto_export.h b/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_proto_export.h index c42f313ac468e..d551a462fbb5f 100644 --- a/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_proto_export.h +++ b/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_VPN_TUNNELS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_107.pb.h" +#include "google/cloud/compute/v1/internal/common_149.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_VPN_TUNNELS_V1_VPN_TUNNELS_PROTO_EXPORT_H diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_logging_decorator.h b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_logging_decorator.h index b7b1201ce9743..8ed9f3fd2c05f 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_logging_decorator.h +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_INTERNAL_ZONE_OPERATIONS_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_metadata_decorator.h b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_metadata_decorator.h index cc6075b63b229..e92f05f9f4240 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_metadata_decorator.h +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_INTERNAL_ZONE_OPERATIONS_REST_METADATA_DECORATOR_H #include "google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc index b8598bda34eb2..a013fb65d52aa 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/zone_operations/v1/zone_operations.proto #include "google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h index eb1531554b7ee..98b8359951da9 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_INTERNAL_ZONE_OPERATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_INTERNAL_ZONE_OPERATIONS_REST_STUB_H +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc b/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc index 38811303c68b0..5c9deadbd7833 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_zone_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ZoneOperationsTracingConnection::ZoneOperationsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -76,17 +74,13 @@ ZoneOperationsTracingConnection::Wait( return internal::EndSpan(*span, child_->Wait(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeZoneOperationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.h b/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.h index a4795a24ca225..fa16aa5f1c01c 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.h +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_zone_operations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ZoneOperationsTracingConnection : public compute_zone_operations_v1::ZoneOperationsConnection { public: @@ -60,8 +58,6 @@ class ZoneOperationsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/zone_operations/v1/zone_operations_connection.h b/google/cloud/compute/zone_operations/v1/zone_operations_connection.h index d4e8903e632f6..f8fb4f8f6ac4e 100644 --- a/google/cloud/compute/zone_operations/v1/zone_operations_connection.h +++ b/google/cloud/compute/zone_operations/v1/zone_operations_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_ZONE_OPERATIONS_CONNECTION_H #include "google/cloud/compute/zone_operations/v1/internal/zone_operations_retry_traits.h" +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/compute/zone_operations/v1/zone_operations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/zone_operations/v1/zone_operations_connection_idempotency_policy.h b/google/cloud/compute/zone_operations/v1/zone_operations_connection_idempotency_policy.h index 17a2c484f4e35..cf63aba8cbf61 100644 --- a/google/cloud/compute/zone_operations/v1/zone_operations_connection_idempotency_policy.h +++ b/google/cloud/compute/zone_operations/v1/zone_operations_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_ZONE_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_ZONE_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/zone_operations/v1/zone_operations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/zone_operations/v1/zone_operations_proto_export.h b/google/cloud/compute/zone_operations/v1/zone_operations_proto_export.h index 9b7e573e93642..f5d9d5a810e1e 100644 --- a/google/cloud/compute/zone_operations/v1/zone_operations_proto_export.h +++ b/google/cloud/compute/zone_operations/v1/zone_operations_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_ZONE_OPERATIONS_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_016.pb.h" +#include "google/cloud/compute/v1/internal/common_092.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONE_OPERATIONS_V1_ZONE_OPERATIONS_PROTO_EXPORT_H diff --git a/google/cloud/compute/zones/v1/internal/zones_rest_logging_decorator.h b/google/cloud/compute/zones/v1/internal/zones_rest_logging_decorator.h index ade0bbe161b82..3abbe0f97d2ef 100644 --- a/google/cloud/compute/zones/v1/internal/zones_rest_logging_decorator.h +++ b/google/cloud/compute/zones/v1/internal/zones_rest_logging_decorator.h @@ -20,11 +20,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_INTERNAL_ZONES_REST_LOGGING_DECORATOR_H #include "google/cloud/compute/zones/v1/internal/zones_rest_stub.h" +#include "google/cloud/compute/zones/v1/zones.pb.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/compute/zones/v1/internal/zones_rest_metadata_decorator.h b/google/cloud/compute/zones/v1/internal/zones_rest_metadata_decorator.h index d3786c361782d..0a8ad4bf1c067 100644 --- a/google/cloud/compute/zones/v1/internal/zones_rest_metadata_decorator.h +++ b/google/cloud/compute/zones/v1/internal/zones_rest_metadata_decorator.h @@ -20,10 +20,10 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_INTERNAL_ZONES_REST_METADATA_DECORATOR_H #include "google/cloud/compute/zones/v1/internal/zones_rest_stub.h" +#include "google/cloud/compute/zones/v1/zones.pb.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc b/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc index ec35fce04a606..6642970c0c950 100644 --- a/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc +++ b/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/compute/zones/v1/zones.proto #include "google/cloud/compute/zones/v1/internal/zones_rest_stub.h" +#include "google/cloud/compute/zones/v1/zones.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/compute/zones/v1/internal/zones_rest_stub.h b/google/cloud/compute/zones/v1/internal/zones_rest_stub.h index 30d33cfc52a98..86c7bb5545414 100644 --- a/google/cloud/compute/zones/v1/internal/zones_rest_stub.h +++ b/google/cloud/compute/zones/v1/internal/zones_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_INTERNAL_ZONES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_INTERNAL_ZONES_REST_STUB_H +#include "google/cloud/compute/zones/v1/zones.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc b/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc index 4b6cfa2f18095..53f12ce3d31aa 100644 --- a/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc +++ b/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace compute_zones_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ZonesTracingConnection::ZonesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -51,15 +49,11 @@ ZonesTracingConnection::ListZones( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeZonesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/compute/zones/v1/internal/zones_tracing_connection.h b/google/cloud/compute/zones/v1/internal/zones_tracing_connection.h index 7057f347987fe..7677441534d0d 100644 --- a/google/cloud/compute/zones/v1/internal/zones_tracing_connection.h +++ b/google/cloud/compute/zones/v1/internal/zones_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace compute_zones_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ZonesTracingConnection : public compute_zones_v1::ZonesConnection { public: ~ZonesTracingConnection() override = default; @@ -51,8 +49,6 @@ class ZonesTracingConnection : public compute_zones_v1::ZonesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/compute/zones/v1/zones_connection.h b/google/cloud/compute/zones/v1/zones_connection.h index 326f8bfee0292..5a999723a6eab 100644 --- a/google/cloud/compute/zones/v1/zones_connection.h +++ b/google/cloud/compute/zones/v1/zones_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_ZONES_CONNECTION_H #include "google/cloud/compute/zones/v1/internal/zones_retry_traits.h" +#include "google/cloud/compute/zones/v1/zones.pb.h" #include "google/cloud/compute/zones/v1/zones_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/zones/v1/zones_connection_idempotency_policy.h b/google/cloud/compute/zones/v1/zones_connection_idempotency_policy.h index c8ac6e8ac446f..bcc7d5cccc30b 100644 --- a/google/cloud/compute/zones/v1/zones_connection_idempotency_policy.h +++ b/google/cloud/compute/zones/v1/zones_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_ZONES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_ZONES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/compute/zones/v1/zones.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/compute/zones/v1/zones_proto_export.h b/google/cloud/compute/zones/v1/zones_proto_export.h index a8376516acddf..be0f981cd6a7b 100644 --- a/google/cloud/compute/zones/v1/zones_proto_export.h +++ b/google/cloud/compute/zones/v1/zones_proto_export.h @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_ZONES_PROTO_EXPORT_H // IWYU pragma: begin_exports -#include -#include +#include "google/cloud/compute/v1/internal/common_023.pb.h" +#include "google/cloud/compute/v1/internal/common_150.pb.h" // IWYU pragma: end_exports #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPUTE_ZONES_V1_ZONES_PROTO_EXPORT_H diff --git a/google/cloud/confidentialcomputing/BUILD.bazel b/google/cloud/confidentialcomputing/BUILD.bazel index 472ceffc849d7..e02a81d44a4a7 100644 --- a/google/cloud/confidentialcomputing/BUILD.bazel +++ b/google/cloud/confidentialcomputing/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/confidentialcomputing/v1:confidentialcomputing_cc_grpc", + "@googleapis//google/cloud/confidentialcomputing/v1:confidentialcomputing_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/confidentialcomputing/quickstart/.bazelrc b/google/cloud/confidentialcomputing/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/confidentialcomputing/quickstart/.bazelrc +++ b/google/cloud/confidentialcomputing/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/confidentialcomputing/v1/confidential_computing_connection.h b/google/cloud/confidentialcomputing/v1/confidential_computing_connection.h index 8fd5df94cb5d6..d5fd77ad8ee68 100644 --- a/google/cloud/confidentialcomputing/v1/confidential_computing_connection.h +++ b/google/cloud/confidentialcomputing/v1/confidential_computing_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/confidentialcomputing/v1/confidential_computing_connection_idempotency_policy.h" #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_retry_traits.h" +#include "google/cloud/confidentialcomputing/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/confidentialcomputing/v1/confidential_computing_connection_idempotency_policy.h b/google/cloud/confidentialcomputing/v1/confidential_computing_connection_idempotency_policy.h index 17cb6121d061f..9794b2586f4ec 100644 --- a/google/cloud/confidentialcomputing/v1/confidential_computing_connection_idempotency_policy.h +++ b/google/cloud/confidentialcomputing/v1/confidential_computing_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIDENTIALCOMPUTING_V1_CONFIDENTIAL_COMPUTING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIDENTIALCOMPUTING_V1_CONFIDENTIAL_COMPUTING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/confidentialcomputing/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_auth_decorator.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_auth_decorator.cc index bf79dc0072be2..252c663cc7436 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_auth_decorator.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/confidentialcomputing/v1/service.proto #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_auth_decorator.h" -#include +#include "google/cloud/confidentialcomputing/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_logging_decorator.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_logging_decorator.cc index 2a4e0204765fd..75f119643e924 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_logging_decorator.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/confidentialcomputing/v1/service.proto #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_logging_decorator.h" +#include "google/cloud/confidentialcomputing/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_metadata_decorator.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_metadata_decorator.cc index 9112e6878a103..81987ce61899c 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_metadata_decorator.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/confidentialcomputing/v1/service.proto #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_metadata_decorator.h" +#include "google/cloud/confidentialcomputing/v1/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 #include #include #include diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.cc index cfb5024546604..b10f4e10900d7 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/confidentialcomputing/v1/service.proto #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.h" +#include "google/cloud/confidentialcomputing/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.h b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.h index 7dc8bfeb6380d..b7b204a548581 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.h +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIDENTIALCOMPUTING_V1_INTERNAL_CONFIDENTIAL_COMPUTING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIDENTIALCOMPUTING_V1_INTERNAL_CONFIDENTIAL_COMPUTING_STUB_H +#include "google/cloud/confidentialcomputing/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub_factory.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub_factory.cc index 7103c3697ec62..a952cd221ba9f 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub_factory.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_metadata_decorator.h" #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_stub.h" #include "google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.h" +#include "google/cloud/confidentialcomputing/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include #include #include diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.cc index 96c7ec4bafb85..4389d1f4ccff4 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace confidentialcomputing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfidentialComputingTracingConnection::ConfidentialComputingTracingConnection( std::shared_ptr child) @@ -101,18 +99,14 @@ ConfidentialComputingTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfidentialComputingTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.h b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.h index 273159a152136..c70e74c69ff82 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.h +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace confidentialcomputing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfidentialComputingTracingConnection : public confidentialcomputing_v1::ConfidentialComputingConnection { public: @@ -73,8 +71,6 @@ class ConfidentialComputingTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.cc b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.cc index bfdb263a5aec3..2d4a684f3c641 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.cc +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace confidentialcomputing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfidentialComputingTracingStub::ConfidentialComputingTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -117,15 +115,9 @@ ConfidentialComputingTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfidentialComputingTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.h b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.h index 15eb0228d957c..bd1cecd413b62 100644 --- a/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.h +++ b/google/cloud/confidentialcomputing/v1/internal/confidential_computing_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace confidentialcomputing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfidentialComputingTracingStub : public ConfidentialComputingStub { public: ~ConfidentialComputingTracingStub() override = default; @@ -78,8 +76,6 @@ class ConfidentialComputingTracingStub : public ConfidentialComputingStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/config/BUILD.bazel b/google/cloud/config/BUILD.bazel index b9fc4817edc99..de37451c99310 100644 --- a/google/cloud/config/BUILD.bazel +++ b/google/cloud/config/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/config/v1:config_cc_grpc", + "@googleapis//google/cloud/config/v1:config_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/config/quickstart/.bazelrc b/google/cloud/config/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/config/quickstart/.bazelrc +++ b/google/cloud/config/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/config/v1/config_client.h b/google/cloud/config/v1/config_client.h index 8516a460ae0c3..86cfe977186ba 100644 --- a/google/cloud/config/v1/config_client.h +++ b/google/cloud/config/v1/config_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/config/v1/config_connection.h b/google/cloud/config/v1/config_connection.h index 63d160fe944cf..d545850bd0069 100644 --- a/google/cloud/config/v1/config_connection.h +++ b/google/cloud/config/v1/config_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIG_V1_CONFIG_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIG_V1_CONFIG_CONNECTION_H +#include "google/cloud/config/v1/config.pb.h" #include "google/cloud/config/v1/config_connection_idempotency_policy.h" #include "google/cloud/config/v1/internal/config_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/config/v1/config_connection_idempotency_policy.h b/google/cloud/config/v1/config_connection_idempotency_policy.h index 3b80f27908b53..f427a9fa36099 100644 --- a/google/cloud/config/v1/config_connection_idempotency_policy.h +++ b/google/cloud/config/v1/config_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIG_V1_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIG_V1_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/config/v1/config.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/config/v1/internal/config_auth_decorator.cc b/google/cloud/config/v1/internal/config_auth_decorator.cc index c66f3f2fce27c..eef253d9c96b6 100644 --- a/google/cloud/config/v1/internal/config_auth_decorator.cc +++ b/google/cloud/config/v1/internal/config_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/config/v1/config.proto #include "google/cloud/config/v1/internal/config_auth_decorator.h" -#include +#include "google/cloud/config/v1/config.grpc.pb.h" #include #include diff --git a/google/cloud/config/v1/internal/config_auth_decorator.h b/google/cloud/config/v1/internal/config_auth_decorator.h index 2e17bad65c0f7..bec9b8aaa3b99 100644 --- a/google/cloud/config/v1/internal/config_auth_decorator.h +++ b/google/cloud/config/v1/internal/config_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/config/v1/internal/config_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/config/v1/internal/config_connection_impl.h b/google/cloud/config/v1/internal/config_connection_impl.h index 7b18041b8e767..61e000408ae19 100644 --- a/google/cloud/config/v1/internal/config_connection_impl.h +++ b/google/cloud/config/v1/internal/config_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/config/v1/internal/config_logging_decorator.cc b/google/cloud/config/v1/internal/config_logging_decorator.cc index 78bc2e548acda..68f9474742f6f 100644 --- a/google/cloud/config/v1/internal/config_logging_decorator.cc +++ b/google/cloud/config/v1/internal/config_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/config/v1/config.proto #include "google/cloud/config/v1/internal/config_logging_decorator.h" +#include "google/cloud/config/v1/config.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/config/v1/internal/config_logging_decorator.h b/google/cloud/config/v1/internal/config_logging_decorator.h index fd8c9352d81df..d5120ec62a95d 100644 --- a/google/cloud/config/v1/internal/config_logging_decorator.h +++ b/google/cloud/config/v1/internal/config_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/config/v1/internal/config_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/config/v1/internal/config_metadata_decorator.cc b/google/cloud/config/v1/internal/config_metadata_decorator.cc index fad4d059fa8f4..eb6acb771582d 100644 --- a/google/cloud/config/v1/internal/config_metadata_decorator.cc +++ b/google/cloud/config/v1/internal/config_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/config/v1/config.proto #include "google/cloud/config/v1/internal/config_metadata_decorator.h" +#include "google/cloud/config/v1/config.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 #include #include #include diff --git a/google/cloud/config/v1/internal/config_metadata_decorator.h b/google/cloud/config/v1/internal/config_metadata_decorator.h index d26975cf55772..5aef4f1df2d7a 100644 --- a/google/cloud/config/v1/internal/config_metadata_decorator.h +++ b/google/cloud/config/v1/internal/config_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/config/v1/internal/config_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/config/v1/internal/config_stub.cc b/google/cloud/config/v1/internal/config_stub.cc index 133149032ff59..834d20c7c0734 100644 --- a/google/cloud/config/v1/internal/config_stub.cc +++ b/google/cloud/config/v1/internal/config_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/config/v1/config.proto #include "google/cloud/config/v1/internal/config_stub.h" +#include "google/cloud/config/v1/config.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/config/v1/internal/config_stub.h b/google/cloud/config/v1/internal/config_stub.h index 6aaf05feaec6c..2c665d23c2f12 100644 --- a/google/cloud/config/v1/internal/config_stub.h +++ b/google/cloud/config/v1/internal/config_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIG_V1_INTERNAL_CONFIG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIG_V1_INTERNAL_CONFIG_STUB_H +#include "google/cloud/config/v1/config.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/config/v1/internal/config_stub_factory.cc b/google/cloud/config/v1/internal/config_stub_factory.cc index e24c8dfd41525..838ef792a7385 100644 --- a/google/cloud/config/v1/internal/config_stub_factory.cc +++ b/google/cloud/config/v1/internal/config_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/config/v1/config.proto #include "google/cloud/config/v1/internal/config_stub_factory.h" +#include "google/cloud/config/v1/config.grpc.pb.h" #include "google/cloud/config/v1/internal/config_auth_decorator.h" #include "google/cloud/config/v1/internal/config_logging_decorator.h" #include "google/cloud/config/v1/internal/config_metadata_decorator.h" #include "google/cloud/config/v1/internal/config_stub.h" #include "google/cloud/config/v1/internal/config_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/config/v1/internal/config_tracing_connection.cc b/google/cloud/config/v1/internal/config_tracing_connection.cc index 7d6c5781d386a..a7a1e82e25e0f 100644 --- a/google/cloud/config/v1/internal/config_tracing_connection.cc +++ b/google/cloud/config/v1/internal/config_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace config_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigTracingConnection::ConfigTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -489,15 +487,11 @@ Status ConfigTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/config/v1/internal/config_tracing_connection.h b/google/cloud/config/v1/internal/config_tracing_connection.h index 91afa1aa0c887..7cc9b5b5793cc 100644 --- a/google/cloud/config/v1/internal/config_tracing_connection.h +++ b/google/cloud/config/v1/internal/config_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace config_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigTracingConnection : public config_v1::ConfigConnection { public: ~ConfigTracingConnection() override = default; @@ -218,8 +216,6 @@ class ConfigTracingConnection : public config_v1::ConfigConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/config/v1/internal/config_tracing_stub.cc b/google/cloud/config/v1/internal/config_tracing_stub.cc index 44046d4ffd923..300476d95a08b 100644 --- a/google/cloud/config/v1/internal/config_tracing_stub.cc +++ b/google/cloud/config/v1/internal/config_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace config_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigTracingStub::ConfigTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -579,15 +577,9 @@ future ConfigTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/config/v1/internal/config_tracing_stub.h b/google/cloud/config/v1/internal/config_tracing_stub.h index f0cd1a9c24d5e..fa4d3d3047b4b 100644 --- a/google/cloud/config/v1/internal/config_tracing_stub.h +++ b/google/cloud/config/v1/internal/config_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace config_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigTracingStub : public ConfigStub { public: ~ConfigTracingStub() override = default; @@ -265,8 +263,6 @@ class ConfigTracingStub : public ConfigStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/configdelivery/BUILD.bazel b/google/cloud/configdelivery/BUILD.bazel index 1444e57dd280f..b0f3ef668a7f7 100644 --- a/google/cloud/configdelivery/BUILD.bazel +++ b/google/cloud/configdelivery/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/configdelivery/v1:configdelivery_cc_grpc", + "@googleapis//google/cloud/configdelivery/v1:configdelivery_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/configdelivery/v1/config_delivery_client.h b/google/cloud/configdelivery/v1/config_delivery_client.h index eb7c386a0ec93..c1d232b434266 100644 --- a/google/cloud/configdelivery/v1/config_delivery_client.h +++ b/google/cloud/configdelivery/v1/config_delivery_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/configdelivery/v1/config_delivery_connection.h b/google/cloud/configdelivery/v1/config_delivery_connection.h index d462068e43eec..c83b451b9009c 100644 --- a/google/cloud/configdelivery/v1/config_delivery_connection.h +++ b/google/cloud/configdelivery/v1/config_delivery_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIGDELIVERY_V1_CONFIG_DELIVERY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIGDELIVERY_V1_CONFIG_DELIVERY_CONNECTION_H +#include "google/cloud/configdelivery/v1/config_delivery.pb.h" #include "google/cloud/configdelivery/v1/config_delivery_connection_idempotency_policy.h" #include "google/cloud/configdelivery/v1/internal/config_delivery_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/configdelivery/v1/config_delivery_connection_idempotency_policy.h b/google/cloud/configdelivery/v1/config_delivery_connection_idempotency_policy.h index b0326d395f790..eca0b270e9a87 100644 --- a/google/cloud/configdelivery/v1/config_delivery_connection_idempotency_policy.h +++ b/google/cloud/configdelivery/v1/config_delivery_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIGDELIVERY_V1_CONFIG_DELIVERY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIGDELIVERY_V1_CONFIG_DELIVERY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/configdelivery/v1/config_delivery.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.cc b/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.cc index f09273505ba3d..8cf684438aa07 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/configdelivery/v1/config_delivery.proto #include "google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.h" -#include +#include "google/cloud/configdelivery/v1/config_delivery.grpc.pb.h" #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.h b/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.h index 81e7e338c201c..9a25d4c1e87f3 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/configdelivery/v1/internal/config_delivery_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_connection_impl.h b/google/cloud/configdelivery/v1/internal/config_delivery_connection_impl.h index 4aa8dda1309a4..1f55eb2ed0cf3 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_connection_impl.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.cc b/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.cc index 989c51757fb60..e89813dfae07a 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/configdelivery/v1/config_delivery.proto #include "google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.h" +#include "google/cloud/configdelivery/v1/config_delivery.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.h b/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.h index 821fa4e395ecd..707d89eb55c2e 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/configdelivery/v1/internal/config_delivery_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.cc b/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.cc index 8276552cbc883..1fe02186b44ee 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/configdelivery/v1/config_delivery.proto #include "google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.h" +#include "google/cloud/configdelivery/v1/config_delivery.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 #include #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.h b/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.h index f76fe9f041eb5..3f06366bfc5ca 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/configdelivery/v1/internal/config_delivery_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_stub.cc b/google/cloud/configdelivery/v1/internal/config_delivery_stub.cc index 78339da67a3e8..52af0f4b21d5f 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_stub.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/configdelivery/v1/config_delivery.proto #include "google/cloud/configdelivery/v1/internal/config_delivery_stub.h" +#include "google/cloud/configdelivery/v1/config_delivery.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_stub.h b/google/cloud/configdelivery/v1/internal/config_delivery_stub.h index 265ae3c757927..79e1f1e0c5458 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_stub.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIGDELIVERY_V1_INTERNAL_CONFIG_DELIVERY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONFIGDELIVERY_V1_INTERNAL_CONFIG_DELIVERY_STUB_H +#include "google/cloud/configdelivery/v1/config_delivery.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_stub_factory.cc b/google/cloud/configdelivery/v1/internal/config_delivery_stub_factory.cc index ebdd64aa64bb7..05f4f008f4fdc 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_stub_factory.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/configdelivery/v1/config_delivery.proto #include "google/cloud/configdelivery/v1/internal/config_delivery_stub_factory.h" +#include "google/cloud/configdelivery/v1/config_delivery.grpc.pb.h" #include "google/cloud/configdelivery/v1/internal/config_delivery_auth_decorator.h" #include "google/cloud/configdelivery/v1/internal/config_delivery_logging_decorator.h" #include "google/cloud/configdelivery/v1/internal/config_delivery_metadata_decorator.h" #include "google/cloud/configdelivery/v1/internal/config_delivery_stub.h" #include "google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.cc b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.cc index fa6ff7c7415be..7de719809e8c0 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace configdelivery_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigDeliveryTracingConnection::ConfigDeliveryTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -646,16 +644,12 @@ Status ConfigDeliveryTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigDeliveryTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.h b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.h index 10878523305e3..e1b331e4588d9 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace configdelivery_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigDeliveryTracingConnection : public configdelivery_v1::ConfigDeliveryConnection { public: @@ -289,8 +287,6 @@ class ConfigDeliveryTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.cc b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.cc index 74263bff488b0..c33ca566d3211 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.cc +++ b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace configdelivery_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigDeliveryTracingStub::ConfigDeliveryTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -662,15 +660,9 @@ future ConfigDeliveryTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigDeliveryTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.h b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.h index 1aa34c1a8688b..35cc57517f885 100644 --- a/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.h +++ b/google/cloud/configdelivery/v1/internal/config_delivery_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace configdelivery_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigDeliveryTracingStub : public ConfigDeliveryStub { public: ~ConfigDeliveryTracingStub() override = default; @@ -312,8 +310,6 @@ class ConfigDeliveryTracingStub : public ConfigDeliveryStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/connectors/BUILD.bazel b/google/cloud/connectors/BUILD.bazel index ed474bb371edc..0388017908f91 100644 --- a/google/cloud/connectors/BUILD.bazel +++ b/google/cloud/connectors/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/connectors/v1:connectors_cc_grpc", + "@googleapis//google/cloud/connectors/v1:connectors_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/connectors/quickstart/.bazelrc b/google/cloud/connectors/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/connectors/quickstart/.bazelrc +++ b/google/cloud/connectors/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/connectors/v1/connectors_client.h b/google/cloud/connectors/v1/connectors_client.h index 08ad5d3d790f4..0c7af10338d37 100644 --- a/google/cloud/connectors/v1/connectors_client.h +++ b/google/cloud/connectors/v1/connectors_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/connectors/v1/connectors_connection.h b/google/cloud/connectors/v1/connectors_connection.h index 3f597c26a07c4..29ff136263cb9 100644 --- a/google/cloud/connectors/v1/connectors_connection.h +++ b/google/cloud/connectors/v1/connectors_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_V1_CONNECTORS_CONNECTION_H #include "google/cloud/connectors/v1/connectors_connection_idempotency_policy.h" +#include "google/cloud/connectors/v1/connectors_service.pb.h" #include "google/cloud/connectors/v1/internal/connectors_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/connectors/v1/connectors_connection_idempotency_policy.h b/google/cloud/connectors/v1/connectors_connection_idempotency_policy.h index 4fcfcae0d9b51..bb20c74dc76bb 100644 --- a/google/cloud/connectors/v1/connectors_connection_idempotency_policy.h +++ b/google/cloud/connectors/v1/connectors_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_V1_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_V1_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/connectors/v1/connectors_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/connectors/v1/internal/connectors_auth_decorator.cc b/google/cloud/connectors/v1/internal/connectors_auth_decorator.cc index 8b38cad5eab73..fc5d1b8679874 100644 --- a/google/cloud/connectors/v1/internal/connectors_auth_decorator.cc +++ b/google/cloud/connectors/v1/internal/connectors_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/connectors/v1/connectors_service.proto #include "google/cloud/connectors/v1/internal/connectors_auth_decorator.h" -#include +#include "google/cloud/connectors/v1/connectors_service.grpc.pb.h" #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_auth_decorator.h b/google/cloud/connectors/v1/internal/connectors_auth_decorator.h index 285c8f811d54a..936802593ead1 100644 --- a/google/cloud/connectors/v1/internal/connectors_auth_decorator.h +++ b/google/cloud/connectors/v1/internal/connectors_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/connectors/v1/internal/connectors_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_connection_impl.h b/google/cloud/connectors/v1/internal/connectors_connection_impl.h index 8c178d775acc4..219d923b60458 100644 --- a/google/cloud/connectors/v1/internal/connectors_connection_impl.h +++ b/google/cloud/connectors/v1/internal/connectors_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/connectors/v1/internal/connectors_logging_decorator.cc b/google/cloud/connectors/v1/internal/connectors_logging_decorator.cc index cd76a4cd522da..9fac01d3805f7 100644 --- a/google/cloud/connectors/v1/internal/connectors_logging_decorator.cc +++ b/google/cloud/connectors/v1/internal/connectors_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/connectors/v1/connectors_service.proto #include "google/cloud/connectors/v1/internal/connectors_logging_decorator.h" +#include "google/cloud/connectors/v1/connectors_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_logging_decorator.h b/google/cloud/connectors/v1/internal/connectors_logging_decorator.h index 326d43f60b982..aa17d06a54400 100644 --- a/google/cloud/connectors/v1/internal/connectors_logging_decorator.h +++ b/google/cloud/connectors/v1/internal/connectors_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/connectors/v1/internal/connectors_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_metadata_decorator.cc b/google/cloud/connectors/v1/internal/connectors_metadata_decorator.cc index 4e822977184b5..e94b82d6e4b53 100644 --- a/google/cloud/connectors/v1/internal/connectors_metadata_decorator.cc +++ b/google/cloud/connectors/v1/internal/connectors_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/connectors/v1/connectors_service.proto #include "google/cloud/connectors/v1/internal/connectors_metadata_decorator.h" +#include "google/cloud/connectors/v1/connectors_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 #include #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_metadata_decorator.h b/google/cloud/connectors/v1/internal/connectors_metadata_decorator.h index 9aa8b87ed10aa..ad7e081746974 100644 --- a/google/cloud/connectors/v1/internal/connectors_metadata_decorator.h +++ b/google/cloud/connectors/v1/internal/connectors_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/connectors/v1/internal/connectors_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_stub.cc b/google/cloud/connectors/v1/internal/connectors_stub.cc index 3d9df364f5794..5e9c382ee4890 100644 --- a/google/cloud/connectors/v1/internal/connectors_stub.cc +++ b/google/cloud/connectors/v1/internal/connectors_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/connectors/v1/connectors_service.proto #include "google/cloud/connectors/v1/internal/connectors_stub.h" +#include "google/cloud/connectors/v1/connectors_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_stub.h b/google/cloud/connectors/v1/internal/connectors_stub.h index 5ff14c6de401d..b63b97ac74d95 100644 --- a/google/cloud/connectors/v1/internal/connectors_stub.h +++ b/google/cloud/connectors/v1/internal/connectors_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_V1_INTERNAL_CONNECTORS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_V1_INTERNAL_CONNECTORS_STUB_H +#include "google/cloud/connectors/v1/connectors_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_stub_factory.cc b/google/cloud/connectors/v1/internal/connectors_stub_factory.cc index 7a77292b3bb81..dd5df6f5e817d 100644 --- a/google/cloud/connectors/v1/internal/connectors_stub_factory.cc +++ b/google/cloud/connectors/v1/internal/connectors_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/connectors/v1/connectors_service.proto #include "google/cloud/connectors/v1/internal/connectors_stub_factory.h" +#include "google/cloud/connectors/v1/connectors_service.grpc.pb.h" #include "google/cloud/connectors/v1/internal/connectors_auth_decorator.h" #include "google/cloud/connectors/v1/internal/connectors_logging_decorator.h" #include "google/cloud/connectors/v1/internal/connectors_metadata_decorator.h" #include "google/cloud/connectors/v1/internal/connectors_stub.h" #include "google/cloud/connectors/v1/internal/connectors_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc b/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc index dbd5230433b22..cc62002d8f8af 100644 --- a/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc +++ b/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace connectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConnectorsTracingConnection::ConnectorsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -371,16 +369,12 @@ Status ConnectorsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConnectorsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/connectors/v1/internal/connectors_tracing_connection.h b/google/cloud/connectors/v1/internal/connectors_tracing_connection.h index 493cc4b0cb4e0..8832e5f9fbc93 100644 --- a/google/cloud/connectors/v1/internal/connectors_tracing_connection.h +++ b/google/cloud/connectors/v1/internal/connectors_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace connectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConnectorsTracingConnection : public connectors_v1::ConnectorsConnection { public: ~ConnectorsTracingConnection() override = default; @@ -173,8 +171,6 @@ class ConnectorsTracingConnection : public connectors_v1::ConnectorsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc b/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc index 7dc6cdbe3d0e8..13da76eb05ca6 100644 --- a/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc +++ b/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace connectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConnectorsTracingStub::ConnectorsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -436,15 +434,9 @@ future ConnectorsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConnectorsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/connectors/v1/internal/connectors_tracing_stub.h b/google/cloud/connectors/v1/internal/connectors_tracing_stub.h index fcba16b4a69c3..8ae5ccf171793 100644 --- a/google/cloud/connectors/v1/internal/connectors_tracing_stub.h +++ b/google/cloud/connectors/v1/internal/connectors_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace connectors_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConnectorsTracingStub : public ConnectorsStub { public: ~ConnectorsTracingStub() override = default; @@ -210,8 +208,6 @@ class ConnectorsTracingStub : public ConnectorsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contactcenterinsights/BUILD.bazel b/google/cloud/contactcenterinsights/BUILD.bazel index c900667d6cbf1..0537f29ec8d91 100644 --- a/google/cloud/contactcenterinsights/BUILD.bazel +++ b/google/cloud/contactcenterinsights/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/contactcenterinsights/v1:contactcenterinsights_cc_grpc", + "@googleapis//google/cloud/contactcenterinsights/v1:contactcenterinsights_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/contactcenterinsights/quickstart/.bazelrc b/google/cloud/contactcenterinsights/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/contactcenterinsights/quickstart/.bazelrc +++ b/google/cloud/contactcenterinsights/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/contactcenterinsights/v1/contact_center_insights_client.h b/google/cloud/contactcenterinsights/v1/contact_center_insights_client.h index 2ed3a6325c7cf..bd3ad11ea277e 100644 --- a/google/cloud/contactcenterinsights/v1/contact_center_insights_client.h +++ b/google/cloud/contactcenterinsights/v1/contact_center_insights_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contactcenterinsights/v1/contact_center_insights_connection.h b/google/cloud/contactcenterinsights/v1/contact_center_insights_connection.h index 755d450774296..2285fa0ef52b8 100644 --- a/google/cloud/contactcenterinsights/v1/contact_center_insights_connection.h +++ b/google/cloud/contactcenterinsights/v1/contact_center_insights_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_V1_CONTACT_CENTER_INSIGHTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_V1_CONTACT_CENTER_INSIGHTS_CONNECTION_H +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.pb.h" #include "google/cloud/contactcenterinsights/v1/contact_center_insights_connection_idempotency_policy.h" #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contactcenterinsights/v1/contact_center_insights_connection_idempotency_policy.h b/google/cloud/contactcenterinsights/v1/contact_center_insights_connection_idempotency_policy.h index 24a1e2cde9571..044877c5dc5b8 100644 --- a/google/cloud/contactcenterinsights/v1/contact_center_insights_connection_idempotency_policy.h +++ b/google/cloud/contactcenterinsights/v1/contact_center_insights_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_V1_CONTACT_CENTER_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_V1_CONTACT_CENTER_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.cc index 872efafbb665c..df886eb50fdce 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.h" -#include +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.grpc.pb.h" #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.h index 47d371911a3e1..5607d5ea9356c 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_connection_impl.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_connection_impl.h index b1cf65a34c9cd..b69209e1075e8 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_connection_impl.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.cc index 82d612b4df553..7e67071e7afc6 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.h" +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.h index e1e30db08fa9c..98841004e797a 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.cc index 59fd2f11e80e8..bd9a0e79c7c88 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.h" +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.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 #include #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.h index c3ee7946ce053..886a953315aec 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc index a397a01499ad7..91ded17fc4c5c 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h" +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h index d5b093e96f8d2..60128f9677bc8 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_V1_INTERNAL_CONTACT_CENTER_INSIGHTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_V1_INTERNAL_CONTACT_CENTER_INSIGHTS_STUB_H +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc index cf7539a18ca4a..c858490d633ec 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.h" +#include "google/cloud/contactcenterinsights/v1/contact_center_insights.grpc.pb.h" #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_auth_decorator.h" #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_logging_decorator.h" #include "google/cloud/contactcenterinsights/v1/internal/contact_center_insights_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc index fbbf105dcca6a..91b6cb00c3512 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace contactcenterinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContactCenterInsightsTracingConnection::ContactCenterInsightsTracingConnection( std::shared_ptr child) @@ -1318,18 +1316,14 @@ Status ContactCenterInsightsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContactCenterInsightsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.h index d3eee12b54092..593528c2159a6 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contactcenterinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContactCenterInsightsTracingConnection : public contactcenterinsights_v1::ContactCenterInsightsConnection { public: @@ -562,8 +560,6 @@ class ContactCenterInsightsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc index 29f6c7280ebfe..4c4bc9a773a8f 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contactcenterinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContactCenterInsightsTracingStub::ContactCenterInsightsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1424,15 +1422,9 @@ future ContactCenterInsightsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContactCenterInsightsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.h index ab87e8c69b9e0..95aec1d2716c1 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contactcenterinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContactCenterInsightsTracingStub : public ContactCenterInsightsStub { public: ~ContactCenterInsightsTracingStub() override = default; @@ -596,8 +594,6 @@ class ContactCenterInsightsTracingStub : public ContactCenterInsightsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/container/BUILD.bazel b/google/cloud/container/BUILD.bazel index b2d7b3b02cbc1..2f22818e36883 100644 --- a/google/cloud/container/BUILD.bazel +++ b/google/cloud/container/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/container/v1:container_cc_grpc", + "@googleapis//google/container/v1:container_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/container/quickstart/.bazelrc b/google/cloud/container/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/container/quickstart/.bazelrc +++ b/google/cloud/container/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/container/v1/cluster_manager_connection.h b/google/cloud/container/v1/cluster_manager_connection.h index 018c91e9a5bbf..103048140a131 100644 --- a/google/cloud/container/v1/cluster_manager_connection.h +++ b/google/cloud/container/v1/cluster_manager_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/container/v1/cluster_service.pb.h" #include namespace google { diff --git a/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h b/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h index 0586ff1a7c9bc..738aacec124d7 100644 --- a/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h +++ b/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc b/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc index 4f9dd987efdf5..e95d8a59f0bd2 100644 --- a/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc +++ b/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/container/v1/cluster_service.proto #include "google/cloud/container/v1/internal/cluster_manager_auth_decorator.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include #include diff --git a/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc b/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc index 960548280ba68..54a573d5ffeb0 100644 --- a/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc +++ b/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/container/v1/internal/cluster_manager_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc b/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc index 35de0110ff0fd..91fa6daa0d748 100644 --- a/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc +++ b/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/container/v1/internal/cluster_manager_stub.cc b/google/cloud/container/v1/internal/cluster_manager_stub.cc index bae1aaee63141..2e404851b2efd 100644 --- a/google/cloud/container/v1/internal/cluster_manager_stub.cc +++ b/google/cloud/container/v1/internal/cluster_manager_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/container/v1/internal/cluster_manager_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include #include diff --git a/google/cloud/container/v1/internal/cluster_manager_stub.h b/google/cloud/container/v1/internal/cluster_manager_stub.h index 8392d01c4087c..8c03d49e15616 100644 --- a/google/cloud/container/v1/internal/cluster_manager_stub.h +++ b/google/cloud/container/v1/internal/cluster_manager_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include #include diff --git a/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc b/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc index 5b3e2419c3890..dd1f053521658 100644 --- a/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc +++ b/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/container/v1/cluster_service.grpc.pb.h" #include #include diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc index 9fe9f71cade3e..d1a8a05498bfa 100644 --- a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc +++ b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace container_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ClusterManagerTracingConnection::ClusterManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -357,16 +355,12 @@ ClusterManagerTracingConnection::FetchNodePoolUpgradeInfo( return internal::EndSpan(*span, child_->FetchNodePoolUpgradeInfo(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeClusterManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h index 70897433b7a89..f68f7d980f562 100644 --- a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h +++ b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace container_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ClusterManagerTracingConnection : public container_v1::ClusterManagerConnection { public: @@ -162,8 +160,6 @@ class ClusterManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc index 1f4f124fe3a78..f27b3a08bf2af 100644 --- a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc +++ b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace container_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ClusterManagerTracingStub::ClusterManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -466,15 +464,9 @@ ClusterManagerTracingStub::FetchNodePoolUpgradeInfo( child_->FetchNodePoolUpgradeInfo(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeClusterManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h index 16c30c99574e5..3c802dfa46f3e 100644 --- a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h +++ b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace container_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ClusterManagerTracingStub : public ClusterManagerStub { public: ~ClusterManagerTracingStub() override = default; @@ -200,8 +198,6 @@ class ClusterManagerTracingStub : public ClusterManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/containeranalysis/BUILD.bazel b/google/cloud/containeranalysis/BUILD.bazel index f4ece6c9cb439..668fe3f4bebf0 100644 --- a/google/cloud/containeranalysis/BUILD.bazel +++ b/google/cloud/containeranalysis/BUILD.bazel @@ -24,8 +24,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/containeranalysis/v1:containeranalysis_cc_grpc", - "@com_google_googleapis//grafeas/v1:grafeas_cc_grpc", + "@googleapis//google/devtools/containeranalysis/v1:containeranalysis_cc_grpc", + "@googleapis//grafeas/v1:grafeas_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/containeranalysis/quickstart/.bazelrc b/google/cloud/containeranalysis/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/containeranalysis/quickstart/.bazelrc +++ b/google/cloud/containeranalysis/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/containeranalysis/v1/container_analysis_connection.h b/google/cloud/containeranalysis/v1/container_analysis_connection.h index 59a64733509e8..ab5907bb62f83 100644 --- a/google/cloud/containeranalysis/v1/container_analysis_connection.h +++ b/google/cloud/containeranalysis/v1/container_analysis_connection.h @@ -26,8 +26,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.pb.h" +#include "grafeas/v1/grafeas.pb.h" #include namespace google { diff --git a/google/cloud/containeranalysis/v1/container_analysis_connection_idempotency_policy.h b/google/cloud/containeranalysis/v1/container_analysis_connection_idempotency_policy.h index 1c4559ab3be1c..88efa555588b8 100644 --- a/google/cloud/containeranalysis/v1/container_analysis_connection_idempotency_policy.h +++ b/google/cloud/containeranalysis/v1/container_analysis_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" #include namespace google { diff --git a/google/cloud/containeranalysis/v1/grafeas_connection.h b/google/cloud/containeranalysis/v1/grafeas_connection.h index c5a86effc70f4..bbf752505c335 100644 --- a/google/cloud/containeranalysis/v1/grafeas_connection.h +++ b/google/cloud/containeranalysis/v1/grafeas_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "grafeas/v1/grafeas.pb.h" #include namespace google { diff --git a/google/cloud/containeranalysis/v1/grafeas_connection_idempotency_policy.h b/google/cloud/containeranalysis/v1/grafeas_connection_idempotency_policy.h index 22c02176e5f78..d9f2325e85376 100644 --- a/google/cloud/containeranalysis/v1/grafeas_connection_idempotency_policy.h +++ b/google/cloud/containeranalysis/v1/grafeas_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "grafeas/v1/grafeas.grpc.pb.h" #include namespace google { diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_auth_decorator.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_auth_decorator.cc index f8dbe7f191f02..6e6d31f38d565 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_auth_decorator.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/containeranalysis/v1/containeranalysis.proto #include "google/cloud/containeranalysis/v1/internal/container_analysis_auth_decorator.h" -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_logging_decorator.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_logging_decorator.cc index d1144fa9aae2d..74443b3bca09b 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_logging_decorator.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/containeranalysis/v1/internal/container_analysis_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" #include #include #include diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_metadata_decorator.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_metadata_decorator.cc index cb8b95085b906..010ebb96f4225 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_metadata_decorator.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" #include #include #include diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_stub.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_stub.cc index 23073dd60b177..55ea3a029e83a 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_stub.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/containeranalysis/v1/internal/container_analysis_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_stub.h b/google/cloud/containeranalysis/v1/internal/container_analysis_stub.h index 06336b4e1fce0..bd6ab9d7b6e29 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_stub.h +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" +#include "grafeas/v1/grafeas.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_stub_factory.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_stub_factory.cc index 420f44269f365..c97dc2522dc95 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_stub_factory.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/devtools/containeranalysis/v1/containeranalysis.grpc.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.cc index fe633be067169..312552a7242df 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContainerAnalysisTracingConnection::ContainerAnalysisTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -81,17 +79,13 @@ ContainerAnalysisTracingConnection::ExportSBOM( return internal::EndSpan(*span, child_->ExportSBOM(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContainerAnalysisTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.h b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.h index 8554e743456b5..c0b2de2567597 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.h +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContainerAnalysisTracingConnection : public containeranalysis_v1::ContainerAnalysisConnection { public: @@ -63,8 +61,6 @@ class ContainerAnalysisTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.cc b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.cc index 790b04bf50ebc..641cd501b78c7 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.cc +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContainerAnalysisTracingStub::ContainerAnalysisTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -95,15 +93,9 @@ ContainerAnalysisTracingStub::ExportSBOM( child_->ExportSBOM(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContainerAnalysisTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.h b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.h index e3caba67aaf39..1ca5dee532168 100644 --- a/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.h +++ b/google/cloud/containeranalysis/v1/internal/container_analysis_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContainerAnalysisTracingStub : public ContainerAnalysisStub { public: ~ContainerAnalysisTracingStub() override = default; @@ -69,8 +67,6 @@ class ContainerAnalysisTracingStub : public ContainerAnalysisStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_auth_decorator.cc b/google/cloud/containeranalysis/v1/internal/grafeas_auth_decorator.cc index 521ca7490bea0..09d698442cf40 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_auth_decorator.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_auth_decorator.cc @@ -17,7 +17,7 @@ // source: grafeas/v1/grafeas.proto #include "google/cloud/containeranalysis/v1/internal/grafeas_auth_decorator.h" -#include +#include "grafeas/v1/grafeas.grpc.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_logging_decorator.cc b/google/cloud/containeranalysis/v1/internal/grafeas_logging_decorator.cc index 836b80e8027bd..0ee8901505699 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_logging_decorator.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/containeranalysis/v1/internal/grafeas_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "grafeas/v1/grafeas.grpc.pb.h" #include #include #include diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_metadata_decorator.cc b/google/cloud/containeranalysis/v1/internal/grafeas_metadata_decorator.cc index 589fc9d80fa5a..6241c1f639ac5 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_metadata_decorator.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "grafeas/v1/grafeas.grpc.pb.h" #include #include #include diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_stub.cc b/google/cloud/containeranalysis/v1/internal/grafeas_stub.cc index e5e03aeb57d56..8ea7f623e142f 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_stub.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/containeranalysis/v1/internal/grafeas_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "grafeas/v1/grafeas.grpc.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_stub.h b/google/cloud/containeranalysis/v1/internal/grafeas_stub.h index 3d5c538a331ab..f3acfc2efeb0b 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_stub.h +++ b/google/cloud/containeranalysis/v1/internal/grafeas_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "grafeas/v1/grafeas.grpc.pb.h" +#include "grafeas/v1/grafeas.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_stub_factory.cc b/google/cloud/containeranalysis/v1/internal/grafeas_stub_factory.cc index 9a6d3b87fbf6b..4228443a90ce6 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_stub_factory.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "grafeas/v1/grafeas.grpc.pb.h" #include #include diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc index 4482c4fa683c6..0e5b38f6c1287 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GrafeasTracingConnection::GrafeasTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -154,16 +152,12 @@ GrafeasTracingConnection::ListNoteOccurrences( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGrafeasTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.h b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.h index 16f7239110651..f0fc0e16dfcdd 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.h +++ b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GrafeasTracingConnection : public containeranalysis_v1::GrafeasConnection { public: @@ -85,8 +83,6 @@ class GrafeasTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.cc b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.cc index 2eb1ed828366f..3b007112c84f8 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GrafeasTracingStub::GrafeasTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -178,15 +176,9 @@ GrafeasTracingStub::ListNoteOccurrences( context, *span, child_->ListNoteOccurrences(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGrafeasTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.h b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.h index a0c1933cda188..cf97a5d25b741 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.h +++ b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace containeranalysis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GrafeasTracingStub : public GrafeasStub { public: ~GrafeasTracingStub() override = default; @@ -99,8 +97,6 @@ class GrafeasTracingStub : public GrafeasStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/BUILD.bazel b/google/cloud/contentwarehouse/BUILD.bazel index b5a662ef40055..03f9997275e6f 100644 --- a/google/cloud/contentwarehouse/BUILD.bazel +++ b/google/cloud/contentwarehouse/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/contentwarehouse/v1:contentwarehouse_cc_grpc", + "@googleapis//google/cloud/contentwarehouse/v1:contentwarehouse_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/contentwarehouse/quickstart/.bazelrc b/google/cloud/contentwarehouse/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/contentwarehouse/quickstart/.bazelrc +++ b/google/cloud/contentwarehouse/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/contentwarehouse/v1/document_connection.h b/google/cloud/contentwarehouse/v1/document_connection.h index 1a0e008da62ff..94189af074f15 100644 --- a/google/cloud/contentwarehouse/v1/document_connection.h +++ b/google/cloud/contentwarehouse/v1/document_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_CONNECTION_H #include "google/cloud/contentwarehouse/v1/document_connection_idempotency_policy.h" +#include "google/cloud/contentwarehouse/v1/document_service.pb.h" #include "google/cloud/contentwarehouse/v1/internal/document_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/document_connection_idempotency_policy.h b/google/cloud/contentwarehouse/v1/document_connection_idempotency_policy.h index 4e26deb025356..0079dbc52ad0d 100644 --- a/google/cloud/contentwarehouse/v1/document_connection_idempotency_policy.h +++ b/google/cloud/contentwarehouse/v1/document_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contentwarehouse/v1/document_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/document_link_connection.h b/google/cloud/contentwarehouse/v1/document_link_connection.h index ea8b4a54c08e3..c24d8c0fba134 100644 --- a/google/cloud/contentwarehouse/v1/document_link_connection.h +++ b/google/cloud/contentwarehouse/v1/document_link_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_LINK_CONNECTION_H #include "google/cloud/contentwarehouse/v1/document_link_connection_idempotency_policy.h" +#include "google/cloud/contentwarehouse/v1/document_link_service.pb.h" #include "google/cloud/contentwarehouse/v1/internal/document_link_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/document_link_connection_idempotency_policy.h b/google/cloud/contentwarehouse/v1/document_link_connection_idempotency_policy.h index ba62e4baed9bf..be4728b058504 100644 --- a/google/cloud/contentwarehouse/v1/document_link_connection_idempotency_policy.h +++ b/google/cloud/contentwarehouse/v1/document_link_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_LINK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_LINK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contentwarehouse/v1/document_link_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/document_schema_connection.h b/google/cloud/contentwarehouse/v1/document_schema_connection.h index f7155e890b530..39f4c51bca8b0 100644 --- a/google/cloud/contentwarehouse/v1/document_schema_connection.h +++ b/google/cloud/contentwarehouse/v1/document_schema_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_SCHEMA_CONNECTION_H #include "google/cloud/contentwarehouse/v1/document_schema_connection_idempotency_policy.h" +#include "google/cloud/contentwarehouse/v1/document_schema_service.pb.h" #include "google/cloud/contentwarehouse/v1/internal/document_schema_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/document_schema_connection_idempotency_policy.h b/google/cloud/contentwarehouse/v1/document_schema_connection_idempotency_policy.h index 106a9fb21fcb7..0a165cd774846 100644 --- a/google/cloud/contentwarehouse/v1/document_schema_connection_idempotency_policy.h +++ b/google/cloud/contentwarehouse/v1/document_schema_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_SCHEMA_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_DOCUMENT_SCHEMA_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contentwarehouse/v1/document_schema_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/internal/document_auth_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_auth_decorator.cc index bd096b6e74c46..b477368665234 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_auth_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contentwarehouse/v1/document_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_auth_decorator.h" -#include +#include "google/cloud/contentwarehouse/v1/document_service.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_auth_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_link_auth_decorator.cc index 7e007fb590c60..f9b5e1b735ea9 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_auth_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contentwarehouse/v1/document_link_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_link_auth_decorator.h" -#include +#include "google/cloud/contentwarehouse/v1/document_link_service.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_logging_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_link_logging_decorator.cc index c582ca2016a5a..f7079162580df 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_logging_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/document_link_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_link_logging_decorator.h" +#include "google/cloud/contentwarehouse/v1/document_link_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_metadata_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_link_metadata_decorator.cc index 86f0fa2a3009f..850db82d58602 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_metadata_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contentwarehouse/v1/document_link_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_link_metadata_decorator.h" +#include "google/cloud/contentwarehouse/v1/document_link_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 #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_stub.cc b/google/cloud/contentwarehouse/v1/internal/document_link_stub.cc index 6c35e145b4503..27d94c644a1e1 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/document_link_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_link_stub.h" +#include "google/cloud/contentwarehouse/v1/document_link_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_stub.h b/google/cloud/contentwarehouse/v1/internal/document_link_stub.h index 5caceb24f9083..463e3e4f937d7 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/document_link_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_DOCUMENT_LINK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_DOCUMENT_LINK_STUB_H +#include "google/cloud/contentwarehouse/v1/document_link_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/document_link_stub_factory.cc index 729a6b130042f..460c990459072 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/contentwarehouse/v1/document_link_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_link_stub_factory.h" +#include "google/cloud/contentwarehouse/v1/document_link_service.grpc.pb.h" #include "google/cloud/contentwarehouse/v1/internal/document_link_auth_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/document_link_logging_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/document_link_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc index e1c6bdc1fb2dc..5c74a37f9699c 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentLinkServiceTracingConnection::DocumentLinkServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -83,17 +81,13 @@ DocumentLinkServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentLinkServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.h b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.h index b75a6924ac05d..026271ad1d422 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.h +++ b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentLinkServiceTracingConnection : public contentwarehouse_v1::DocumentLinkServiceConnection { public: @@ -67,8 +65,6 @@ class DocumentLinkServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.cc b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.cc index 735a8e651cfef..54d991a8cafd9 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentLinkServiceTracingStub::DocumentLinkServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -99,15 +97,9 @@ DocumentLinkServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentLinkServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.h b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.h index ff1da9d6cf312..77a92945cdb0c 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentLinkServiceTracingStub : public DocumentLinkServiceStub { public: ~DocumentLinkServiceTracingStub() override = default; @@ -72,8 +70,6 @@ class DocumentLinkServiceTracingStub : public DocumentLinkServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/v1/internal/document_logging_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_logging_decorator.cc index a859786f37b36..756b9c9dc25c3 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_logging_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/document_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_logging_decorator.h" +#include "google/cloud/contentwarehouse/v1/document_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_metadata_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_metadata_decorator.cc index edd11702bfe2c..31b3ea0e21c9b 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_metadata_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contentwarehouse/v1/document_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_metadata_decorator.h" +#include "google/cloud/contentwarehouse/v1/document_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 #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_auth_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_auth_decorator.cc index be98a81f23a53..33133292e97ed 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_auth_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contentwarehouse/v1/document_schema_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_schema_auth_decorator.h" -#include +#include "google/cloud/contentwarehouse/v1/document_schema_service.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_logging_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_logging_decorator.cc index f4280a535b4d4..396bdd0c4b725 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_logging_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/document_schema_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_schema_logging_decorator.h" +#include "google/cloud/contentwarehouse/v1/document_schema_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_metadata_decorator.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_metadata_decorator.cc index fa5bfcfb5c70b..166fe0fd5a188 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_metadata_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contentwarehouse/v1/document_schema_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_schema_metadata_decorator.h" +#include "google/cloud/contentwarehouse/v1/document_schema_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 #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_stub.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_stub.cc index b5f90f23da515..1062ae1a0b553 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/document_schema_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_schema_stub.h" +#include "google/cloud/contentwarehouse/v1/document_schema_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_stub.h b/google/cloud/contentwarehouse/v1/internal/document_schema_stub.h index fe28d202c138d..68af56dcfe173 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_DOCUMENT_SCHEMA_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_DOCUMENT_SCHEMA_STUB_H +#include "google/cloud/contentwarehouse/v1/document_schema_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_stub_factory.cc index c206a6822428a..a6ba6cb9f7346 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/contentwarehouse/v1/document_schema_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_schema_stub_factory.h" +#include "google/cloud/contentwarehouse/v1/document_schema_service.grpc.pb.h" #include "google/cloud/contentwarehouse/v1/internal/document_schema_auth_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/document_schema_logging_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/document_schema_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc index 837217d615dbd..a45bc7ad15286 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentSchemaServiceTracingConnection::DocumentSchemaServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -98,18 +96,14 @@ DocumentSchemaServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentSchemaServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.h b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.h index acfc27b0ad6e5..b66a57b9ff67f 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.h +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentSchemaServiceTracingConnection : public contentwarehouse_v1::DocumentSchemaServiceConnection { public: @@ -72,8 +70,6 @@ class DocumentSchemaServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.cc index 046918e125192..02badbffc2e82 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentSchemaServiceTracingStub::DocumentSchemaServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -113,15 +111,9 @@ DocumentSchemaServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentSchemaServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.h b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.h index aff71233fe280..0f6b2b92be954 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentSchemaServiceTracingStub : public DocumentSchemaServiceStub { public: ~DocumentSchemaServiceTracingStub() override = default; @@ -78,8 +76,6 @@ class DocumentSchemaServiceTracingStub : public DocumentSchemaServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/v1/internal/document_stub.cc b/google/cloud/contentwarehouse/v1/internal/document_stub.cc index 0056d39943e2b..0fbc3427661fa 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/document_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_stub.h" +#include "google/cloud/contentwarehouse/v1/document_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_stub.h b/google/cloud/contentwarehouse/v1/internal/document_stub.h index 1d2b340d5f42c..2493d38f66f1d 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/document_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_DOCUMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_DOCUMENT_STUB_H +#include "google/cloud/contentwarehouse/v1/document_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/document_stub_factory.cc index fce775c02c652..3dc2244d47897 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/contentwarehouse/v1/document_service.proto #include "google/cloud/contentwarehouse/v1/internal/document_stub_factory.h" +#include "google/cloud/contentwarehouse/v1/document_service.grpc.pb.h" #include "google/cloud/contentwarehouse/v1/internal/document_auth_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/document_logging_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/document_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc index df7383aaa15a3..b4fd6cf9182cc 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentServiceTracingConnection::DocumentServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -117,16 +115,12 @@ DocumentServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.h b/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.h index 5af3d469fa257..13e8a61d83083 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.h +++ b/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentServiceTracingConnection : public contentwarehouse_v1::DocumentServiceConnection { public: @@ -82,8 +80,6 @@ class DocumentServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.cc b/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.cc index 9d3b1616e366a..89df2e9aae2b3 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentServiceTracingStub::DocumentServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -140,15 +138,9 @@ DocumentServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.h b/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.h index 60f94eea40e65..638923eb7c274 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/document_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentServiceTracingStub : public DocumentServiceStub { public: ~DocumentServiceTracingStub() override = default; @@ -92,8 +90,6 @@ class DocumentServiceTracingStub : public DocumentServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.cc index dc0b668dfa452..608f52870b9fc 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contentwarehouse/v1/pipeline_service.proto #include "google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.h" -#include +#include "google/cloud/contentwarehouse/v1/pipeline_service.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.h b/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.h index cf8ba9e1d20ee..8063d6ccd6b89 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/contentwarehouse/v1/internal/pipeline_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_connection_impl.h b/google/cloud/contentwarehouse/v1/internal/pipeline_connection_impl.h index 3782eb9922589..d0f7a208dce27 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_connection_impl.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.cc index af3d140cad4f6..50b2a49fa9349 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/pipeline_service.proto #include "google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.h" +#include "google/cloud/contentwarehouse/v1/pipeline_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.h b/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.h index 5fa75955414de..45f471531be6d 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/contentwarehouse/v1/internal/pipeline_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.cc index 7ca500b1f6536..9675a7f6ccba3 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contentwarehouse/v1/pipeline_service.proto #include "google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.h" +#include "google/cloud/contentwarehouse/v1/pipeline_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 #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.h b/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.h index 7635e920db968..db3ee23120a38 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/contentwarehouse/v1/internal/pipeline_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc index 636475244abbf..0e311ab4f5d4e 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/contentwarehouse/v1/pipeline_service.proto #include "google/cloud/contentwarehouse/v1/internal/pipeline_stub.h" +#include "google/cloud/contentwarehouse/v1/pipeline_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h index 85dc61e3ef989..dbd2d2bb213e1 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_PIPELINE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_PIPELINE_STUB_H +#include "google/cloud/contentwarehouse/v1/pipeline_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc index 84f3b406da6c4..0f3d8380939ee 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/contentwarehouse/v1/internal/pipeline_metadata_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/pipeline_stub.h" #include "google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.h" +#include "google/cloud/contentwarehouse/v1/pipeline_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.cc index d3de82f3ebb26..4887b91b02380 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PipelineServiceTracingConnection::PipelineServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -69,16 +67,12 @@ PipelineServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePipelineServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.h b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.h index d8d73dec5e33f..973572ce078a4 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PipelineServiceTracingConnection : public contentwarehouse_v1::PipelineServiceConnection { public: @@ -59,8 +57,6 @@ class PipelineServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.cc index a9556c5946158..103092d69d4b2 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PipelineServiceTracingStub::PipelineServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -98,15 +96,9 @@ future PipelineServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePipelineServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.h b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.h index 5eb7b04a69086..b2036637a72fc 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PipelineServiceTracingStub : public PipelineServiceStub { public: ~PipelineServiceTracingStub() override = default; @@ -73,8 +71,6 @@ class PipelineServiceTracingStub : public PipelineServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_auth_decorator.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_auth_decorator.cc index cb7f49891c55a..8a352c5ef4eab 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_auth_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contentwarehouse/v1/ruleset_service.proto #include "google/cloud/contentwarehouse/v1/internal/rule_set_auth_decorator.h" -#include +#include "google/cloud/contentwarehouse/v1/ruleset_service.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_logging_decorator.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_logging_decorator.cc index 37420f218df31..0ecde6a009ee8 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_logging_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/ruleset_service.proto #include "google/cloud/contentwarehouse/v1/internal/rule_set_logging_decorator.h" +#include "google/cloud/contentwarehouse/v1/ruleset_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_metadata_decorator.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_metadata_decorator.cc index 6e6edad9f52f3..15de4c2086d6d 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_metadata_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contentwarehouse/v1/ruleset_service.proto #include "google/cloud/contentwarehouse/v1/internal/rule_set_metadata_decorator.h" +#include "google/cloud/contentwarehouse/v1/ruleset_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 #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_stub.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_stub.cc index 82ee24c4d4b6a..be2d5c8c531d9 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/ruleset_service.proto #include "google/cloud/contentwarehouse/v1/internal/rule_set_stub.h" +#include "google/cloud/contentwarehouse/v1/ruleset_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_stub.h b/google/cloud/contentwarehouse/v1/internal/rule_set_stub.h index 43ae676998869..e3b02304ca845 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_RULE_SET_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_RULE_SET_STUB_H +#include "google/cloud/contentwarehouse/v1/ruleset_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_stub_factory.cc index a6bf26af3ab4a..065c273921fb5 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/contentwarehouse/v1/internal/rule_set_metadata_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/rule_set_stub.h" #include "google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.h" +#include "google/cloud/contentwarehouse/v1/ruleset_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc index 3c4b92ca28914..bb19998db0a38 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RuleSetServiceTracingConnection::RuleSetServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -89,16 +87,12 @@ RuleSetServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRuleSetServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.h b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.h index eab8ad7ff8cbd..5228bddd7ab02 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.h +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RuleSetServiceTracingConnection : public contentwarehouse_v1::RuleSetServiceConnection { public: @@ -67,8 +65,6 @@ class RuleSetServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.cc index c23759fb7d9c7..9b4dee286a418 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RuleSetServiceTracingStub::RuleSetServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -103,15 +101,9 @@ RuleSetServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRuleSetServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.h b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.h index 16cdce7cc9132..44fbf7ad8ac18 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RuleSetServiceTracingStub : public RuleSetServiceStub { public: ~RuleSetServiceTracingStub() override = default; @@ -73,8 +71,6 @@ class RuleSetServiceTracingStub : public RuleSetServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_auth_decorator.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_auth_decorator.cc index 4edd992bc7c7a..9f8b986e55da9 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_auth_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/contentwarehouse/v1/synonymset_service.proto #include "google/cloud/contentwarehouse/v1/internal/synonym_set_auth_decorator.h" -#include +#include "google/cloud/contentwarehouse/v1/synonymset_service.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_logging_decorator.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_logging_decorator.cc index 0d4adcce19d2f..03964689f5bb5 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_logging_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/synonymset_service.proto #include "google/cloud/contentwarehouse/v1/internal/synonym_set_logging_decorator.h" +#include "google/cloud/contentwarehouse/v1/synonymset_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_metadata_decorator.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_metadata_decorator.cc index 0b7f711cb0fd7..971f7d1a16721 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_metadata_decorator.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/contentwarehouse/v1/synonymset_service.proto #include "google/cloud/contentwarehouse/v1/internal/synonym_set_metadata_decorator.h" +#include "google/cloud/contentwarehouse/v1/synonymset_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 #include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.cc index ca470a9247428..541c0f076d471 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/contentwarehouse/v1/synonymset_service.proto #include "google/cloud/contentwarehouse/v1/internal/synonym_set_stub.h" +#include "google/cloud/contentwarehouse/v1/synonymset_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.h b/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.h index 8dfc31f47fec7..138c04dffda12 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_SYNONYM_SET_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_INTERNAL_SYNONYM_SET_STUB_H +#include "google/cloud/contentwarehouse/v1/synonymset_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_stub_factory.cc index 759edc82ec2dd..d35318feb4cab 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/contentwarehouse/v1/internal/synonym_set_metadata_decorator.h" #include "google/cloud/contentwarehouse/v1/internal/synonym_set_stub.h" #include "google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.h" +#include "google/cloud/contentwarehouse/v1/synonymset_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc index bb2865afc18ca..27c9aff8b3922 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SynonymSetServiceTracingConnection::SynonymSetServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -92,17 +90,13 @@ SynonymSetServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSynonymSetServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.h b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.h index 4d6c0995b8d5e..d935bacde1ee5 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.h +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SynonymSetServiceTracingConnection : public contentwarehouse_v1::SynonymSetServiceConnection { public: @@ -67,8 +65,6 @@ class SynonymSetServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.cc index 62c5c7b891ab8..8d5155c8653d9 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SynonymSetServiceTracingStub::SynonymSetServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -107,15 +105,9 @@ SynonymSetServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSynonymSetServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.h b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.h index 15a5990dd591f..c7ebf6f17ff18 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace contentwarehouse_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SynonymSetServiceTracingStub : public SynonymSetServiceStub { public: ~SynonymSetServiceTracingStub() override = default; @@ -75,8 +73,6 @@ class SynonymSetServiceTracingStub : public SynonymSetServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/contentwarehouse/v1/pipeline_client.h b/google/cloud/contentwarehouse/v1/pipeline_client.h index 665989edf0194..55953b08ca558 100644 --- a/google/cloud/contentwarehouse/v1/pipeline_client.h +++ b/google/cloud/contentwarehouse/v1/pipeline_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/contentwarehouse/v1/pipeline_connection.h b/google/cloud/contentwarehouse/v1/pipeline_connection.h index d75a80c18d0b2..7f8b50c0183c1 100644 --- a/google/cloud/contentwarehouse/v1/pipeline_connection.h +++ b/google/cloud/contentwarehouse/v1/pipeline_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/contentwarehouse/v1/internal/pipeline_retry_traits.h" #include "google/cloud/contentwarehouse/v1/pipeline_connection_idempotency_policy.h" +#include "google/cloud/contentwarehouse/v1/pipeline_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -29,8 +30,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/pipeline_connection_idempotency_policy.h b/google/cloud/contentwarehouse/v1/pipeline_connection_idempotency_policy.h index 13ceb0191e746..b99816f6ca36a 100644 --- a/google/cloud/contentwarehouse/v1/pipeline_connection_idempotency_policy.h +++ b/google/cloud/contentwarehouse/v1/pipeline_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_PIPELINE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_PIPELINE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contentwarehouse/v1/pipeline_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/rule_set_connection.h b/google/cloud/contentwarehouse/v1/rule_set_connection.h index 81c8e9911688b..18f2cf37e6e18 100644 --- a/google/cloud/contentwarehouse/v1/rule_set_connection.h +++ b/google/cloud/contentwarehouse/v1/rule_set_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/contentwarehouse/v1/internal/rule_set_retry_traits.h" #include "google/cloud/contentwarehouse/v1/rule_set_connection_idempotency_policy.h" +#include "google/cloud/contentwarehouse/v1/ruleset_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/rule_set_connection_idempotency_policy.h b/google/cloud/contentwarehouse/v1/rule_set_connection_idempotency_policy.h index 5646146b64a6e..743115f6f9e5f 100644 --- a/google/cloud/contentwarehouse/v1/rule_set_connection_idempotency_policy.h +++ b/google/cloud/contentwarehouse/v1/rule_set_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_RULE_SET_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_RULE_SET_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contentwarehouse/v1/ruleset_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/synonym_set_connection.h b/google/cloud/contentwarehouse/v1/synonym_set_connection.h index b0c06ffe7f4e0..3d06ac29d8f3a 100644 --- a/google/cloud/contentwarehouse/v1/synonym_set_connection.h +++ b/google/cloud/contentwarehouse/v1/synonym_set_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/contentwarehouse/v1/internal/synonym_set_retry_traits.h" #include "google/cloud/contentwarehouse/v1/synonym_set_connection_idempotency_policy.h" +#include "google/cloud/contentwarehouse/v1/synonymset_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/contentwarehouse/v1/synonym_set_connection_idempotency_policy.h b/google/cloud/contentwarehouse/v1/synonym_set_connection_idempotency_policy.h index 05e669f491467..41b4aaf313a6d 100644 --- a/google/cloud/contentwarehouse/v1/synonym_set_connection_idempotency_policy.h +++ b/google/cloud/contentwarehouse/v1/synonym_set_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_SYNONYM_SET_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTENTWAREHOUSE_V1_SYNONYM_SET_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/contentwarehouse/v1/synonymset_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/BUILD.bazel b/google/cloud/datacatalog/BUILD.bazel index a74b7443c852f..1281ce86c074d 100644 --- a/google/cloud/datacatalog/BUILD.bazel +++ b/google/cloud/datacatalog/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/datacatalog/lineage/v1:lineage_cc_grpc", - "@com_google_googleapis//google/cloud/datacatalog/v1:datacatalog_cc_grpc", + "@googleapis//google/cloud/datacatalog/lineage/v1:lineage_cc_grpc", + "@googleapis//google/cloud/datacatalog/v1:datacatalog_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.cc index f599e0e94e085..d781ed8c601fb 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/datacatalog/lineage/v1/lineage.proto #include "google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.h" -#include +#include "google/cloud/datacatalog/lineage/v1/lineage.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.h index 0cc484afb1941..d150aed6d19cc 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_connection_impl.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_connection_impl.h index baa52e9b49665..11eeedc039213 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_connection_impl.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.cc index f9e9269144195..62a2370f7ca95 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/datacatalog/lineage/v1/lineage.proto #include "google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.h" +#include "google/cloud/datacatalog/lineage/v1/lineage.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.h index 419139faa9b8b..49cc5b16d10a6 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.cc index dc5f60ecd18c9..6f802414aed09 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/datacatalog/lineage/v1/lineage.proto #include "google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.h" +#include "google/cloud/datacatalog/lineage/v1/lineage.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 #include #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.h index d8981eb24fb4e..709fe1ff4af19 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc index 467d84a47a7d9..a9f2ff82edbc0 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/datacatalog/lineage/v1/lineage.proto #include "google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h" +#include "google/cloud/datacatalog/lineage/v1/lineage.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h index 4a202cfdc2312..5d00d46f0a78d 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_LINEAGE_V1_INTERNAL_LINEAGE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_LINEAGE_V1_INTERNAL_LINEAGE_STUB_H +#include "google/cloud/datacatalog/lineage/v1/lineage.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc index 4572c83e58e00..6472034398624 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/datacatalog/lineage/v1/internal/lineage_metadata_decorator.h" #include "google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h" #include "google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.h" +#include "google/cloud/datacatalog/lineage/v1/lineage.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc index a4b196313f0f3..6b10058914afa 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datacatalog_lineage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LineageTracingConnection::LineageTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -282,16 +280,12 @@ Status LineageTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLineageTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.h index 2f22589aaed79..5a8c7adae6d3c 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datacatalog_lineage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LineageTracingConnection : public datacatalog_lineage_v1::LineageConnection { public: @@ -147,8 +145,6 @@ class LineageTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc index 81b5722aa09b8..6811a01ff633a 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datacatalog_lineage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LineageTracingStub::LineageTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -351,15 +349,9 @@ future LineageTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLineageTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.h index a8d99d6fd2115..502604e8fc73f 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datacatalog_lineage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LineageTracingStub : public LineageStub { public: ~LineageTracingStub() override = default; @@ -179,8 +177,6 @@ class LineageTracingStub : public LineageStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datacatalog/lineage/v1/lineage_client.h b/google/cloud/datacatalog/lineage/v1/lineage_client.h index b944fb1648022..ad0811d09d744 100644 --- a/google/cloud/datacatalog/lineage/v1/lineage_client.h +++ b/google/cloud/datacatalog/lineage/v1/lineage_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/lineage/v1/lineage_connection.h b/google/cloud/datacatalog/lineage/v1/lineage_connection.h index 446363fc6616a..eff6d33e8eabc 100644 --- a/google/cloud/datacatalog/lineage/v1/lineage_connection.h +++ b/google/cloud/datacatalog/lineage/v1/lineage_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_LINEAGE_V1_LINEAGE_CONNECTION_H #include "google/cloud/datacatalog/lineage/v1/internal/lineage_retry_traits.h" +#include "google/cloud/datacatalog/lineage/v1/lineage.pb.h" #include "google/cloud/datacatalog/lineage/v1/lineage_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/lineage/v1/lineage_connection_idempotency_policy.h b/google/cloud/datacatalog/lineage/v1/lineage_connection_idempotency_policy.h index 7140a000c207c..92baca262b953 100644 --- a/google/cloud/datacatalog/lineage/v1/lineage_connection_idempotency_policy.h +++ b/google/cloud/datacatalog/lineage/v1/lineage_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_LINEAGE_V1_LINEAGE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_LINEAGE_V1_LINEAGE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/datacatalog/lineage/v1/lineage.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/quickstart/.bazelrc b/google/cloud/datacatalog/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/datacatalog/quickstart/.bazelrc +++ b/google/cloud/datacatalog/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/datacatalog/v1/data_catalog_client.h b/google/cloud/datacatalog/v1/data_catalog_client.h index 248ba7592868b..7edcba8771fc6 100644 --- a/google/cloud/datacatalog/v1/data_catalog_client.h +++ b/google/cloud/datacatalog/v1/data_catalog_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/v1/data_catalog_connection.h b/google/cloud/datacatalog/v1/data_catalog_connection.h index 1f4eff41b8ee2..3344cb0986954 100644 --- a/google/cloud/datacatalog/v1/data_catalog_connection.h +++ b/google/cloud/datacatalog/v1/data_catalog_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_DATA_CATALOG_CONNECTION_H #include "google/cloud/datacatalog/v1/data_catalog_connection_idempotency_policy.h" +#include "google/cloud/datacatalog/v1/datacatalog.pb.h" #include "google/cloud/datacatalog/v1/internal/data_catalog_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/v1/data_catalog_connection_idempotency_policy.h b/google/cloud/datacatalog/v1/data_catalog_connection_idempotency_policy.h index f275e053522c5..aa45df7d659fb 100644 --- a/google/cloud/datacatalog/v1/data_catalog_connection_idempotency_policy.h +++ b/google/cloud/datacatalog/v1/data_catalog_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_DATA_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_DATA_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/datacatalog/v1/datacatalog.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.cc b/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.cc index d1a1c566bd0a7..1f9ed2b2a85ce 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/datacatalog/v1/datacatalog.proto #include "google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.h" -#include +#include "google/cloud/datacatalog/v1/datacatalog.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.h b/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.h index 200ef12b5a137..5b299fd7d5344 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datacatalog/v1/internal/data_catalog_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_connection_impl.h b/google/cloud/datacatalog/v1/internal/data_catalog_connection_impl.h index da29c5e4be240..6b664f8a86ece 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_connection_impl.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.cc b/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.cc index dbb0359020a45..b62624e50f2e8 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/datacatalog/v1/datacatalog.proto #include "google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.h" +#include "google/cloud/datacatalog/v1/datacatalog.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.h b/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.h index 83db5b8695a2f..50be146888cd5 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datacatalog/v1/internal/data_catalog_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.cc b/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.cc index 80c40c24f219b..01b2c749573a5 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/datacatalog/v1/datacatalog.proto #include "google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.h" +#include "google/cloud/datacatalog/v1/datacatalog.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 #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.h b/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.h index 16a76e987369a..f373ef4935d41 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datacatalog/v1/internal/data_catalog_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc b/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc index 579418305978c..1e92ebcc51672 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/datacatalog/v1/datacatalog.proto #include "google/cloud/datacatalog/v1/internal/data_catalog_stub.h" +#include "google/cloud/datacatalog/v1/datacatalog.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_stub.h b/google/cloud/datacatalog/v1/internal/data_catalog_stub.h index 664df2f51dc72..cb33c8573f6e9 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_stub.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_INTERNAL_DATA_CATALOG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_INTERNAL_DATA_CATALOG_STUB_H +#include "google/cloud/datacatalog/v1/datacatalog.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc b/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc index 0b235bec129f3..858ada7ec11f7 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/datacatalog/v1/datacatalog.proto #include "google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.h" +#include "google/cloud/datacatalog/v1/datacatalog.grpc.pb.h" #include "google/cloud/datacatalog/v1/internal/data_catalog_auth_decorator.h" #include "google/cloud/datacatalog/v1/internal/data_catalog_logging_decorator.h" #include "google/cloud/datacatalog/v1/internal/data_catalog_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc index 52b877759e810..2e346e6a88c4e 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataCatalogTracingConnection::DataCatalogTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -450,16 +448,12 @@ Status DataCatalogTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataCatalogTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.h b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.h index 058b061dc472d..5ad0b31269b69 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataCatalogTracingConnection : public datacatalog_v1::DataCatalogConnection { public: @@ -212,8 +210,6 @@ class DataCatalogTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc index 1513b501f091e..ea36bfde1074f 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataCatalogTracingStub::DataCatalogTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -578,15 +576,9 @@ future DataCatalogTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataCatalogTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.h b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.h index dd2d9f58955af..3d1e8e1d495cd 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataCatalogTracingStub : public DataCatalogStub { public: ~DataCatalogTracingStub() override = default; @@ -265,8 +263,6 @@ class DataCatalogTracingStub : public DataCatalogStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_auth_decorator.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_auth_decorator.cc index bfadd7de1cc6c..d0df8b4c46297 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_auth_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/datacatalog/v1/policytagmanager.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_auth_decorator.h" -#include +#include "google/cloud/datacatalog/v1/policytagmanager.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_logging_decorator.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_logging_decorator.cc index 239a8b71f486b..76ab4b41b0534 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_logging_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/datacatalog/v1/policytagmanager.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_logging_decorator.h" +#include "google/cloud/datacatalog/v1/policytagmanager.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_metadata_decorator.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_metadata_decorator.cc index a6d9b68fb98d2..84028df25626d 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_metadata_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/datacatalog/v1/policytagmanager.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_metadata_decorator.h" +#include "google/cloud/datacatalog/v1/policytagmanager.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 #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_auth_decorator.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_auth_decorator.cc index bd618b48985ac..62f361a3168ee 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_auth_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_auth_decorator.h" -#include +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_logging_decorator.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_logging_decorator.cc index 12f75384394f4..01f8e66c93b42 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_logging_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_logging_decorator.h" +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_metadata_decorator.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_metadata_decorator.cc index 335f9291d99fb..991b5d3fd4225 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_metadata_decorator.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_metadata_decorator.h" +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.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 #include #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.cc index 5753a45fd7c69..f9e3bd6d70a12 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.h" +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.h b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.h index 4c1741e577c40..0094b07dbeaad 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.h +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_INTERNAL_POLICY_TAG_MANAGER_SERIALIZATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_INTERNAL_POLICY_TAG_MANAGER_SERIALIZATION_STUB_H +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub_factory.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub_factory.cc index 149ec45cb211f..1b23bfd47c46e 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub_factory.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_metadata_decorator.h" #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_stub.h" #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.h" +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.cc index 3f073c0164763..24add7e974475 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyTagManagerSerializationTracingConnection:: PolicyTagManagerSerializationTracingConnection( std::shared_ptr @@ -104,18 +102,14 @@ Status PolicyTagManagerSerializationTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyTagManagerSerializationTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.h b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.h index b34793c502b8a..827062633bb94 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.h +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyTagManagerSerializationTracingConnection : public datacatalog_v1::PolicyTagManagerSerializationConnection { public: @@ -72,8 +70,6 @@ class PolicyTagManagerSerializationTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.cc index 5122c53afee9a..cb3d6631392dc 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyTagManagerSerializationTracingStub:: PolicyTagManagerSerializationTracingStub( std::shared_ptr child) @@ -122,17 +120,11 @@ Status PolicyTagManagerSerializationTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyTagManagerSerializationTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.h b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.h index f8396acc2f6e2..cd589c0603450 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.h +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyTagManagerSerializationTracingStub : public PolicyTagManagerSerializationStub { public: @@ -79,8 +77,6 @@ class PolicyTagManagerSerializationTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.cc index 6046bd327802c..80346c8a6ca1e 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/datacatalog/v1/policytagmanager.proto #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.h" +#include "google/cloud/datacatalog/v1/policytagmanager.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.h b/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.h index 5e07f2791840c..b3dae680d6fc0 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.h +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_INTERNAL_POLICY_TAG_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_INTERNAL_POLICY_TAG_MANAGER_STUB_H +#include "google/cloud/datacatalog/v1/policytagmanager.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub_factory.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub_factory.cc index 89bb82319d8b8..10f6b46053bdd 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub_factory.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_metadata_decorator.h" #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_stub.h" #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.h" +#include "google/cloud/datacatalog/v1/policytagmanager.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc index d2f79e86df8e9..a4ac7beb1afb5 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyTagManagerTracingConnection::PolicyTagManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -189,16 +187,12 @@ Status PolicyTagManagerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyTagManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.h b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.h index 65551da106834..30c44a85a3583 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.h +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyTagManagerTracingConnection : public datacatalog_v1::PolicyTagManagerConnection { public: @@ -103,8 +101,6 @@ class PolicyTagManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.cc index b1550cdf7374a..7c276daaedefe 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyTagManagerTracingStub::PolicyTagManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -230,15 +228,9 @@ Status PolicyTagManagerTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyTagManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.h b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.h index 78c3c9977137e..b7902c6d45755 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.h +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datacatalog_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyTagManagerTracingStub : public PolicyTagManagerStub { public: ~PolicyTagManagerTracingStub() override = default; @@ -123,8 +121,6 @@ class PolicyTagManagerTracingStub : public PolicyTagManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datacatalog/v1/policy_tag_manager_connection.h b/google/cloud/datacatalog/v1/policy_tag_manager_connection.h index 80c0a2873f408..401e5f3a5c271 100644 --- a/google/cloud/datacatalog/v1/policy_tag_manager_connection.h +++ b/google/cloud/datacatalog/v1/policy_tag_manager_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_retry_traits.h" #include "google/cloud/datacatalog/v1/policy_tag_manager_connection_idempotency_policy.h" +#include "google/cloud/datacatalog/v1/policytagmanager.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/datacatalog/v1/policy_tag_manager_connection_idempotency_policy.h b/google/cloud/datacatalog/v1/policy_tag_manager_connection_idempotency_policy.h index fed5d1f9f4ea3..1b780b3526ee0 100644 --- a/google/cloud/datacatalog/v1/policy_tag_manager_connection_idempotency_policy.h +++ b/google/cloud/datacatalog/v1/policy_tag_manager_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_POLICY_TAG_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_POLICY_TAG_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/datacatalog/v1/policytagmanager.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection.h b/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection.h index d1c99dfec7d74..6ec50bcf0ef2d 100644 --- a/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection.h +++ b/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/datacatalog/v1/internal/policy_tag_manager_serialization_retry_traits.h" #include "google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection_idempotency_policy.h" +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection_idempotency_policy.h b/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection_idempotency_policy.h index d1877fb198986..7fd3842597c1a 100644 --- a/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection_idempotency_policy.h +++ b/google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_V1_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/datacatalog/v1/policytagmanagerserialization.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataform/BUILD.bazel b/google/cloud/dataform/BUILD.bazel index 6830f5cbb51b4..7737258985b5f 100644 --- a/google/cloud/dataform/BUILD.bazel +++ b/google/cloud/dataform/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/dataform/v1:dataform_cc_grpc", + "@googleapis//google/cloud/dataform/v1:dataform_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/dataform/v1/dataform_connection.h b/google/cloud/dataform/v1/dataform_connection.h index 9d0fa117219c6..d78d54adcf8a8 100644 --- a/google/cloud/dataform/v1/dataform_connection.h +++ b/google/cloud/dataform/v1/dataform_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFORM_V1_DATAFORM_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFORM_V1_DATAFORM_CONNECTION_H +#include "google/cloud/dataform/v1/dataform.pb.h" #include "google/cloud/dataform/v1/dataform_connection_idempotency_policy.h" #include "google/cloud/dataform/v1/internal/dataform_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/dataform/v1/dataform_connection_idempotency_policy.h b/google/cloud/dataform/v1/dataform_connection_idempotency_policy.h index 0082bd6b45684..12612259e46de 100644 --- a/google/cloud/dataform/v1/dataform_connection_idempotency_policy.h +++ b/google/cloud/dataform/v1/dataform_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFORM_V1_DATAFORM_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFORM_V1_DATAFORM_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataform/v1/dataform.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataform/v1/internal/dataform_auth_decorator.cc b/google/cloud/dataform/v1/internal/dataform_auth_decorator.cc index 0e3e3a7300ad4..13f499e8f3e47 100644 --- a/google/cloud/dataform/v1/internal/dataform_auth_decorator.cc +++ b/google/cloud/dataform/v1/internal/dataform_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataform/v1/dataform.proto #include "google/cloud/dataform/v1/internal/dataform_auth_decorator.h" -#include +#include "google/cloud/dataform/v1/dataform.grpc.pb.h" #include #include diff --git a/google/cloud/dataform/v1/internal/dataform_logging_decorator.cc b/google/cloud/dataform/v1/internal/dataform_logging_decorator.cc index a095eb986e252..73d803ac40506 100644 --- a/google/cloud/dataform/v1/internal/dataform_logging_decorator.cc +++ b/google/cloud/dataform/v1/internal/dataform_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataform/v1/dataform.proto #include "google/cloud/dataform/v1/internal/dataform_logging_decorator.h" +#include "google/cloud/dataform/v1/dataform.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataform/v1/internal/dataform_metadata_decorator.cc b/google/cloud/dataform/v1/internal/dataform_metadata_decorator.cc index f6909febb3c50..37457ef47ca2d 100644 --- a/google/cloud/dataform/v1/internal/dataform_metadata_decorator.cc +++ b/google/cloud/dataform/v1/internal/dataform_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataform/v1/dataform.proto #include "google/cloud/dataform/v1/internal/dataform_metadata_decorator.h" +#include "google/cloud/dataform/v1/dataform.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 #include #include #include diff --git a/google/cloud/dataform/v1/internal/dataform_stub.cc b/google/cloud/dataform/v1/internal/dataform_stub.cc index 14f3779c500ab..13a5b4390ad7c 100644 --- a/google/cloud/dataform/v1/internal/dataform_stub.cc +++ b/google/cloud/dataform/v1/internal/dataform_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataform/v1/dataform.proto #include "google/cloud/dataform/v1/internal/dataform_stub.h" +#include "google/cloud/dataform/v1/dataform.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dataform/v1/internal/dataform_stub.h b/google/cloud/dataform/v1/internal/dataform_stub.h index 66b69fea33f36..0f142636858b5 100644 --- a/google/cloud/dataform/v1/internal/dataform_stub.h +++ b/google/cloud/dataform/v1/internal/dataform_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFORM_V1_INTERNAL_DATAFORM_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFORM_V1_INTERNAL_DATAFORM_STUB_H +#include "google/cloud/dataform/v1/dataform.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/google/cloud/dataform/v1/internal/dataform_stub_factory.cc b/google/cloud/dataform/v1/internal/dataform_stub_factory.cc index cc2e12d96752e..21e2db8e70407 100644 --- a/google/cloud/dataform/v1/internal/dataform_stub_factory.cc +++ b/google/cloud/dataform/v1/internal/dataform_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dataform/v1/dataform.proto #include "google/cloud/dataform/v1/internal/dataform_stub_factory.h" +#include "google/cloud/dataform/v1/dataform.grpc.pb.h" #include "google/cloud/dataform/v1/internal/dataform_auth_decorator.h" #include "google/cloud/dataform/v1/internal/dataform_logging_decorator.h" #include "google/cloud/dataform/v1/internal/dataform_metadata_decorator.h" #include "google/cloud/dataform/v1/internal/dataform_stub.h" #include "google/cloud/dataform/v1/internal/dataform_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/google/cloud/dataform/v1/internal/dataform_tracing_connection.cc b/google/cloud/dataform/v1/internal/dataform_tracing_connection.cc index a6867e1fa6bbb..2994f131c85e0 100644 --- a/google/cloud/dataform/v1/internal/dataform_tracing_connection.cc +++ b/google/cloud/dataform/v1/internal/dataform_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataformTracingConnection::DataformTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -598,15 +596,11 @@ DataformTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataformTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataform/v1/internal/dataform_tracing_connection.h b/google/cloud/dataform/v1/internal/dataform_tracing_connection.h index 15ba1bc4bb1ed..315c3fad6325b 100644 --- a/google/cloud/dataform/v1/internal/dataform_tracing_connection.h +++ b/google/cloud/dataform/v1/internal/dataform_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataformTracingConnection : public dataform_v1::DataformConnection { public: ~DataformTracingConnection() override = default; @@ -283,8 +281,6 @@ class DataformTracingConnection : public dataform_v1::DataformConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataform/v1/internal/dataform_tracing_stub.cc b/google/cloud/dataform/v1/internal/dataform_tracing_stub.cc index ceaccdf86123a..c97bbb6c2337d 100644 --- a/google/cloud/dataform/v1/internal/dataform_tracing_stub.cc +++ b/google/cloud/dataform/v1/internal/dataform_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataformTracingStub::DataformTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -754,15 +752,9 @@ DataformTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataformTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataform/v1/internal/dataform_tracing_stub.h b/google/cloud/dataform/v1/internal/dataform_tracing_stub.h index 73b48d3c34868..d86b791d1c116 100644 --- a/google/cloud/dataform/v1/internal/dataform_tracing_stub.h +++ b/google/cloud/dataform/v1/internal/dataform_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataform_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataformTracingStub : public DataformStub { public: ~DataformTracingStub() override = default; @@ -350,8 +348,6 @@ class DataformTracingStub : public DataformStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datafusion/BUILD.bazel b/google/cloud/datafusion/BUILD.bazel index e0f625fcaf941..2f17c36f3b050 100644 --- a/google/cloud/datafusion/BUILD.bazel +++ b/google/cloud/datafusion/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/datafusion/v1:datafusion_cc_grpc", + "@googleapis//google/cloud/datafusion/v1:datafusion_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/datafusion/quickstart/.bazelrc b/google/cloud/datafusion/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/datafusion/quickstart/.bazelrc +++ b/google/cloud/datafusion/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/datafusion/v1/data_fusion_client.h b/google/cloud/datafusion/v1/data_fusion_client.h index e8d1adef95792..78f47a5fe5708 100644 --- a/google/cloud/datafusion/v1/data_fusion_client.h +++ b/google/cloud/datafusion/v1/data_fusion_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datafusion/v1/data_fusion_connection.h b/google/cloud/datafusion/v1/data_fusion_connection.h index 6dace44ec720d..67ef49ab4892f 100644 --- a/google/cloud/datafusion/v1/data_fusion_connection.h +++ b/google/cloud/datafusion/v1/data_fusion_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFUSION_V1_DATA_FUSION_CONNECTION_H #include "google/cloud/datafusion/v1/data_fusion_connection_idempotency_policy.h" +#include "google/cloud/datafusion/v1/datafusion.pb.h" #include "google/cloud/datafusion/v1/internal/data_fusion_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datafusion/v1/data_fusion_connection_idempotency_policy.h b/google/cloud/datafusion/v1/data_fusion_connection_idempotency_policy.h index 0ca1675580b36..0378e65924c1f 100644 --- a/google/cloud/datafusion/v1/data_fusion_connection_idempotency_policy.h +++ b/google/cloud/datafusion/v1/data_fusion_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFUSION_V1_DATA_FUSION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFUSION_V1_DATA_FUSION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/datafusion/v1/datafusion.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.cc b/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.cc index d8285e3b368cc..2118e820a02bf 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/datafusion/v1/datafusion.proto #include "google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.h" -#include +#include "google/cloud/datafusion/v1/datafusion.grpc.pb.h" #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.h b/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.h index 0895715a7a6b9..450ddfedda666 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datafusion/v1/internal/data_fusion_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_connection_impl.h b/google/cloud/datafusion/v1/internal/data_fusion_connection_impl.h index 0ddfa4aedc3c2..95e917d17e3e1 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_connection_impl.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.cc b/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.cc index adc84dc4aa6e1..d7c16a6850714 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/datafusion/v1/datafusion.proto #include "google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.h" +#include "google/cloud/datafusion/v1/datafusion.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.h b/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.h index 1d9a19916d891..639000c1ade53 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datafusion/v1/internal/data_fusion_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.cc b/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.cc index 24926ccaf78a3..5af9a06b2a3ad 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/datafusion/v1/datafusion.proto #include "google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.h" +#include "google/cloud/datafusion/v1/datafusion.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 #include #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.h b/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.h index 0014b869fbc91..1d2b7ef746098 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datafusion/v1/internal/data_fusion_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_stub.cc b/google/cloud/datafusion/v1/internal/data_fusion_stub.cc index 5f8d35c679980..1f4dd45c225a7 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_stub.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/datafusion/v1/datafusion.proto #include "google/cloud/datafusion/v1/internal/data_fusion_stub.h" +#include "google/cloud/datafusion/v1/datafusion.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_stub.h b/google/cloud/datafusion/v1/internal/data_fusion_stub.h index 9632710614bc4..977291f2383f7 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_stub.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFUSION_V1_INTERNAL_DATA_FUSION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAFUSION_V1_INTERNAL_DATA_FUSION_STUB_H +#include "google/cloud/datafusion/v1/datafusion.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_stub_factory.cc b/google/cloud/datafusion/v1/internal/data_fusion_stub_factory.cc index e12249e2c1bcc..0ca619b86d42a 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_stub_factory.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/datafusion/v1/datafusion.proto #include "google/cloud/datafusion/v1/internal/data_fusion_stub_factory.h" +#include "google/cloud/datafusion/v1/datafusion.grpc.pb.h" #include "google/cloud/datafusion/v1/internal/data_fusion_auth_decorator.h" #include "google/cloud/datafusion/v1/internal/data_fusion_logging_decorator.h" #include "google/cloud/datafusion/v1/internal/data_fusion_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc b/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc index 8792fb01f7e48..10cefdecd5782 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datafusion_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataFusionTracingConnection::DataFusionTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -180,16 +178,12 @@ DataFusionTracingConnection::RestartInstance( return internal::EndSpan(std::move(span), child_->RestartInstance(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataFusionTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.h b/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.h index 9eb8ab1a3d669..1df8a64f6d73c 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datafusion_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataFusionTracingConnection : public datafusion_v1::DataFusionConnection { public: ~DataFusionTracingConnection() override = default; @@ -102,8 +100,6 @@ class DataFusionTracingConnection : public datafusion_v1::DataFusionConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc b/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc index bd0002b7ed9f1..f4920a3f6b005 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datafusion_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataFusionTracingStub::DataFusionTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -201,15 +199,9 @@ future DataFusionTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataFusionTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.h b/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.h index 39dc3e4745f72..b2afe3e33df77 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datafusion_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataFusionTracingStub : public DataFusionStub { public: ~DataFusionTracingStub() override = default; @@ -120,8 +118,6 @@ class DataFusionTracingStub : public DataFusionStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datamigration/BUILD.bazel b/google/cloud/datamigration/BUILD.bazel index 2e50d98b52e8b..621483f2556c0 100644 --- a/google/cloud/datamigration/BUILD.bazel +++ b/google/cloud/datamigration/BUILD.bazel @@ -24,8 +24,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/clouddms/logging/v1:logging_cc_grpc", - "@com_google_googleapis//google/cloud/clouddms/v1:clouddms_cc_grpc", + "@googleapis//google/cloud/clouddms/logging/v1:logging_cc_grpc", + "@googleapis//google/cloud/clouddms/v1:clouddms_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/datamigration/quickstart/.bazelrc b/google/cloud/datamigration/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/datamigration/quickstart/.bazelrc +++ b/google/cloud/datamigration/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/datamigration/v1/data_migration_client.h b/google/cloud/datamigration/v1/data_migration_client.h index 25eea0193f26b..5ba2030063c9e 100644 --- a/google/cloud/datamigration/v1/data_migration_client.h +++ b/google/cloud/datamigration/v1/data_migration_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datamigration/v1/data_migration_connection.h b/google/cloud/datamigration/v1/data_migration_connection.h index 517f2a4811957..86135d332f0bc 100644 --- a/google/cloud/datamigration/v1/data_migration_connection.h +++ b/google/cloud/datamigration/v1/data_migration_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_V1_DATA_MIGRATION_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_V1_DATA_MIGRATION_CONNECTION_H +#include "google/cloud/clouddms/v1/clouddms.pb.h" #include "google/cloud/datamigration/v1/data_migration_connection_idempotency_policy.h" #include "google/cloud/datamigration/v1/internal/data_migration_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datamigration/v1/data_migration_connection_idempotency_policy.h b/google/cloud/datamigration/v1/data_migration_connection_idempotency_policy.h index aece26df12a81..05f6ae62d19ae 100644 --- a/google/cloud/datamigration/v1/data_migration_connection_idempotency_policy.h +++ b/google/cloud/datamigration/v1/data_migration_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_V1_DATA_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_V1_DATA_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/clouddms/v1/clouddms.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.cc b/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.cc index 902bcf9b69935..d4ee9046a5cfa 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/clouddms/v1/clouddms.proto #include "google/cloud/datamigration/v1/internal/data_migration_auth_decorator.h" -#include +#include "google/cloud/clouddms/v1/clouddms.grpc.pb.h" #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.h b/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.h index a68f05bcef3f3..031e2a6ced9ba 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.h +++ b/google/cloud/datamigration/v1/internal/data_migration_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datamigration/v1/internal/data_migration_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_connection_impl.h b/google/cloud/datamigration/v1/internal/data_migration_connection_impl.h index f8590abbd190c..da6355d62f8d1 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_connection_impl.h +++ b/google/cloud/datamigration/v1/internal/data_migration_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.cc b/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.cc index 28adce0a2aa17..1ec7ca089fd2c 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/clouddms/v1/clouddms.proto #include "google/cloud/datamigration/v1/internal/data_migration_logging_decorator.h" +#include "google/cloud/clouddms/v1/clouddms.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.h b/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.h index d93993e2116e4..c4321f7007f1d 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.h +++ b/google/cloud/datamigration/v1/internal/data_migration_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datamigration/v1/internal/data_migration_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.cc b/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.cc index f9c664ab5aab2..9b5a0dfa62f50 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/clouddms/v1/clouddms.proto #include "google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.h" +#include "google/cloud/clouddms/v1/clouddms.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 #include #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.h b/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.h index 532aca3c38b57..9c4fe8d7343fb 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.h +++ b/google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datamigration/v1/internal/data_migration_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_stub.cc b/google/cloud/datamigration/v1/internal/data_migration_stub.cc index 3244738fc8d0c..42a360b1d96bd 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_stub.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/clouddms/v1/clouddms.proto #include "google/cloud/datamigration/v1/internal/data_migration_stub.h" +#include "google/cloud/clouddms/v1/clouddms.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_stub.h b/google/cloud/datamigration/v1/internal/data_migration_stub.h index 4495f33620185..126a7dca50f72 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_stub.h +++ b/google/cloud/datamigration/v1/internal/data_migration_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_V1_INTERNAL_DATA_MIGRATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_V1_INTERNAL_DATA_MIGRATION_STUB_H +#include "google/cloud/clouddms/v1/clouddms.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc b/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc index 4b4b698d5da11..525fd67702ceb 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/clouddms/v1/clouddms.proto #include "google/cloud/datamigration/v1/internal/data_migration_stub_factory.h" +#include "google/cloud/clouddms/v1/clouddms.grpc.pb.h" #include "google/cloud/datamigration/v1/internal/data_migration_auth_decorator.h" #include "google/cloud/datamigration/v1/internal/data_migration_logging_decorator.h" #include "google/cloud/datamigration/v1/internal/data_migration_metadata_decorator.h" #include "google/cloud/datamigration/v1/internal/data_migration_stub.h" #include "google/cloud/datamigration/v1/internal/data_migration_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc b/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc index 236e26b6cc244..17834db95713b 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datamigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataMigrationServiceTracingConnection::DataMigrationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1081,17 +1079,13 @@ Status DataMigrationServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataMigrationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.h b/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.h index bdc6c1466c642..0b234c7455d43 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.h +++ b/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datamigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataMigrationServiceTracingConnection : public datamigration_v1::DataMigrationServiceConnection { public: @@ -458,8 +456,6 @@ class DataMigrationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc b/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc index 32662986945db..0a5588e292d78 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datamigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataMigrationServiceTracingStub::DataMigrationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1083,15 +1081,9 @@ future DataMigrationServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataMigrationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.h b/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.h index 2e51226287ccb..500d9e76cd781 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.h +++ b/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datamigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataMigrationServiceTracingStub : public DataMigrationServiceStub { public: ~DataMigrationServiceTracingStub() override = default; @@ -474,8 +472,6 @@ class DataMigrationServiceTracingStub : public DataMigrationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/BUILD.bazel b/google/cloud/dataplex/BUILD.bazel index df24c92c4cee0..aac25138e50fa 100644 --- a/google/cloud/dataplex/BUILD.bazel +++ b/google/cloud/dataplex/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/dataplex/v1:dataplex_cc_grpc", + "@googleapis//google/cloud/dataplex/v1:dataplex_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/dataplex/quickstart/.bazelrc b/google/cloud/dataplex/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/dataplex/quickstart/.bazelrc +++ b/google/cloud/dataplex/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/dataplex/v1/catalog_client.h b/google/cloud/dataplex/v1/catalog_client.h index 88691c4df19ff..8bcb1400464b9 100644 --- a/google/cloud/dataplex/v1/catalog_client.h +++ b/google/cloud/dataplex/v1/catalog_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/catalog_connection.h b/google/cloud/dataplex/v1/catalog_connection.h index 02d94ae968f1f..8119d1f1ed3f8 100644 --- a/google/cloud/dataplex/v1/catalog_connection.h +++ b/google/cloud/dataplex/v1/catalog_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CATALOG_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CATALOG_CONNECTION_H +#include "google/cloud/dataplex/v1/catalog.pb.h" #include "google/cloud/dataplex/v1/catalog_connection_idempotency_policy.h" #include "google/cloud/dataplex/v1/internal/catalog_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/catalog_connection_idempotency_policy.h b/google/cloud/dataplex/v1/catalog_connection_idempotency_policy.h index 5e0bac3b64708..3734e2cd0bc15 100644 --- a/google/cloud/dataplex/v1/catalog_connection_idempotency_policy.h +++ b/google/cloud/dataplex/v1/catalog_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataplex/v1/catalog.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/content_connection.h b/google/cloud/dataplex/v1/content_connection.h index 82c10a1e4ceac..e997af66e7d1b 100644 --- a/google/cloud/dataplex/v1/content_connection.h +++ b/google/cloud/dataplex/v1/content_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CONTENT_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CONTENT_CONNECTION_H +#include "google/cloud/dataplex/v1/content.pb.h" #include "google/cloud/dataplex/v1/content_connection_idempotency_policy.h" #include "google/cloud/dataplex/v1/internal/content_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/dataplex/v1/content_connection_idempotency_policy.h b/google/cloud/dataplex/v1/content_connection_idempotency_policy.h index 1525c33859c9c..f51ff1c5c539b 100644 --- a/google/cloud/dataplex/v1/content_connection_idempotency_policy.h +++ b/google/cloud/dataplex/v1/content_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CONTENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_CONTENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataplex/v1/content.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/data_scan_client.h b/google/cloud/dataplex/v1/data_scan_client.h index 53845c9d3d58a..525454d90b35c 100644 --- a/google/cloud/dataplex/v1/data_scan_client.h +++ b/google/cloud/dataplex/v1/data_scan_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/data_scan_connection.h b/google/cloud/dataplex/v1/data_scan_connection.h index f6412c4dccc26..0f86864f684db 100644 --- a/google/cloud/dataplex/v1/data_scan_connection.h +++ b/google/cloud/dataplex/v1/data_scan_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_SCAN_CONNECTION_H #include "google/cloud/dataplex/v1/data_scan_connection_idempotency_policy.h" +#include "google/cloud/dataplex/v1/datascans.pb.h" #include "google/cloud/dataplex/v1/internal/data_scan_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/data_scan_connection_idempotency_policy.h b/google/cloud/dataplex/v1/data_scan_connection_idempotency_policy.h index ed6353877727b..a62483907e217 100644 --- a/google/cloud/dataplex/v1/data_scan_connection_idempotency_policy.h +++ b/google/cloud/dataplex/v1/data_scan_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_SCAN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_SCAN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataplex/v1/datascans.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/data_taxonomy_client.h b/google/cloud/dataplex/v1/data_taxonomy_client.h index 3db827d88befd..afc10755cfea1 100644 --- a/google/cloud/dataplex/v1/data_taxonomy_client.h +++ b/google/cloud/dataplex/v1/data_taxonomy_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/data_taxonomy_connection.h b/google/cloud/dataplex/v1/data_taxonomy_connection.h index 69eef81d52593..323779c28198c 100644 --- a/google/cloud/dataplex/v1/data_taxonomy_connection.h +++ b/google/cloud/dataplex/v1/data_taxonomy_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_TAXONOMY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_TAXONOMY_CONNECTION_H +#include "google/cloud/dataplex/v1/data_taxonomy.pb.h" #include "google/cloud/dataplex/v1/data_taxonomy_connection_idempotency_policy.h" #include "google/cloud/dataplex/v1/internal/data_taxonomy_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/data_taxonomy_connection_idempotency_policy.h b/google/cloud/dataplex/v1/data_taxonomy_connection_idempotency_policy.h index eb80386005071..22cda43da4908 100644 --- a/google/cloud/dataplex/v1/data_taxonomy_connection_idempotency_policy.h +++ b/google/cloud/dataplex/v1/data_taxonomy_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_TAXONOMY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATA_TAXONOMY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataplex/v1/data_taxonomy.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/dataplex_client.h b/google/cloud/dataplex/v1/dataplex_client.h index 89fd114720b7b..c7d3b35b92b29 100644 --- a/google/cloud/dataplex/v1/dataplex_client.h +++ b/google/cloud/dataplex/v1/dataplex_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/dataplex_connection.h b/google/cloud/dataplex/v1/dataplex_connection.h index 250d46e6a4409..d2fd77f3b1016 100644 --- a/google/cloud/dataplex/v1/dataplex_connection.h +++ b/google/cloud/dataplex/v1/dataplex_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/dataplex/v1/dataplex_connection_idempotency_policy.h" #include "google/cloud/dataplex/v1/internal/dataplex_retry_traits.h" +#include "google/cloud/dataplex/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/dataplex_connection_idempotency_policy.h b/google/cloud/dataplex/v1/dataplex_connection_idempotency_policy.h index 509c0e2ff4ece..bc5dc34d9394b 100644 --- a/google/cloud/dataplex/v1/dataplex_connection_idempotency_policy.h +++ b/google/cloud/dataplex/v1/dataplex_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATAPLEX_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_DATAPLEX_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataplex/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/internal/catalog_auth_decorator.cc b/google/cloud/dataplex/v1/internal/catalog_auth_decorator.cc index 6858481895158..f8126ac0e0278 100644 --- a/google/cloud/dataplex/v1/internal/catalog_auth_decorator.cc +++ b/google/cloud/dataplex/v1/internal/catalog_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataplex/v1/catalog.proto #include "google/cloud/dataplex/v1/internal/catalog_auth_decorator.h" -#include +#include "google/cloud/dataplex/v1/catalog.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_auth_decorator.h b/google/cloud/dataplex/v1/internal/catalog_auth_decorator.h index 733eb9391df89..1fcdac3947915 100644 --- a/google/cloud/dataplex/v1/internal/catalog_auth_decorator.h +++ b/google/cloud/dataplex/v1/internal/catalog_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/catalog_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_connection_impl.h b/google/cloud/dataplex/v1/internal/catalog_connection_impl.h index a3ed5e05af288..7e950afa4ab68 100644 --- a/google/cloud/dataplex/v1/internal/catalog_connection_impl.h +++ b/google/cloud/dataplex/v1/internal/catalog_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/internal/catalog_logging_decorator.cc b/google/cloud/dataplex/v1/internal/catalog_logging_decorator.cc index 2321c302c7483..196acba0afd40 100644 --- a/google/cloud/dataplex/v1/internal/catalog_logging_decorator.cc +++ b/google/cloud/dataplex/v1/internal/catalog_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/catalog.proto #include "google/cloud/dataplex/v1/internal/catalog_logging_decorator.h" +#include "google/cloud/dataplex/v1/catalog.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_logging_decorator.h b/google/cloud/dataplex/v1/internal/catalog_logging_decorator.h index 5ea639270b087..13ef648c4de4f 100644 --- a/google/cloud/dataplex/v1/internal/catalog_logging_decorator.h +++ b/google/cloud/dataplex/v1/internal/catalog_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/catalog_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.cc b/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.cc index e417862cf8d4f..bbd5a83bd4b24 100644 --- a/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.cc +++ b/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataplex/v1/catalog.proto #include "google/cloud/dataplex/v1/internal/catalog_metadata_decorator.h" +#include "google/cloud/dataplex/v1/catalog.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 #include #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.h b/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.h index 2aaaf48276a5b..076c92051d7e1 100644 --- a/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.h +++ b/google/cloud/dataplex/v1/internal/catalog_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/catalog_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_stub.cc b/google/cloud/dataplex/v1/internal/catalog_stub.cc index 012a1a04ddd2c..1de274fbe3185 100644 --- a/google/cloud/dataplex/v1/internal/catalog_stub.cc +++ b/google/cloud/dataplex/v1/internal/catalog_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataplex/v1/catalog.proto #include "google/cloud/dataplex/v1/internal/catalog_stub.h" +#include "google/cloud/dataplex/v1/catalog.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_stub.h b/google/cloud/dataplex/v1/internal/catalog_stub.h index 169f3e2259e65..0a94f7a2e6999 100644 --- a/google/cloud/dataplex/v1/internal/catalog_stub.h +++ b/google/cloud/dataplex/v1/internal/catalog_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_CATALOG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_CATALOG_STUB_H +#include "google/cloud/dataplex/v1/catalog.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc b/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc index 030575b8f6763..493f0adfa7426 100644 --- a/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/dataplex/v1/catalog.proto #include "google/cloud/dataplex/v1/internal/catalog_stub_factory.h" +#include "google/cloud/dataplex/v1/catalog.grpc.pb.h" #include "google/cloud/dataplex/v1/internal/catalog_auth_decorator.h" #include "google/cloud/dataplex/v1/internal/catalog_logging_decorator.h" #include "google/cloud/dataplex/v1/internal/catalog_metadata_decorator.h" #include "google/cloud/dataplex/v1/internal/catalog_stub.h" #include "google/cloud/dataplex/v1/internal/catalog_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/catalog_tracing_connection.cc b/google/cloud/dataplex/v1/internal/catalog_tracing_connection.cc index 7b99a20d41902..47339903c3fea 100644 --- a/google/cloud/dataplex/v1/internal/catalog_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/catalog_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CatalogServiceTracingConnection::CatalogServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -594,16 +592,12 @@ Status CatalogServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCatalogServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataplex/v1/internal/catalog_tracing_connection.h b/google/cloud/dataplex/v1/internal/catalog_tracing_connection.h index b4fd403e2417f..96b35191dcf98 100644 --- a/google/cloud/dataplex/v1/internal/catalog_tracing_connection.h +++ b/google/cloud/dataplex/v1/internal/catalog_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CatalogServiceTracingConnection : public dataplex_v1::CatalogServiceConnection { public: @@ -254,8 +252,6 @@ class CatalogServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataplex/v1/internal/catalog_tracing_stub.cc b/google/cloud/dataplex/v1/internal/catalog_tracing_stub.cc index d18490c669c5e..206ca3da5e97c 100644 --- a/google/cloud/dataplex/v1/internal/catalog_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/catalog_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CatalogServiceTracingStub::CatalogServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -661,15 +659,9 @@ future CatalogServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCatalogServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/catalog_tracing_stub.h b/google/cloud/dataplex/v1/internal/catalog_tracing_stub.h index 48ca1171ff65a..b31a82edd9634 100644 --- a/google/cloud/dataplex/v1/internal/catalog_tracing_stub.h +++ b/google/cloud/dataplex/v1/internal/catalog_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CatalogServiceTracingStub : public CatalogServiceStub { public: ~CatalogServiceTracingStub() override = default; @@ -299,8 +297,6 @@ class CatalogServiceTracingStub : public CatalogServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/v1/internal/content_auth_decorator.cc b/google/cloud/dataplex/v1/internal/content_auth_decorator.cc index 623c29b692aa6..5304ec454e569 100644 --- a/google/cloud/dataplex/v1/internal/content_auth_decorator.cc +++ b/google/cloud/dataplex/v1/internal/content_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataplex/v1/content.proto #include "google/cloud/dataplex/v1/internal/content_auth_decorator.h" -#include +#include "google/cloud/dataplex/v1/content.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/content_logging_decorator.cc b/google/cloud/dataplex/v1/internal/content_logging_decorator.cc index c6cce6e433c35..ed8f529a5743b 100644 --- a/google/cloud/dataplex/v1/internal/content_logging_decorator.cc +++ b/google/cloud/dataplex/v1/internal/content_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/content.proto #include "google/cloud/dataplex/v1/internal/content_logging_decorator.h" +#include "google/cloud/dataplex/v1/content.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataplex/v1/internal/content_metadata_decorator.cc b/google/cloud/dataplex/v1/internal/content_metadata_decorator.cc index 1820620905183..999ab8c4f2208 100644 --- a/google/cloud/dataplex/v1/internal/content_metadata_decorator.cc +++ b/google/cloud/dataplex/v1/internal/content_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataplex/v1/content.proto #include "google/cloud/dataplex/v1/internal/content_metadata_decorator.h" +#include "google/cloud/dataplex/v1/content.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 #include #include #include diff --git a/google/cloud/dataplex/v1/internal/content_stub.cc b/google/cloud/dataplex/v1/internal/content_stub.cc index f1d82d59dfa0f..8632ff7db7856 100644 --- a/google/cloud/dataplex/v1/internal/content_stub.cc +++ b/google/cloud/dataplex/v1/internal/content_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/content.proto #include "google/cloud/dataplex/v1/internal/content_stub.h" +#include "google/cloud/dataplex/v1/content.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dataplex/v1/internal/content_stub.h b/google/cloud/dataplex/v1/internal/content_stub.h index ebb66fef88d2b..4f3936f2d0816 100644 --- a/google/cloud/dataplex/v1/internal/content_stub.h +++ b/google/cloud/dataplex/v1/internal/content_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_CONTENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_CONTENT_STUB_H +#include "google/cloud/dataplex/v1/content.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/content_stub_factory.cc b/google/cloud/dataplex/v1/internal/content_stub_factory.cc index 93a6c1992b2ba..a1f6e7482b773 100644 --- a/google/cloud/dataplex/v1/internal/content_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/content_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dataplex/v1/content.proto #include "google/cloud/dataplex/v1/internal/content_stub_factory.h" +#include "google/cloud/dataplex/v1/content.grpc.pb.h" #include "google/cloud/dataplex/v1/internal/content_auth_decorator.h" #include "google/cloud/dataplex/v1/internal/content_logging_decorator.h" #include "google/cloud/dataplex/v1/internal/content_metadata_decorator.h" #include "google/cloud/dataplex/v1/internal/content_stub.h" #include "google/cloud/dataplex/v1/internal/content_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/content_tracing_connection.cc b/google/cloud/dataplex/v1/internal/content_tracing_connection.cc index d29319e81dde2..cf64f1fe0f323 100644 --- a/google/cloud/dataplex/v1/internal/content_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/content_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContentServiceTracingConnection::ContentServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -160,16 +158,12 @@ Status ContentServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContentServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataplex/v1/internal/content_tracing_connection.h b/google/cloud/dataplex/v1/internal/content_tracing_connection.h index 7dca58d364786..7e0b8a8b60fa7 100644 --- a/google/cloud/dataplex/v1/internal/content_tracing_connection.h +++ b/google/cloud/dataplex/v1/internal/content_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContentServiceTracingConnection : public dataplex_v1::ContentServiceConnection { public: @@ -88,8 +86,6 @@ class ContentServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataplex/v1/internal/content_tracing_stub.cc b/google/cloud/dataplex/v1/internal/content_tracing_stub.cc index c4a2382f6d30c..134c93c0db169 100644 --- a/google/cloud/dataplex/v1/internal/content_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/content_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContentServiceTracingStub::ContentServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -195,15 +193,9 @@ Status ContentServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContentServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/content_tracing_stub.h b/google/cloud/dataplex/v1/internal/content_tracing_stub.h index 11217eabb333c..fe4ac027a244a 100644 --- a/google/cloud/dataplex/v1/internal/content_tracing_stub.h +++ b/google/cloud/dataplex/v1/internal/content_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContentServiceTracingStub : public ContentServiceStub { public: ~ContentServiceTracingStub() override = default; @@ -102,8 +100,6 @@ class ContentServiceTracingStub : public ContentServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.cc b/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.cc index 3caffb9e2c1f8..ec6c10f46b2f8 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataplex/v1/datascans.proto #include "google/cloud/dataplex/v1/internal/data_scan_auth_decorator.h" -#include +#include "google/cloud/dataplex/v1/datascans.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.h b/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.h index b57041e746802..743cb7d156d83 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.h +++ b/google/cloud/dataplex/v1/internal/data_scan_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/data_scan_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_connection_impl.h b/google/cloud/dataplex/v1/internal/data_scan_connection_impl.h index cd3c80919b6b3..f26390a9fc5fd 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_connection_impl.h +++ b/google/cloud/dataplex/v1/internal/data_scan_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.cc b/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.cc index b07ac282941ed..4ddaa4c9f02fd 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/datascans.proto #include "google/cloud/dataplex/v1/internal/data_scan_logging_decorator.h" +#include "google/cloud/dataplex/v1/datascans.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.h b/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.h index f444b1150c98c..9ee8ec1a7f4a6 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.h +++ b/google/cloud/dataplex/v1/internal/data_scan_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/data_scan_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.cc b/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.cc index a5a24befd80cb..8436f073ef096 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataplex/v1/datascans.proto #include "google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.h" +#include "google/cloud/dataplex/v1/datascans.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 #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.h b/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.h index 826b700b75135..2b32ab7aec4e8 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.h +++ b/google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/data_scan_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_stub.cc b/google/cloud/dataplex/v1/internal/data_scan_stub.cc index e07e76f68f99d..d589c3ef91f50 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_stub.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataplex/v1/datascans.proto #include "google/cloud/dataplex/v1/internal/data_scan_stub.h" +#include "google/cloud/dataplex/v1/datascans.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_stub.h b/google/cloud/dataplex/v1/internal/data_scan_stub.h index 8194d87aec372..85feb91ffefbc 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_stub.h +++ b/google/cloud/dataplex/v1/internal/data_scan_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_DATA_SCAN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_DATA_SCAN_STUB_H +#include "google/cloud/dataplex/v1/datascans.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc b/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc index 22f30c6fc01dc..102f04f644f5b 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/dataplex/v1/datascans.proto #include "google/cloud/dataplex/v1/internal/data_scan_stub_factory.h" +#include "google/cloud/dataplex/v1/datascans.grpc.pb.h" #include "google/cloud/dataplex/v1/internal/data_scan_auth_decorator.h" #include "google/cloud/dataplex/v1/internal/data_scan_logging_decorator.h" #include "google/cloud/dataplex/v1/internal/data_scan_metadata_decorator.h" #include "google/cloud/dataplex/v1/internal/data_scan_stub.h" #include "google/cloud/dataplex/v1/internal/data_scan_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.cc b/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.cc index 8c95fbd7ea0ee..be856afb0a5c0 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataScanServiceTracingConnection::DataScanServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -262,16 +260,12 @@ Status DataScanServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataScanServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.h b/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.h index 5eb629adc7121..b60d94ef13cb9 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.h +++ b/google/cloud/dataplex/v1/internal/data_scan_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataScanServiceTracingConnection : public dataplex_v1::DataScanServiceConnection { public: @@ -128,8 +126,6 @@ class DataScanServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.cc b/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.cc index be3c6d908f33c..39b0f356db787 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataScanServiceTracingStub::DataScanServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -319,15 +317,9 @@ future DataScanServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataScanServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.h b/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.h index 18e5f31aa8ae3..a0285503cb769 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.h +++ b/google/cloud/dataplex/v1/internal/data_scan_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataScanServiceTracingStub : public DataScanServiceStub { public: ~DataScanServiceTracingStub() override = default; @@ -158,8 +156,6 @@ class DataScanServiceTracingStub : public DataScanServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.cc index 177781b94cc0b..d92a8759f74e2 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataplex/v1/data_taxonomy.proto #include "google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.h" -#include +#include "google/cloud/dataplex/v1/data_taxonomy.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.h b/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.h index 48ca9d750e177..8443ae228dd82 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/data_taxonomy_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_connection_impl.h b/google/cloud/dataplex/v1/internal/data_taxonomy_connection_impl.h index 61eb83f336960..eac2af035a718 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_connection_impl.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.cc index 63da576503f42..c1e20f27bc06d 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/data_taxonomy.proto #include "google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.h" +#include "google/cloud/dataplex/v1/data_taxonomy.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.h b/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.h index 8b02a4936371b..c4df5040ac216 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/data_taxonomy_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.cc index cd384264fb317..881c8527c0420 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataplex/v1/data_taxonomy.proto #include "google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.h" +#include "google/cloud/dataplex/v1/data_taxonomy.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 #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.h b/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.h index d224f2898bd0f..53da5d50f63ea 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/data_taxonomy_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc index e2ed351342439..c1b88f76044b5 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataplex/v1/data_taxonomy.proto #include "google/cloud/dataplex/v1/internal/data_taxonomy_stub.h" +#include "google/cloud/dataplex/v1/data_taxonomy.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h index ed8199fcf4994..02cae7377bf0f 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_DATA_TAXONOMY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_DATA_TAXONOMY_STUB_H +#include "google/cloud/dataplex/v1/data_taxonomy.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc index 8b022a9791757..4864f4ba16e68 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/dataplex/v1/data_taxonomy.proto #include "google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.h" +#include "google/cloud/dataplex/v1/data_taxonomy.grpc.pb.h" #include "google/cloud/dataplex/v1/internal/data_taxonomy_auth_decorator.h" #include "google/cloud/dataplex/v1/internal/data_taxonomy_logging_decorator.h" #include "google/cloud/dataplex/v1/internal/data_taxonomy_metadata_decorator.h" #include "google/cloud/dataplex/v1/internal/data_taxonomy_stub.h" #include "google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.cc index 0006a14ec6c35..f74b1f29fcbb6 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataTaxonomyServiceTracingConnection::DataTaxonomyServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -465,17 +463,13 @@ Status DataTaxonomyServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataTaxonomyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.h b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.h index a7c456744ec4b..08a1d0b33a376 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataTaxonomyServiceTracingConnection : public dataplex_v1::DataTaxonomyServiceConnection { public: @@ -215,8 +213,6 @@ class DataTaxonomyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.cc index 689db83e3d457..223c3d4cb8af2 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataTaxonomyServiceTracingStub::DataTaxonomyServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -500,15 +498,9 @@ future DataTaxonomyServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataTaxonomyServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.h b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.h index ff196826e1557..51b60acede50f 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataTaxonomyServiceTracingStub : public DataTaxonomyServiceStub { public: ~DataTaxonomyServiceTracingStub() override = default; @@ -238,8 +236,6 @@ class DataTaxonomyServiceTracingStub : public DataTaxonomyServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.cc b/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.cc index a92508ba657d6..624def3767048 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataplex/v1/service.proto #include "google/cloud/dataplex/v1/internal/dataplex_auth_decorator.h" -#include +#include "google/cloud/dataplex/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.h b/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.h index 806044ec00d1e..51915212a2479 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.h +++ b/google/cloud/dataplex/v1/internal/dataplex_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/dataplex_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_connection_impl.h b/google/cloud/dataplex/v1/internal/dataplex_connection_impl.h index 0103c766fc611..675c010be6415 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_connection_impl.h +++ b/google/cloud/dataplex/v1/internal/dataplex_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.cc b/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.cc index deee104d94539..16960af970c00 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/service.proto #include "google/cloud/dataplex/v1/internal/dataplex_logging_decorator.h" +#include "google/cloud/dataplex/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.h b/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.h index 508c3f78e371b..47699823eb93f 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.h +++ b/google/cloud/dataplex/v1/internal/dataplex_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/dataplex_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.cc b/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.cc index 2745afd776409..bffcfb8520b05 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataplex/v1/service.proto #include "google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.h" +#include "google/cloud/dataplex/v1/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 #include #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.h b/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.h index 1aed7959892a7..0813d1f37b2a4 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.h +++ b/google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataplex/v1/internal/dataplex_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_stub.cc b/google/cloud/dataplex/v1/internal/dataplex_stub.cc index 6bcc28b96ff6d..8605ebe09d4aa 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_stub.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataplex/v1/service.proto #include "google/cloud/dataplex/v1/internal/dataplex_stub.h" +#include "google/cloud/dataplex/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_stub.h b/google/cloud/dataplex/v1/internal/dataplex_stub.h index 8f93b59e4d487..43a9a1e7f4f6e 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_stub.h +++ b/google/cloud/dataplex/v1/internal/dataplex_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_DATAPLEX_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_DATAPLEX_STUB_H +#include "google/cloud/dataplex/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc b/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc index c77cb9d46279c..27d0c719e2235 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/dataplex/v1/internal/dataplex_metadata_decorator.h" #include "google/cloud/dataplex/v1/internal/dataplex_stub.h" #include "google/cloud/dataplex/v1/internal/dataplex_tracing_stub.h" +#include "google/cloud/dataplex/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc b/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc index 32f5b04babdee..ec6045b2380bc 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataplexServiceTracingConnection::DataplexServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -714,16 +712,12 @@ Status DataplexServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataplexServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.h b/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.h index abe90dd27735b..72b25980b9468 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.h +++ b/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataplexServiceTracingConnection : public dataplex_v1::DataplexServiceConnection { public: @@ -282,8 +280,6 @@ class DataplexServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc b/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc index 6492eb83c7fc0..05464434017e1 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataplexServiceTracingStub::DataplexServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -759,15 +757,9 @@ future DataplexServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataplexServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.h b/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.h index c12e67cca3a91..e1abb7bb7546a 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.h +++ b/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataplexServiceTracingStub : public DataplexServiceStub { public: ~DataplexServiceTracingStub() override = default; @@ -326,8 +324,6 @@ class DataplexServiceTracingStub : public DataplexServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/v1/internal/metadata_auth_decorator.cc b/google/cloud/dataplex/v1/internal/metadata_auth_decorator.cc index 7e0a06b072dae..0716ad80c2fc8 100644 --- a/google/cloud/dataplex/v1/internal/metadata_auth_decorator.cc +++ b/google/cloud/dataplex/v1/internal/metadata_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataplex/v1/metadata.proto #include "google/cloud/dataplex/v1/internal/metadata_auth_decorator.h" -#include +#include "google/cloud/dataplex/v1/metadata.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/metadata_logging_decorator.cc b/google/cloud/dataplex/v1/internal/metadata_logging_decorator.cc index 15858bd0d8234..85189b03c818c 100644 --- a/google/cloud/dataplex/v1/internal/metadata_logging_decorator.cc +++ b/google/cloud/dataplex/v1/internal/metadata_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/metadata.proto #include "google/cloud/dataplex/v1/internal/metadata_logging_decorator.h" +#include "google/cloud/dataplex/v1/metadata.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataplex/v1/internal/metadata_metadata_decorator.cc b/google/cloud/dataplex/v1/internal/metadata_metadata_decorator.cc index 90b610f69f31b..7f7a282cf7a9e 100644 --- a/google/cloud/dataplex/v1/internal/metadata_metadata_decorator.cc +++ b/google/cloud/dataplex/v1/internal/metadata_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataplex/v1/metadata.proto #include "google/cloud/dataplex/v1/internal/metadata_metadata_decorator.h" +#include "google/cloud/dataplex/v1/metadata.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 #include #include #include diff --git a/google/cloud/dataplex/v1/internal/metadata_stub.cc b/google/cloud/dataplex/v1/internal/metadata_stub.cc index 42391f6a483e1..601634f38dadb 100644 --- a/google/cloud/dataplex/v1/internal/metadata_stub.cc +++ b/google/cloud/dataplex/v1/internal/metadata_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataplex/v1/metadata.proto #include "google/cloud/dataplex/v1/internal/metadata_stub.h" +#include "google/cloud/dataplex/v1/metadata.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dataplex/v1/internal/metadata_stub.h b/google/cloud/dataplex/v1/internal/metadata_stub.h index 987c7a1d06834..366306372e7c4 100644 --- a/google/cloud/dataplex/v1/internal/metadata_stub.h +++ b/google/cloud/dataplex/v1/internal/metadata_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_METADATA_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_INTERNAL_METADATA_STUB_H +#include "google/cloud/dataplex/v1/metadata.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/metadata_stub_factory.cc b/google/cloud/dataplex/v1/internal/metadata_stub_factory.cc index a9d33ef63353e..cc749d93b0c49 100644 --- a/google/cloud/dataplex/v1/internal/metadata_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/metadata_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/dataplex/v1/internal/metadata_metadata_decorator.h" #include "google/cloud/dataplex/v1/internal/metadata_stub.h" #include "google/cloud/dataplex/v1/internal/metadata_tracing_stub.h" +#include "google/cloud/dataplex/v1/metadata.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc b/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc index 2ed4ace9cd05a..b77e8863dd984 100644 --- a/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetadataServiceTracingConnection::MetadataServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -199,16 +197,12 @@ Status MetadataServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetadataServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataplex/v1/internal/metadata_tracing_connection.h b/google/cloud/dataplex/v1/internal/metadata_tracing_connection.h index b703eec1cfa2a..e4c1ee933fc7f 100644 --- a/google/cloud/dataplex/v1/internal/metadata_tracing_connection.h +++ b/google/cloud/dataplex/v1/internal/metadata_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetadataServiceTracingConnection : public dataplex_v1::MetadataServiceConnection { public: @@ -100,8 +98,6 @@ class MetadataServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataplex/v1/internal/metadata_tracing_stub.cc b/google/cloud/dataplex/v1/internal/metadata_tracing_stub.cc index bff040df06516..eb7802d69f462 100644 --- a/google/cloud/dataplex/v1/internal/metadata_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/metadata_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetadataServiceTracingStub::MetadataServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -242,15 +240,9 @@ Status MetadataServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetadataServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/metadata_tracing_stub.h b/google/cloud/dataplex/v1/internal/metadata_tracing_stub.h index 43bd2d4b51804..c55f2da4dc42a 100644 --- a/google/cloud/dataplex/v1/internal/metadata_tracing_stub.h +++ b/google/cloud/dataplex/v1/internal/metadata_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataplex_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetadataServiceTracingStub : public MetadataServiceStub { public: ~MetadataServiceTracingStub() override = default; @@ -120,8 +118,6 @@ class MetadataServiceTracingStub : public MetadataServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataplex/v1/metadata_connection.h b/google/cloud/dataplex/v1/metadata_connection.h index 4bc74ba4b82aa..2524e1d5dcff9 100644 --- a/google/cloud/dataplex/v1/metadata_connection.h +++ b/google/cloud/dataplex/v1/metadata_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_METADATA_CONNECTION_H #include "google/cloud/dataplex/v1/internal/metadata_retry_traits.h" +#include "google/cloud/dataplex/v1/metadata.pb.h" #include "google/cloud/dataplex/v1/metadata_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/dataplex/v1/metadata_connection_idempotency_policy.h b/google/cloud/dataplex/v1/metadata_connection_idempotency_policy.h index 981d20cc77cbf..9d6423f496939 100644 --- a/google/cloud/dataplex/v1/metadata_connection_idempotency_policy.h +++ b/google/cloud/dataplex/v1/metadata_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_V1_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataplex/v1/metadata.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/BUILD.bazel b/google/cloud/dataproc/BUILD.bazel index 995a3c6c8aa79..48d6ef08d7520 100644 --- a/google/cloud/dataproc/BUILD.bazel +++ b/google/cloud/dataproc/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/dataproc/v1:dataproc_cc_grpc", + "@googleapis//google/cloud/dataproc/v1:dataproc_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/dataproc/quickstart/.bazelrc b/google/cloud/dataproc/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/dataproc/quickstart/.bazelrc +++ b/google/cloud/dataproc/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/dataproc/v1/autoscaling_policy_connection.h b/google/cloud/dataproc/v1/autoscaling_policy_connection.h index e424723450680..229f082092d46 100644 --- a/google/cloud/dataproc/v1/autoscaling_policy_connection.h +++ b/google/cloud/dataproc/v1/autoscaling_policy_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_AUTOSCALING_POLICY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_AUTOSCALING_POLICY_CONNECTION_H +#include "google/cloud/dataproc/v1/autoscaling_policies.pb.h" #include "google/cloud/dataproc/v1/autoscaling_policy_connection_idempotency_policy.h" #include "google/cloud/dataproc/v1/internal/autoscaling_policy_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dataproc/v1/autoscaling_policy_connection_idempotency_policy.h b/google/cloud/dataproc/v1/autoscaling_policy_connection_idempotency_policy.h index 16474827e5bc3..b1652a05bd96a 100644 --- a/google/cloud/dataproc/v1/autoscaling_policy_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/autoscaling_policy_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_AUTOSCALING_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_AUTOSCALING_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/autoscaling_policies.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/batch_controller_client.h b/google/cloud/dataproc/v1/batch_controller_client.h index 8e81a3379d04f..3b7e5082d1334 100644 --- a/google/cloud/dataproc/v1/batch_controller_client.h +++ b/google/cloud/dataproc/v1/batch_controller_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/batch_controller_connection.h b/google/cloud/dataproc/v1/batch_controller_connection.h index 27880fb14d3e1..a484f14a1599f 100644 --- a/google/cloud/dataproc/v1/batch_controller_connection.h +++ b/google/cloud/dataproc/v1/batch_controller_connection.h @@ -20,7 +20,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_BATCH_CONTROLLER_CONNECTION_H #include "google/cloud/dataproc/v1/batch_controller_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/batches.pb.h" #include "google/cloud/dataproc/v1/internal/batch_controller_retry_traits.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/batch_controller_connection_idempotency_policy.h b/google/cloud/dataproc/v1/batch_controller_connection_idempotency_policy.h index 944402f868bf5..6ffb2b1f95a5f 100644 --- a/google/cloud/dataproc/v1/batch_controller_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/batch_controller_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_BATCH_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_BATCH_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/batches.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/cluster_controller_client.h b/google/cloud/dataproc/v1/cluster_controller_client.h index 85e521a2116f5..20a6b2379fbe9 100644 --- a/google/cloud/dataproc/v1/cluster_controller_client.h +++ b/google/cloud/dataproc/v1/cluster_controller_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/cluster_controller_connection.h b/google/cloud/dataproc/v1/cluster_controller_connection.h index bd5bb4d20f1c8..ca0cd3bbebc8a 100644 --- a/google/cloud/dataproc/v1/cluster_controller_connection.h +++ b/google/cloud/dataproc/v1/cluster_controller_connection.h @@ -20,7 +20,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_CLUSTER_CONTROLLER_CONNECTION_H #include "google/cloud/dataproc/v1/cluster_controller_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/clusters.pb.h" #include "google/cloud/dataproc/v1/internal/cluster_controller_retry_traits.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/cluster_controller_connection_idempotency_policy.h b/google/cloud/dataproc/v1/cluster_controller_connection_idempotency_policy.h index c2f7b2bc1cb3d..33f683ba8e2a5 100644 --- a/google/cloud/dataproc/v1/cluster_controller_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/cluster_controller_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_CLUSTER_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_CLUSTER_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/clusters.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_auth_decorator.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_auth_decorator.cc index 49b27322226d7..0b33aa8772cac 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/autoscaling_policies.proto #include "google/cloud/dataproc/v1/internal/autoscaling_policy_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/autoscaling_policies.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_logging_decorator.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_logging_decorator.cc index 0c2b8302455db..679ad252bb4bb 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/autoscaling_policies.proto #include "google/cloud/dataproc/v1/internal/autoscaling_policy_logging_decorator.h" +#include "google/cloud/dataproc/v1/autoscaling_policies.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_metadata_decorator.cc index 62406e0ec4f0a..3c54c9a1c27d4 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/autoscaling_policies.proto #include "google/cloud/dataproc/v1/internal/autoscaling_policy_metadata_decorator.h" +#include "google/cloud/dataproc/v1/autoscaling_policies.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.cc index ed499879af17f..1fa75b85a43d7 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/autoscaling_policies.proto #include "google/cloud/dataproc/v1/internal/autoscaling_policy_stub.h" +#include "google/cloud/dataproc/v1/autoscaling_policies.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.h b/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.h index f962b8a63191c..784e0a3d34cec 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.h +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_AUTOSCALING_POLICY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_AUTOSCALING_POLICY_STUB_H +#include "google/cloud/dataproc/v1/autoscaling_policies.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_stub_factory.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_stub_factory.cc index eda924a21d7dc..0e61dff7b8367 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/dataproc/v1/autoscaling_policies.proto #include "google/cloud/dataproc/v1/internal/autoscaling_policy_stub_factory.h" +#include "google/cloud/dataproc/v1/autoscaling_policies.grpc.pb.h" #include "google/cloud/dataproc/v1/internal/autoscaling_policy_auth_decorator.h" #include "google/cloud/dataproc/v1/internal/autoscaling_policy_logging_decorator.h" #include "google/cloud/dataproc/v1/internal/autoscaling_policy_metadata_decorator.h" @@ -28,9 +29,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc index a1d6409113248..98f1c2be3428b 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutoscalingPolicyServiceTracingConnection:: AutoscalingPolicyServiceTracingConnection( std::shared_ptr child) @@ -151,17 +149,13 @@ Status AutoscalingPolicyServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutoscalingPolicyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.h b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.h index 03f05d5deb716..b0e08f876e8c3 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutoscalingPolicyServiceTracingConnection : public dataproc_v1::AutoscalingPolicyServiceConnection { public: @@ -88,8 +86,6 @@ class AutoscalingPolicyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.cc index 79467ae253115..e6f8dcd0d55ab 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutoscalingPolicyServiceTracingStub::AutoscalingPolicyServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -187,16 +185,10 @@ Status AutoscalingPolicyServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutoscalingPolicyServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.h b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.h index 43b4cfa209acf..6622bd97863bc 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutoscalingPolicyServiceTracingStub : public AutoscalingPolicyServiceStub { public: @@ -102,8 +100,6 @@ class AutoscalingPolicyServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.cc b/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.cc index c1cc8ded95c75..1ce673e50231b 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/batches.proto #include "google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/batches.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.h b/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.h index bc234de0ea28c..2d4aa625d6092 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/batch_controller_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_connection_impl.h b/google/cloud/dataproc/v1/internal/batch_controller_connection_impl.h index 8073eebe8c34f..9a741948c21ae 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_connection_impl.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.cc b/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.cc index 9c269cdafc1b2..9ca5ff2206b6c 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/batches.proto #include "google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.h" +#include "google/cloud/dataproc/v1/batches.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.h b/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.h index c80938dee2e18..331b9ade9d10e 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/batch_controller_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.cc index 56887d7672e68..58562e26e69d2 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/batches.proto #include "google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.h" +#include "google/cloud/dataproc/v1/batches.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.h b/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.h index 09aa631709906..8730bcf11d46c 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/batch_controller_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_stub.cc b/google/cloud/dataproc/v1/internal/batch_controller_stub.cc index 41f138ae07125..2fb6eda8e9b46 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataproc/v1/batches.proto #include "google/cloud/dataproc/v1/internal/batch_controller_stub.h" +#include "google/cloud/dataproc/v1/batches.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_stub.h b/google/cloud/dataproc/v1/internal/batch_controller_stub.h index 671c8a668d575..bfeaff1b0b353 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_BATCH_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_BATCH_CONTROLLER_STUB_H +#include "google/cloud/dataproc/v1/batches.grpc.pb.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc index ec5d6fc7cea66..ebf31ee2dccd0 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/dataproc/v1/batches.proto #include "google/cloud/dataproc/v1/internal/batch_controller_stub_factory.h" +#include "google/cloud/dataproc/v1/batches.grpc.pb.h" #include "google/cloud/dataproc/v1/internal/batch_controller_auth_decorator.h" #include "google/cloud/dataproc/v1/internal/batch_controller_logging_decorator.h" #include "google/cloud/dataproc/v1/internal/batch_controller_metadata_decorator.h" @@ -28,9 +29,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc index 71043b5bfda2b..49035ed334745 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BatchControllerTracingConnection::BatchControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -152,16 +150,12 @@ Status BatchControllerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBatchControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.h b/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.h index 1c224784bfc1a..fc69309bb4c56 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BatchControllerTracingConnection : public dataproc_v1::BatchControllerConnection { public: @@ -84,8 +82,6 @@ class BatchControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc index 41d547c3d735e..833b8eba48d07 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BatchControllerTracingStub::BatchControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -201,15 +199,9 @@ future BatchControllerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBatchControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.h b/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.h index a7b7a1e90b022..095becc5a244b 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BatchControllerTracingStub : public BatchControllerStub { public: ~BatchControllerTracingStub() override = default; @@ -107,8 +105,6 @@ class BatchControllerTracingStub : public BatchControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.cc b/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.cc index a6db7ae55da62..d6f8a7bb588d7 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/clusters.proto #include "google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/clusters.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.h b/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.h index 439ec36437505..85a2611dab7a9 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/cluster_controller_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_connection_impl.h b/google/cloud/dataproc/v1/internal/cluster_controller_connection_impl.h index cf57a2f758e78..24456ce55d2ca 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_connection_impl.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.cc b/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.cc index 0dfb7d8de30ef..41c7431a080f5 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/clusters.proto #include "google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.h" +#include "google/cloud/dataproc/v1/clusters.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.h b/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.h index 8a943fa61c232..05c5318aaf15a 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/cluster_controller_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.cc index 5010d64ed38a6..3998657c8e488 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/clusters.proto #include "google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.h" +#include "google/cloud/dataproc/v1/clusters.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.h b/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.h index 5911c4fae85ca..60ad53dffff4b 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/cluster_controller_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc b/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc index 490cbd0cd299f..9430be9b6ede1 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataproc/v1/clusters.proto #include "google/cloud/dataproc/v1/internal/cluster_controller_stub.h" +#include "google/cloud/dataproc/v1/clusters.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_stub.h b/google/cloud/dataproc/v1/internal/cluster_controller_stub.h index 153f8ccae188c..906157c4cfade 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_CLUSTER_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_CLUSTER_CONTROLLER_STUB_H +#include "google/cloud/dataproc/v1/clusters.grpc.pb.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc index 1c1c63261e50d..adae5e3c3a67c 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/dataproc/v1/clusters.proto #include "google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.h" +#include "google/cloud/dataproc/v1/clusters.grpc.pb.h" #include "google/cloud/dataproc/v1/internal/cluster_controller_auth_decorator.h" #include "google/cloud/dataproc/v1/internal/cluster_controller_logging_decorator.h" #include "google/cloud/dataproc/v1/internal/cluster_controller_metadata_decorator.h" @@ -28,9 +29,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc index 6cfacd0d78bf3..cd0b9729f4e74 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ClusterControllerTracingConnection::ClusterControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -285,17 +283,13 @@ Status ClusterControllerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeClusterControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.h b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.h index 39e7f150022d8..9340c9c22e43c 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ClusterControllerTracingConnection : public dataproc_v1::ClusterControllerConnection { public: @@ -139,8 +137,6 @@ class ClusterControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc index 667e86c5e8cfb..5bb9d8f640e56 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ClusterControllerTracingStub::ClusterControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -321,15 +319,9 @@ future ClusterControllerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeClusterControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.h b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.h index 5aff2cb6c8891..83bc5c686958b 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ClusterControllerTracingStub : public ClusterControllerStub { public: ~ClusterControllerTracingStub() override = default; @@ -161,8 +159,6 @@ class ClusterControllerTracingStub : public ClusterControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.cc b/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.cc index a8e8c9d3ee654..b8442f61f592d 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/jobs.proto #include "google/cloud/dataproc/v1/internal/job_controller_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/jobs.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.h b/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.h index 2bd9967d5a427..40cf5d31fd9cf 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.h +++ b/google/cloud/dataproc/v1/internal/job_controller_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/job_controller_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_connection_impl.h b/google/cloud/dataproc/v1/internal/job_controller_connection_impl.h index f9ab1f12f364f..6eb200056ed5e 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_connection_impl.h +++ b/google/cloud/dataproc/v1/internal/job_controller_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.cc b/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.cc index 305bfdc7f6779..4dacaad3567a8 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/jobs.proto #include "google/cloud/dataproc/v1/internal/job_controller_logging_decorator.h" +#include "google/cloud/dataproc/v1/jobs.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.h b/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.h index cc06e148689da..925c623f5b39a 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.h +++ b/google/cloud/dataproc/v1/internal/job_controller_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/job_controller_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.cc index 9765d358a7f91..59c967cecd22a 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/jobs.proto #include "google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.h" +#include "google/cloud/dataproc/v1/jobs.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.h b/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.h index bb9dcc6ab5d7d..4d04435615d17 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.h +++ b/google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/job_controller_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_stub.cc b/google/cloud/dataproc/v1/internal/job_controller_stub.cc index 128adaea218e9..fa24699766e0b 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataproc/v1/jobs.proto #include "google/cloud/dataproc/v1/internal/job_controller_stub.h" +#include "google/cloud/dataproc/v1/jobs.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_stub.h b/google/cloud/dataproc/v1/internal/job_controller_stub.h index c400280c5ccdb..04b0a634b58b6 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/job_controller_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_JOB_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_JOB_CONTROLLER_STUB_H +#include "google/cloud/dataproc/v1/jobs.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc index ee48edc105cd7..424b90c93ba25 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/dataproc/v1/internal/job_controller_metadata_decorator.h" #include "google/cloud/dataproc/v1/internal/job_controller_stub.h" #include "google/cloud/dataproc/v1/internal/job_controller_tracing_stub.h" +#include "google/cloud/dataproc/v1/jobs.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc index 5e2daa808e3c3..ee69442d44bd7 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobControllerTracingConnection::JobControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -179,16 +177,12 @@ Status JobControllerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.h b/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.h index 66ffbabed5b78..ef6904b1b920e 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobControllerTracingConnection : public dataproc_v1::JobControllerConnection { public: @@ -93,8 +91,6 @@ class JobControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc index 3107041fd1872..663eb4aaa47fa 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobControllerTracingStub::JobControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -233,15 +231,9 @@ future JobControllerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.h b/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.h index 28ffa483c5513..00815dee8145a 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobControllerTracingStub : public JobControllerStub { public: ~JobControllerTracingStub() override = default; @@ -118,8 +116,6 @@ class JobControllerTracingStub : public JobControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.cc b/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.cc index 76b2bf2bc5b24..b35331bdca9fe 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/node_groups.proto #include "google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/node_groups.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.h b/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.h index 17a245666056f..a8b39bc20e649 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/node_group_controller_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_connection_impl.h b/google/cloud/dataproc/v1/internal/node_group_controller_connection_impl.h index 7943478eb9c89..a24b6b88d3d56 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_connection_impl.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.cc b/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.cc index 7db9bd2346aa3..c20d72628ebba 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/node_groups.proto #include "google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.h" +#include "google/cloud/dataproc/v1/node_groups.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.h b/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.h index 8fb3ad669a139..630845068eda0 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/node_group_controller_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.cc index ad077d8c1dc71..f674bd6b133a4 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/node_groups.proto #include "google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.h" +#include "google/cloud/dataproc/v1/node_groups.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.h b/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.h index 37ff1a33ac928..694c3aaceff2d 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/node_group_controller_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc b/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc index 0dfe8a387f321..6025822472a1d 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataproc/v1/node_groups.proto #include "google/cloud/dataproc/v1/internal/node_group_controller_stub.h" +#include "google/cloud/dataproc/v1/node_groups.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_stub.h b/google/cloud/dataproc/v1/internal/node_group_controller_stub.h index 47054c7d25bf6..e7738b0e4a07f 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_NODE_GROUP_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_NODE_GROUP_CONTROLLER_STUB_H +#include "google/cloud/dataproc/v1/node_groups.grpc.pb.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc index 003bfde28a3e1..768d084f37ded 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/dataproc/v1/internal/node_group_controller_metadata_decorator.h" #include "google/cloud/dataproc/v1/internal/node_group_controller_stub.h" #include "google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.h" +#include "google/cloud/dataproc/v1/node_groups.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc index 6c062b8815e9b..4ef8158efd4b4 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NodeGroupControllerTracingConnection::NodeGroupControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -163,17 +161,13 @@ Status NodeGroupControllerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNodeGroupControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.h b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.h index 54cce1456d2e6..1650a7e2e627a 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NodeGroupControllerTracingConnection : public dataproc_v1::NodeGroupControllerConnection { public: @@ -92,8 +90,6 @@ class NodeGroupControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc index 71ce41ea885d0..47abd89d9f6e5 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NodeGroupControllerTracingStub::NodeGroupControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -206,15 +204,9 @@ future NodeGroupControllerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNodeGroupControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.h b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.h index 1220209b98671..6d28797c2c702 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NodeGroupControllerTracingStub : public NodeGroupControllerStub { public: ~NodeGroupControllerTracingStub() override = default; @@ -113,8 +111,6 @@ class NodeGroupControllerTracingStub : public NodeGroupControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.cc b/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.cc index 70f81ebf7fa0e..0114f923c0af5 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/sessions.proto #include "google/cloud/dataproc/v1/internal/session_controller_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/sessions.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.h b/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.h index 8d01076b0e2da..faa1a37d12404 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.h +++ b/google/cloud/dataproc/v1/internal/session_controller_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/session_controller_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_connection_impl.h b/google/cloud/dataproc/v1/internal/session_controller_connection_impl.h index 0a2f18128008e..8dc90b77bc40e 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_connection_impl.h +++ b/google/cloud/dataproc/v1/internal/session_controller_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.cc b/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.cc index 3c1cfe37af4b6..ef9fa171bbf0c 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/sessions.proto #include "google/cloud/dataproc/v1/internal/session_controller_logging_decorator.h" +#include "google/cloud/dataproc/v1/sessions.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.h b/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.h index 122cd5f867d3a..ed6e0e9f651fc 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.h +++ b/google/cloud/dataproc/v1/internal/session_controller_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/session_controller_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.cc index 19b878b1fde04..c23eedb130c98 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/sessions.proto #include "google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.h" +#include "google/cloud/dataproc/v1/sessions.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.h b/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.h index 3e688938cb4d8..2e52689352834 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.h +++ b/google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/session_controller_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_stub.cc b/google/cloud/dataproc/v1/internal/session_controller_stub.cc index ad369e5969203..e37c91fa4dba0 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataproc/v1/sessions.proto #include "google/cloud/dataproc/v1/internal/session_controller_stub.h" +#include "google/cloud/dataproc/v1/sessions.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_stub.h b/google/cloud/dataproc/v1/internal/session_controller_stub.h index 89bc759e3e5e0..a2784fb29fe71 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/session_controller_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_SESSION_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_SESSION_CONTROLLER_STUB_H +#include "google/cloud/dataproc/v1/operations.pb.h" +#include "google/cloud/dataproc/v1/sessions.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc index 6d68ad906a4de..5171b771fa067 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/dataproc/v1/internal/session_controller_metadata_decorator.h" #include "google/cloud/dataproc/v1/internal/session_controller_stub.h" #include "google/cloud/dataproc/v1/internal/session_controller_tracing_stub.h" +#include "google/cloud/dataproc/v1/sessions.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.cc index 274a7e8f4f539..9eab4ea686c66 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionControllerTracingConnection::SessionControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -202,17 +200,13 @@ Status SessionControllerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.h b/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.h index 3af4be9d7533e..e25283d62753b 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/session_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionControllerTracingConnection : public dataproc_v1::SessionControllerConnection { public: @@ -107,8 +105,6 @@ class SessionControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.cc index 60757189b9a75..98e05178c5e14 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionControllerTracingStub::SessionControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -243,15 +241,9 @@ future SessionControllerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.h b/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.h index 65018a37f381c..7cfc06c7aa565 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/session_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionControllerTracingStub : public SessionControllerStub { public: ~SessionControllerTracingStub() override = default; @@ -129,8 +127,6 @@ class SessionControllerTracingStub : public SessionControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_auth_decorator.cc b/google/cloud/dataproc/v1/internal/session_template_controller_auth_decorator.cc index 0147315f67049..84711c9aaa5be 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/session_templates.proto #include "google/cloud/dataproc/v1/internal/session_template_controller_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/session_templates.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_logging_decorator.cc b/google/cloud/dataproc/v1/internal/session_template_controller_logging_decorator.cc index ae438c8262458..7b32c8c21332f 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/session_templates.proto #include "google/cloud/dataproc/v1/internal/session_template_controller_logging_decorator.h" +#include "google/cloud/dataproc/v1/session_templates.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/session_template_controller_metadata_decorator.cc index 4ea4f02821ed5..b2f49e4860449 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/session_templates.proto #include "google/cloud/dataproc/v1/internal/session_template_controller_metadata_decorator.h" +#include "google/cloud/dataproc/v1/session_templates.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_stub.cc b/google/cloud/dataproc/v1/internal/session_template_controller_stub.cc index 139fab44f6140..393180c51316b 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/session_templates.proto #include "google/cloud/dataproc/v1/internal/session_template_controller_stub.h" +#include "google/cloud/dataproc/v1/session_templates.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_stub.h b/google/cloud/dataproc/v1/internal/session_template_controller_stub.h index dc0a9d4b809fa..a12e2ff39c378 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/session_template_controller_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_SESSION_TEMPLATE_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_SESSION_TEMPLATE_CONTROLLER_STUB_H +#include "google/cloud/dataproc/v1/session_templates.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/session_template_controller_stub_factory.cc index 26a7268b8513f..1a666720c3b48 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/dataproc/v1/internal/session_template_controller_metadata_decorator.h" #include "google/cloud/dataproc/v1/internal/session_template_controller_stub.h" #include "google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.h" +#include "google/cloud/dataproc/v1/session_templates.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.cc index bc93ce5f179b5..3a87b35cf55b8 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionTemplateControllerTracingConnection:: SessionTemplateControllerTracingConnection( std::shared_ptr child) @@ -147,17 +145,13 @@ Status SessionTemplateControllerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionTemplateControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.h b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.h index 405b531b22470..a557af4393b58 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionTemplateControllerTracingConnection : public dataproc_v1::SessionTemplateControllerConnection { public: @@ -85,8 +83,6 @@ class SessionTemplateControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.cc index ed797220cb2f8..ccfb01129a409 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionTemplateControllerTracingStub::SessionTemplateControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -179,17 +177,11 @@ Status SessionTemplateControllerTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionTemplateControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.h b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.h index 02ed759e87ca9..1d60f4aadf6f7 100644 --- a/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/session_template_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionTemplateControllerTracingStub : public SessionTemplateControllerStub { public: @@ -100,8 +98,6 @@ class SessionTemplateControllerTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.cc b/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.cc index 898fe096026b0..95b5b08a09d82 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dataproc/v1/workflow_templates.proto #include "google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.h" -#include +#include "google/cloud/dataproc/v1/workflow_templates.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.h b/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.h index 61ef2f7f40646..fee318b4b5567 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/workflow_template_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_connection_impl.h b/google/cloud/dataproc/v1/internal/workflow_template_connection_impl.h index 9a694690d314c..c29d80f959f5e 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_connection_impl.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.cc b/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.cc index 9792c046b33a0..d7712e6f08575 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dataproc/v1/workflow_templates.proto #include "google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.h" +#include "google/cloud/dataproc/v1/workflow_templates.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.h b/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.h index 8e98b02c450d5..31b1e0274e6de 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/workflow_template_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.cc b/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.cc index 5aef8d0bf8caa..3e2d7ae30cfdd 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dataproc/v1/workflow_templates.proto #include "google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.h" +#include "google/cloud/dataproc/v1/workflow_templates.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 #include #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.h b/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.h index df9ccfa612a2e..0ae58f8649483 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dataproc/v1/internal/workflow_template_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_stub.cc b/google/cloud/dataproc/v1/internal/workflow_template_stub.cc index c67c534831df6..908ffe90bd0eb 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_stub.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dataproc/v1/workflow_templates.proto #include "google/cloud/dataproc/v1/internal/workflow_template_stub.h" +#include "google/cloud/dataproc/v1/workflow_templates.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_stub.h b/google/cloud/dataproc/v1/internal/workflow_template_stub.h index a1c77143f0b67..2993318d2c44e 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_stub.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_WORKFLOW_TEMPLATE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_INTERNAL_WORKFLOW_TEMPLATE_STUB_H +#include "google/cloud/dataproc/v1/workflow_templates.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc b/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc index 6426cf1ed81e3..3d19d108b8139 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/dataproc/v1/internal/workflow_template_metadata_decorator.h" #include "google/cloud/dataproc/v1/internal/workflow_template_stub.h" #include "google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.h" +#include "google/cloud/dataproc/v1/workflow_templates.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc b/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc index 7be38e142f184..810e5b5fea8b9 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WorkflowTemplateServiceTracingConnection:: WorkflowTemplateServiceTracingConnection( std::shared_ptr child) @@ -216,17 +214,13 @@ Status WorkflowTemplateServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWorkflowTemplateServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.h b/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.h index 46d0d65857234..e74d0afe9f0f9 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WorkflowTemplateServiceTracingConnection : public dataproc_v1::WorkflowTemplateServiceConnection { public: @@ -116,8 +114,6 @@ class WorkflowTemplateServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc b/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc index 36082746dae86..f26eae2e6954c 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WorkflowTemplateServiceTracingStub::WorkflowTemplateServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -273,16 +271,10 @@ future WorkflowTemplateServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWorkflowTemplateServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.h b/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.h index 6e3a6c6a65126..13cee06a7adb8 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dataproc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WorkflowTemplateServiceTracingStub : public WorkflowTemplateServiceStub { public: ~WorkflowTemplateServiceTracingStub() override = default; @@ -139,8 +137,6 @@ class WorkflowTemplateServiceTracingStub : public WorkflowTemplateServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dataproc/v1/job_controller_client.h b/google/cloud/dataproc/v1/job_controller_client.h index a0488c39774bd..888519648d4fe 100644 --- a/google/cloud/dataproc/v1/job_controller_client.h +++ b/google/cloud/dataproc/v1/job_controller_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/job_controller_connection.h b/google/cloud/dataproc/v1/job_controller_connection.h index f4edb69373c41..4be9fba86163e 100644 --- a/google/cloud/dataproc/v1/job_controller_connection.h +++ b/google/cloud/dataproc/v1/job_controller_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/dataproc/v1/internal/job_controller_retry_traits.h" #include "google/cloud/dataproc/v1/job_controller_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/jobs.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/job_controller_connection_idempotency_policy.h b/google/cloud/dataproc/v1/job_controller_connection_idempotency_policy.h index c21f42ad595f0..40004c0585667 100644 --- a/google/cloud/dataproc/v1/job_controller_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/job_controller_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_JOB_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_JOB_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/jobs.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/node_group_controller_client.h b/google/cloud/dataproc/v1/node_group_controller_client.h index 7f8cf9206ee6b..e59cc1eb2d6b4 100644 --- a/google/cloud/dataproc/v1/node_group_controller_client.h +++ b/google/cloud/dataproc/v1/node_group_controller_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/node_group_controller_connection.h b/google/cloud/dataproc/v1/node_group_controller_connection.h index e1ea0c480821e..bbe5f2fc0ec82 100644 --- a/google/cloud/dataproc/v1/node_group_controller_connection.h +++ b/google/cloud/dataproc/v1/node_group_controller_connection.h @@ -21,6 +21,8 @@ #include "google/cloud/dataproc/v1/internal/node_group_controller_retry_traits.h" #include "google/cloud/dataproc/v1/node_group_controller_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/node_groups.pb.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/node_group_controller_connection_idempotency_policy.h b/google/cloud/dataproc/v1/node_group_controller_connection_idempotency_policy.h index 2005d1a34183c..def8b10be0c87 100644 --- a/google/cloud/dataproc/v1/node_group_controller_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/node_group_controller_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_NODE_GROUP_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_NODE_GROUP_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/node_groups.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/session_controller_client.h b/google/cloud/dataproc/v1/session_controller_client.h index 511adf5658a23..c0c7899d4761e 100644 --- a/google/cloud/dataproc/v1/session_controller_client.h +++ b/google/cloud/dataproc/v1/session_controller_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/session_controller_connection.h b/google/cloud/dataproc/v1/session_controller_connection.h index 36345ea402e0d..0156c5b32b62e 100644 --- a/google/cloud/dataproc/v1/session_controller_connection.h +++ b/google/cloud/dataproc/v1/session_controller_connection.h @@ -20,7 +20,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_SESSION_CONTROLLER_CONNECTION_H #include "google/cloud/dataproc/v1/internal/session_controller_retry_traits.h" +#include "google/cloud/dataproc/v1/operations.pb.h" #include "google/cloud/dataproc/v1/session_controller_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/sessions.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/session_controller_connection_idempotency_policy.h b/google/cloud/dataproc/v1/session_controller_connection_idempotency_policy.h index 2923d64dc5b06..662b28bc56ca2 100644 --- a/google/cloud/dataproc/v1/session_controller_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/session_controller_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_SESSION_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_SESSION_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/sessions.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/session_template_controller_connection.h b/google/cloud/dataproc/v1/session_template_controller_connection.h index 688ff76299b60..7cfa2029c0e0e 100644 --- a/google/cloud/dataproc/v1/session_template_controller_connection.h +++ b/google/cloud/dataproc/v1/session_template_controller_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/dataproc/v1/internal/session_template_controller_retry_traits.h" #include "google/cloud/dataproc/v1/session_template_controller_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/session_templates.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dataproc/v1/session_template_controller_connection_idempotency_policy.h b/google/cloud/dataproc/v1/session_template_controller_connection_idempotency_policy.h index 2a641c638f8e1..75c484c9e33ac 100644 --- a/google/cloud/dataproc/v1/session_template_controller_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/session_template_controller_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_SESSION_TEMPLATE_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_SESSION_TEMPLATE_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/session_templates.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dataproc/v1/workflow_template_client.h b/google/cloud/dataproc/v1/workflow_template_client.h index 3645bf1b3245f..6b5068f653a08 100644 --- a/google/cloud/dataproc/v1/workflow_template_client.h +++ b/google/cloud/dataproc/v1/workflow_template_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dataproc/v1/workflow_template_connection.h b/google/cloud/dataproc/v1/workflow_template_connection.h index 44ed8e1cfbe07..9beca4f4b6a9f 100644 --- a/google/cloud/dataproc/v1/workflow_template_connection.h +++ b/google/cloud/dataproc/v1/workflow_template_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/dataproc/v1/internal/workflow_template_retry_traits.h" #include "google/cloud/dataproc/v1/workflow_template_connection_idempotency_policy.h" +#include "google/cloud/dataproc/v1/workflow_templates.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dataproc/v1/workflow_template_connection_idempotency_policy.h b/google/cloud/dataproc/v1/workflow_template_connection_idempotency_policy.h index 86c46bc8cac38..93db3715f791b 100644 --- a/google/cloud/dataproc/v1/workflow_template_connection_idempotency_policy.h +++ b/google/cloud/dataproc/v1/workflow_template_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_WORKFLOW_TEMPLATE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_V1_WORKFLOW_TEMPLATE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dataproc/v1/workflow_templates.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastore/BUILD.bazel b/google/cloud/datastore/BUILD.bazel index 7dd59551f7cb6..2e35b12614b8d 100644 --- a/google/cloud/datastore/BUILD.bazel +++ b/google/cloud/datastore/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/datastore/v1:datastore_cc_grpc", + "@googleapis//google/datastore/v1:datastore_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/datastore/admin/v1/datastore_admin_client.h b/google/cloud/datastore/admin/v1/datastore_admin_client.h index ea9a131878b8c..0187365b0cd68 100644 --- a/google/cloud/datastore/admin/v1/datastore_admin_client.h +++ b/google/cloud/datastore/admin/v1/datastore_admin_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/admin/v1/datastore_admin_connection.h b/google/cloud/datastore/admin/v1/datastore_admin_connection.h index c9099e4d3d219..103a89ccbee99 100644 --- a/google/cloud/datastore/admin/v1/datastore_admin_connection.h +++ b/google/cloud/datastore/admin/v1/datastore_admin_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/datastore/admin/v1/datastore_admin.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastore/admin/v1/datastore_admin_connection_idempotency_policy.h b/google/cloud/datastore/admin/v1/datastore_admin_connection_idempotency_policy.h index d78abe1cd49ba..da8562b1d7271 100644 --- a/google/cloud/datastore/admin/v1/datastore_admin_connection_idempotency_policy.h +++ b/google/cloud/datastore/admin/v1/datastore_admin_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.cc index 50fc0ee8b3c64..1cf8e8651cefa 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/datastore/admin/v1/datastore_admin.proto #include "google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.h" -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.h index 4c4c2666859b1..65973284c3e91 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_connection_impl.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_connection_impl.h index f541a356bc2b6..621cf39ac9263 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_connection_impl.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.cc index 0e6b75596b449..34d3aa6af2fe1 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.h index 41cebc3dbde67..b1c61df1ac10b 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.cc index 50fcd44fc5be0..f96c2046844bb 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.h index 8884cb69ff0d5..a5c323d27ed65 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc index a0f65d13304d6..e245cd7696b27 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h index 2265f2417937e..a681ed69134cc 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc index 3bc370a35ff10..da3f8f829cd66 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/datastore/admin/v1/datastore_admin.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc index 1bf2e5beba331..cc55fecc9aa88 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datastore_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatastoreAdminTracingConnection::DatastoreAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -203,16 +201,12 @@ Status DatastoreAdminTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatastoreAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.h index cc75bbe19c420..18baf26e2af5e 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datastore_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatastoreAdminTracingConnection : public datastore_admin_v1::DatastoreAdminConnection { public: @@ -106,8 +104,6 @@ class DatastoreAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc index 6206228035d4a..6c954464b8d93 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datastore_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatastoreAdminTracingStub::DatastoreAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -234,15 +232,9 @@ future DatastoreAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatastoreAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.h index 10d180880c4e1..5c99dabda4028 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datastore_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatastoreAdminTracingStub : public DatastoreAdminStub { public: ~DatastoreAdminTracingStub() override = default; @@ -124,8 +122,6 @@ class DatastoreAdminTracingStub : public DatastoreAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datastore/quickstart/.bazelrc b/google/cloud/datastore/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/datastore/quickstart/.bazelrc +++ b/google/cloud/datastore/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/datastore/v1/datastore_connection.h b/google/cloud/datastore/v1/datastore_connection.h index 06e36424b98a4..46a1cc970670f 100644 --- a/google/cloud/datastore/v1/datastore_connection.h +++ b/google/cloud/datastore/v1/datastore_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/datastore/v1/datastore.pb.h" #include namespace google { diff --git a/google/cloud/datastore/v1/datastore_connection_idempotency_policy.h b/google/cloud/datastore/v1/datastore_connection_idempotency_policy.h index 339f92870f611..0752442af1aa4 100644 --- a/google/cloud/datastore/v1/datastore_connection_idempotency_policy.h +++ b/google/cloud/datastore/v1/datastore_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/datastore/v1/datastore.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastore/v1/internal/datastore_auth_decorator.cc b/google/cloud/datastore/v1/internal/datastore_auth_decorator.cc index dc753020aefd7..d741d7034e217 100644 --- a/google/cloud/datastore/v1/internal/datastore_auth_decorator.cc +++ b/google/cloud/datastore/v1/internal/datastore_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/datastore/v1/datastore.proto #include "google/cloud/datastore/v1/internal/datastore_auth_decorator.h" -#include +#include "google/datastore/v1/datastore.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/v1/internal/datastore_logging_decorator.cc b/google/cloud/datastore/v1/internal/datastore_logging_decorator.cc index ae2aff0b08191..2ffb1f2a51fe5 100644 --- a/google/cloud/datastore/v1/internal/datastore_logging_decorator.cc +++ b/google/cloud/datastore/v1/internal/datastore_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/datastore/v1/internal/datastore_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/datastore/v1/datastore.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/v1/internal/datastore_metadata_decorator.cc b/google/cloud/datastore/v1/internal/datastore_metadata_decorator.cc index 28ec5bff2f177..4930fa847fae7 100644 --- a/google/cloud/datastore/v1/internal/datastore_metadata_decorator.cc +++ b/google/cloud/datastore/v1/internal/datastore_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/datastore/v1/datastore.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastore/v1/internal/datastore_stub.cc b/google/cloud/datastore/v1/internal/datastore_stub.cc index 0ef6628f24e0f..33f3ce1f7f78e 100644 --- a/google/cloud/datastore/v1/internal/datastore_stub.cc +++ b/google/cloud/datastore/v1/internal/datastore_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/datastore/v1/internal/datastore_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/datastore/v1/datastore.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/v1/internal/datastore_stub.h b/google/cloud/datastore/v1/internal/datastore_stub.h index 89b6d51c4d392..79cb0b6c1e81a 100644 --- a/google/cloud/datastore/v1/internal/datastore_stub.h +++ b/google/cloud/datastore/v1/internal/datastore_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/datastore/v1/datastore.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/v1/internal/datastore_stub_factory.cc b/google/cloud/datastore/v1/internal/datastore_stub_factory.cc index c6c447e9afe51..1283548b3c310 100644 --- a/google/cloud/datastore/v1/internal/datastore_stub_factory.cc +++ b/google/cloud/datastore/v1/internal/datastore_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/datastore/v1/datastore.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastore/v1/internal/datastore_tracing_connection.cc b/google/cloud/datastore/v1/internal/datastore_tracing_connection.cc index d4f4b8375f692..06cad33326eea 100644 --- a/google/cloud/datastore/v1/internal/datastore_tracing_connection.cc +++ b/google/cloud/datastore/v1/internal/datastore_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatastoreTracingConnection::DatastoreTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -137,16 +135,12 @@ Status DatastoreTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatastoreTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datastore/v1/internal/datastore_tracing_connection.h b/google/cloud/datastore/v1/internal/datastore_tracing_connection.h index aa91ac9fad0eb..ed4689bcfc712 100644 --- a/google/cloud/datastore/v1/internal/datastore_tracing_connection.h +++ b/google/cloud/datastore/v1/internal/datastore_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatastoreTracingConnection : public datastore_v1::DatastoreConnection { public: ~DatastoreTracingConnection() override = default; @@ -80,8 +78,6 @@ class DatastoreTracingConnection : public datastore_v1::DatastoreConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datastore/v1/internal/datastore_tracing_stub.cc b/google/cloud/datastore/v1/internal/datastore_tracing_stub.cc index 2a2f172352050..c4f59b4866611 100644 --- a/google/cloud/datastore/v1/internal/datastore_tracing_stub.cc +++ b/google/cloud/datastore/v1/internal/datastore_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatastoreTracingStub::DatastoreTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -168,15 +166,9 @@ Status DatastoreTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatastoreTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datastore/v1/internal/datastore_tracing_stub.h b/google/cloud/datastore/v1/internal/datastore_tracing_stub.h index d18386e8fce74..957cd3a274f90 100644 --- a/google/cloud/datastore/v1/internal/datastore_tracing_stub.h +++ b/google/cloud/datastore/v1/internal/datastore_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatastoreTracingStub : public DatastoreStub { public: ~DatastoreTracingStub() override = default; @@ -93,8 +91,6 @@ class DatastoreTracingStub : public DatastoreStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/datastream/BUILD.bazel b/google/cloud/datastream/BUILD.bazel index 4971ef90eba7d..1c50fd4fd6c4e 100644 --- a/google/cloud/datastream/BUILD.bazel +++ b/google/cloud/datastream/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/datastream/v1:datastream_cc_grpc", + "@googleapis//google/cloud/datastream/v1:datastream_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/datastream/quickstart/.bazelrc b/google/cloud/datastream/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/datastream/quickstart/.bazelrc +++ b/google/cloud/datastream/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/datastream/v1/datastream_client.h b/google/cloud/datastream/v1/datastream_client.h index 9004c02c24906..00348d3b5a124 100644 --- a/google/cloud/datastream/v1/datastream_client.h +++ b/google/cloud/datastream/v1/datastream_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastream/v1/datastream_connection.h b/google/cloud/datastream/v1/datastream_connection.h index 972cfe39f5a70..065f7b559cc07 100644 --- a/google/cloud/datastream/v1/datastream_connection.h +++ b/google/cloud/datastream/v1/datastream_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_V1_DATASTREAM_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_V1_DATASTREAM_CONNECTION_H +#include "google/cloud/datastream/v1/datastream.pb.h" #include "google/cloud/datastream/v1/datastream_connection_idempotency_policy.h" #include "google/cloud/datastream/v1/internal/datastream_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastream/v1/datastream_connection_idempotency_policy.h b/google/cloud/datastream/v1/datastream_connection_idempotency_policy.h index 218721fd12df2..0f6d6a407bae1 100644 --- a/google/cloud/datastream/v1/datastream_connection_idempotency_policy.h +++ b/google/cloud/datastream/v1/datastream_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_V1_DATASTREAM_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_V1_DATASTREAM_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/datastream/v1/datastream.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastream/v1/internal/datastream_auth_decorator.cc b/google/cloud/datastream/v1/internal/datastream_auth_decorator.cc index 10dafd93da01f..d1e0203935f22 100644 --- a/google/cloud/datastream/v1/internal/datastream_auth_decorator.cc +++ b/google/cloud/datastream/v1/internal/datastream_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/datastream/v1/datastream.proto #include "google/cloud/datastream/v1/internal/datastream_auth_decorator.h" -#include +#include "google/cloud/datastream/v1/datastream.grpc.pb.h" #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_auth_decorator.h b/google/cloud/datastream/v1/internal/datastream_auth_decorator.h index 241732273d01d..4357e3e4402ba 100644 --- a/google/cloud/datastream/v1/internal/datastream_auth_decorator.h +++ b/google/cloud/datastream/v1/internal/datastream_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datastream/v1/internal/datastream_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_connection_impl.h b/google/cloud/datastream/v1/internal/datastream_connection_impl.h index 95bd3eabcc5b7..7f2d3e2f5b8fb 100644 --- a/google/cloud/datastream/v1/internal/datastream_connection_impl.h +++ b/google/cloud/datastream/v1/internal/datastream_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/datastream/v1/internal/datastream_logging_decorator.cc b/google/cloud/datastream/v1/internal/datastream_logging_decorator.cc index 20e6289c26df2..8331b3b276922 100644 --- a/google/cloud/datastream/v1/internal/datastream_logging_decorator.cc +++ b/google/cloud/datastream/v1/internal/datastream_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/datastream/v1/datastream.proto #include "google/cloud/datastream/v1/internal/datastream_logging_decorator.h" +#include "google/cloud/datastream/v1/datastream.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_logging_decorator.h b/google/cloud/datastream/v1/internal/datastream_logging_decorator.h index 84020d3685403..2a7a647a7468d 100644 --- a/google/cloud/datastream/v1/internal/datastream_logging_decorator.h +++ b/google/cloud/datastream/v1/internal/datastream_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datastream/v1/internal/datastream_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_metadata_decorator.cc b/google/cloud/datastream/v1/internal/datastream_metadata_decorator.cc index e44f48abdfcd5..deb21eb0052d0 100644 --- a/google/cloud/datastream/v1/internal/datastream_metadata_decorator.cc +++ b/google/cloud/datastream/v1/internal/datastream_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/datastream/v1/datastream.proto #include "google/cloud/datastream/v1/internal/datastream_metadata_decorator.h" +#include "google/cloud/datastream/v1/datastream.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 #include #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_metadata_decorator.h b/google/cloud/datastream/v1/internal/datastream_metadata_decorator.h index a04f014b1851d..7d761c2e827fb 100644 --- a/google/cloud/datastream/v1/internal/datastream_metadata_decorator.h +++ b/google/cloud/datastream/v1/internal/datastream_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/datastream/v1/internal/datastream_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_stub.cc b/google/cloud/datastream/v1/internal/datastream_stub.cc index c9ee81c7c940b..c7d1306365691 100644 --- a/google/cloud/datastream/v1/internal/datastream_stub.cc +++ b/google/cloud/datastream/v1/internal/datastream_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/datastream/v1/datastream.proto #include "google/cloud/datastream/v1/internal/datastream_stub.h" +#include "google/cloud/datastream/v1/datastream.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_stub.h b/google/cloud/datastream/v1/internal/datastream_stub.h index 736d46fb60334..f7fce663a1954 100644 --- a/google/cloud/datastream/v1/internal/datastream_stub.h +++ b/google/cloud/datastream/v1/internal/datastream_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_V1_INTERNAL_DATASTREAM_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_V1_INTERNAL_DATASTREAM_STUB_H +#include "google/cloud/datastream/v1/datastream.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_stub_factory.cc b/google/cloud/datastream/v1/internal/datastream_stub_factory.cc index 67a346705683f..589ae61b94f34 100644 --- a/google/cloud/datastream/v1/internal/datastream_stub_factory.cc +++ b/google/cloud/datastream/v1/internal/datastream_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/datastream/v1/datastream.proto #include "google/cloud/datastream/v1/internal/datastream_stub_factory.h" +#include "google/cloud/datastream/v1/datastream.grpc.pb.h" #include "google/cloud/datastream/v1/internal/datastream_auth_decorator.h" #include "google/cloud/datastream/v1/internal/datastream_logging_decorator.h" #include "google/cloud/datastream/v1/internal/datastream_metadata_decorator.h" #include "google/cloud/datastream/v1/internal/datastream_stub.h" #include "google/cloud/datastream/v1/internal/datastream_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc b/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc index a032d3bf82332..48e77e0cf177a 100644 --- a/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc +++ b/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace datastream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatastreamTracingConnection::DatastreamTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -571,16 +569,12 @@ Status DatastreamTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatastreamTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/datastream/v1/internal/datastream_tracing_connection.h b/google/cloud/datastream/v1/internal/datastream_tracing_connection.h index 65e6cccafd2bb..76c9db8d2fe09 100644 --- a/google/cloud/datastream/v1/internal/datastream_tracing_connection.h +++ b/google/cloud/datastream/v1/internal/datastream_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace datastream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatastreamTracingConnection : public datastream_v1::DatastreamConnection { public: ~DatastreamTracingConnection() override = default; @@ -260,8 +258,6 @@ class DatastreamTracingConnection : public datastream_v1::DatastreamConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc b/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc index aab8abe8be698..dc1a3f294ac16 100644 --- a/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc +++ b/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace datastream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatastreamTracingStub::DatastreamTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -613,15 +611,9 @@ future DatastreamTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatastreamTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datastream/v1/internal/datastream_tracing_stub.h b/google/cloud/datastream/v1/internal/datastream_tracing_stub.h index 9b8e5503a8857..b1c5c24796b83 100644 --- a/google/cloud/datastream/v1/internal/datastream_tracing_stub.h +++ b/google/cloud/datastream/v1/internal/datastream_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace datastream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatastreamTracingStub : public DatastreamStub { public: ~DatastreamTracingStub() override = default; @@ -288,8 +286,6 @@ class DatastreamTracingStub : public DatastreamStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/deploy/BUILD.bazel b/google/cloud/deploy/BUILD.bazel index 7d2b0d82079bc..0dd760a4d8aa7 100644 --- a/google/cloud/deploy/BUILD.bazel +++ b/google/cloud/deploy/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/deploy/v1:deploy_cc_grpc", + "@googleapis//google/cloud/deploy/v1:deploy_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/deploy/quickstart/.bazelrc b/google/cloud/deploy/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/deploy/quickstart/.bazelrc +++ b/google/cloud/deploy/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/deploy/v1/cloud_deploy_client.h b/google/cloud/deploy/v1/cloud_deploy_client.h index 8964fa67b5902..859a2c2f6b81d 100644 --- a/google/cloud/deploy/v1/cloud_deploy_client.h +++ b/google/cloud/deploy/v1/cloud_deploy_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/deploy/v1/cloud_deploy_connection.h b/google/cloud/deploy/v1/cloud_deploy_connection.h index 6d7447ba2d586..7257727ce2170 100644 --- a/google/cloud/deploy/v1/cloud_deploy_connection.h +++ b/google/cloud/deploy/v1/cloud_deploy_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_V1_CLOUD_DEPLOY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_V1_CLOUD_DEPLOY_CONNECTION_H +#include "google/cloud/deploy/v1/cloud_deploy.pb.h" #include "google/cloud/deploy/v1/cloud_deploy_connection_idempotency_policy.h" #include "google/cloud/deploy/v1/internal/cloud_deploy_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/deploy/v1/cloud_deploy_connection_idempotency_policy.h b/google/cloud/deploy/v1/cloud_deploy_connection_idempotency_policy.h index 767b331dec13f..12c1a03b9de7d 100644 --- a/google/cloud/deploy/v1/cloud_deploy_connection_idempotency_policy.h +++ b/google/cloud/deploy/v1/cloud_deploy_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_V1_CLOUD_DEPLOY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_V1_CLOUD_DEPLOY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/deploy/v1/cloud_deploy.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.cc b/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.cc index 55a72a29d4493..473dcf426f99b 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/deploy/v1/cloud_deploy.proto #include "google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.h" -#include +#include "google/cloud/deploy/v1/cloud_deploy.grpc.pb.h" #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.h b/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.h index 2ca503747a946..1cddef45be367 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/deploy/v1/internal/cloud_deploy_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_connection_impl.h b/google/cloud/deploy/v1/internal/cloud_deploy_connection_impl.h index 8756f82e492b6..f68b921055336 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_connection_impl.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.cc b/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.cc index d468ececdd34b..872f55d99bdea 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/deploy/v1/cloud_deploy.proto #include "google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.h" +#include "google/cloud/deploy/v1/cloud_deploy.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.h b/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.h index e35a11c6eee43..daea4e00e4041 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/deploy/v1/internal/cloud_deploy_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.cc b/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.cc index ad88e4eacf4a7..708cf715ec407 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/deploy/v1/cloud_deploy.proto #include "google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.h" +#include "google/cloud/deploy/v1/cloud_deploy.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 #include #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.h b/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.h index d940d90904680..7d923b73ff768 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/deploy/v1/internal/cloud_deploy_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc b/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc index 0bb035dee2c1b..15888147f9a93 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/deploy/v1/cloud_deploy.proto #include "google/cloud/deploy/v1/internal/cloud_deploy_stub.h" +#include "google/cloud/deploy/v1/cloud_deploy.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_stub.h b/google/cloud/deploy/v1/internal/cloud_deploy_stub.h index 4e84fdb382db5..e282e54161331 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_stub.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_V1_INTERNAL_CLOUD_DEPLOY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_V1_INTERNAL_CLOUD_DEPLOY_STUB_H +#include "google/cloud/deploy/v1/cloud_deploy.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc b/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc index fdeb8c2193a85..4ff7b0490fb40 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/deploy/v1/cloud_deploy.proto #include "google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.h" +#include "google/cloud/deploy/v1/cloud_deploy.grpc.pb.h" #include "google/cloud/deploy/v1/internal/cloud_deploy_auth_decorator.h" #include "google/cloud/deploy/v1/internal/cloud_deploy_logging_decorator.h" #include "google/cloud/deploy/v1/internal/cloud_deploy_metadata_decorator.h" #include "google/cloud/deploy/v1/internal/cloud_deploy_stub.h" #include "google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc index 657e2beaaedd4..9495348707e29 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace deploy_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudDeployTracingConnection::CloudDeployTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -887,16 +885,12 @@ Status CloudDeployTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudDeployTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.h b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.h index 1910f08b2c1d8..f8ccd60608cf8 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace deploy_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudDeployTracingConnection : public deploy_v1::CloudDeployConnection { public: ~CloudDeployTracingConnection() override = default; @@ -369,8 +367,6 @@ class CloudDeployTracingConnection : public deploy_v1::CloudDeployConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc index ee4128b749ed4..aa63f7b97df93 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace deploy_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudDeployTracingStub::CloudDeployTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -948,15 +946,9 @@ future CloudDeployTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudDeployTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.h b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.h index 3e66bee10026d..ef547028cfd43 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace deploy_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudDeployTracingStub : public CloudDeployStub { public: ~CloudDeployTracingStub() override = default; @@ -412,8 +410,6 @@ class CloudDeployTracingStub : public CloudDeployStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/developerconnect/BUILD.bazel b/google/cloud/developerconnect/BUILD.bazel index 22c1f45ea2f9a..1daf84dc05b87 100644 --- a/google/cloud/developerconnect/BUILD.bazel +++ b/google/cloud/developerconnect/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/developerconnect/v1:developerconnect_cc_grpc", + "@googleapis//google/cloud/developerconnect/v1:developerconnect_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/developerconnect/quickstart/.bazelrc b/google/cloud/developerconnect/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/developerconnect/quickstart/.bazelrc +++ b/google/cloud/developerconnect/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/developerconnect/v1/developer_connect_client.h b/google/cloud/developerconnect/v1/developer_connect_client.h index e1f4adace6d44..9eec0b4d201f8 100644 --- a/google/cloud/developerconnect/v1/developer_connect_client.h +++ b/google/cloud/developerconnect/v1/developer_connect_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/developerconnect/v1/developer_connect_connection.h b/google/cloud/developerconnect/v1/developer_connect_connection.h index 8a991e3932d78..ff5cc6e3f9477 100644 --- a/google/cloud/developerconnect/v1/developer_connect_connection.h +++ b/google/cloud/developerconnect/v1/developer_connect_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVELOPERCONNECT_V1_DEVELOPER_CONNECT_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVELOPERCONNECT_V1_DEVELOPER_CONNECT_CONNECTION_H +#include "google/cloud/developerconnect/v1/developer_connect.pb.h" #include "google/cloud/developerconnect/v1/developer_connect_connection_idempotency_policy.h" #include "google/cloud/developerconnect/v1/internal/developer_connect_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/developerconnect/v1/developer_connect_connection_idempotency_policy.h b/google/cloud/developerconnect/v1/developer_connect_connection_idempotency_policy.h index 1aa210279f95a..940aefd4db2c6 100644 --- a/google/cloud/developerconnect/v1/developer_connect_connection_idempotency_policy.h +++ b/google/cloud/developerconnect/v1/developer_connect_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVELOPERCONNECT_V1_DEVELOPER_CONNECT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVELOPERCONNECT_V1_DEVELOPER_CONNECT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/developerconnect/v1/developer_connect.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.cc b/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.cc index df61a374a48a6..84ede95363dd2 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/developerconnect/v1/developer_connect.proto #include "google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.h" -#include +#include "google/cloud/developerconnect/v1/developer_connect.grpc.pb.h" #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.h b/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.h index c0e6ab5c1a8c7..f7cd642a53c9e 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/developerconnect/v1/internal/developer_connect_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_connection_impl.h b/google/cloud/developerconnect/v1/internal/developer_connect_connection_impl.h index 80d10ea4ff264..cbcc34aca4902 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_connection_impl.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.cc b/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.cc index 39e7b17b9a6db..287faa15afbbc 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/developerconnect/v1/developer_connect.proto #include "google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.h" +#include "google/cloud/developerconnect/v1/developer_connect.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.h b/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.h index 84e7cbaef9730..fce7e76458fad 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/developerconnect/v1/internal/developer_connect_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.cc b/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.cc index 3acfe6524b33e..cb4e98bfb906d 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/developerconnect/v1/developer_connect.proto #include "google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.h" +#include "google/cloud/developerconnect/v1/developer_connect.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 #include #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.h b/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.h index c95f807c30ab7..7c68f010bfd39 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/developerconnect/v1/internal/developer_connect_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc b/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc index 5431f4285cee5..0380aabfe0915 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/developerconnect/v1/developer_connect.proto #include "google/cloud/developerconnect/v1/internal/developer_connect_stub.h" +#include "google/cloud/developerconnect/v1/developer_connect.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_stub.h b/google/cloud/developerconnect/v1/internal/developer_connect_stub.h index b6acc6d64b31c..43496f066891c 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_stub.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVELOPERCONNECT_V1_INTERNAL_DEVELOPER_CONNECT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVELOPERCONNECT_V1_INTERNAL_DEVELOPER_CONNECT_STUB_H +#include "google/cloud/developerconnect/v1/developer_connect.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc b/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc index 76533bf4e8237..a8b48006c8a70 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/developerconnect/v1/developer_connect.proto #include "google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.h" +#include "google/cloud/developerconnect/v1/developer_connect.grpc.pb.h" #include "google/cloud/developerconnect/v1/internal/developer_connect_auth_decorator.h" #include "google/cloud/developerconnect/v1/internal/developer_connect_logging_decorator.h" #include "google/cloud/developerconnect/v1/internal/developer_connect_metadata_decorator.h" #include "google/cloud/developerconnect/v1/internal/developer_connect_stub.h" #include "google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.cc b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.cc index e3559c494d770..9a4c8c33744e1 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace developerconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeveloperConnectTracingConnection::DeveloperConnectTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -573,16 +571,12 @@ Status DeveloperConnectTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeveloperConnectTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.h b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.h index 58ee29cb2a0d7..188cf8dd34836 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace developerconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeveloperConnectTracingConnection : public developerconnect_v1::DeveloperConnectConnection { public: @@ -260,8 +258,6 @@ class DeveloperConnectTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.cc b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.cc index c12b8e93613f1..ffb9295f19f8b 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace developerconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeveloperConnectTracingStub::DeveloperConnectTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -617,15 +615,9 @@ future DeveloperConnectTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeveloperConnectTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.h b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.h index c62c8f2e02b20..a0878afb40901 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace developerconnect_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeveloperConnectTracingStub : public DeveloperConnectStub { public: ~DeveloperConnectTracingStub() override = default; @@ -283,8 +281,6 @@ class DeveloperConnectTracingStub : public DeveloperConnectStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/devicestreaming/BUILD.bazel b/google/cloud/devicestreaming/BUILD.bazel index 78dc8d385fc9a..b5631c2d8f900 100644 --- a/google/cloud/devicestreaming/BUILD.bazel +++ b/google/cloud/devicestreaming/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/devicestreaming/v1:devicestreaming_cc_grpc", + "@googleapis//google/cloud/devicestreaming/v1:devicestreaming_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/devicestreaming/v1/direct_access_connection.h b/google/cloud/devicestreaming/v1/direct_access_connection.h index 2ceb1056e83ee..1fe7995f416e7 100644 --- a/google/cloud/devicestreaming/v1/direct_access_connection.h +++ b/google/cloud/devicestreaming/v1/direct_access_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/devicestreaming/v1/direct_access_connection_idempotency_policy.h" #include "google/cloud/devicestreaming/v1/internal/direct_access_retry_traits.h" +#include "google/cloud/devicestreaming/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/devicestreaming/v1/direct_access_connection_idempotency_policy.h b/google/cloud/devicestreaming/v1/direct_access_connection_idempotency_policy.h index 89bb2ddd6c7a1..c9d65f2d3ffcb 100644 --- a/google/cloud/devicestreaming/v1/direct_access_connection_idempotency_policy.h +++ b/google/cloud/devicestreaming/v1/direct_access_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVICESTREAMING_V1_DIRECT_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVICESTREAMING_V1_DIRECT_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/devicestreaming/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_auth_decorator.cc b/google/cloud/devicestreaming/v1/internal/direct_access_auth_decorator.cc index 6c36051cd92b5..1406f14d5c903 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_auth_decorator.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/devicestreaming/v1/service.proto #include "google/cloud/devicestreaming/v1/internal/direct_access_auth_decorator.h" +#include "google/cloud/devicestreaming/v1/service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_logging_decorator.cc b/google/cloud/devicestreaming/v1/internal/direct_access_logging_decorator.cc index 650f0d055bf5d..5ff5bcad93e5e 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_logging_decorator.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/devicestreaming/v1/service.proto #include "google/cloud/devicestreaming/v1/internal/direct_access_logging_decorator.h" +#include "google/cloud/devicestreaming/v1/service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_metadata_decorator.cc b/google/cloud/devicestreaming/v1/internal/direct_access_metadata_decorator.cc index 72dfb9f07e801..765a1baaab432 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_metadata_decorator.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/devicestreaming/v1/service.proto #include "google/cloud/devicestreaming/v1/internal/direct_access_metadata_decorator.h" +#include "google/cloud/devicestreaming/v1/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 #include #include #include diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_stub.cc b/google/cloud/devicestreaming/v1/internal/direct_access_stub.cc index 1d69c186e8ef5..0c76bbf05340e 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_stub.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/devicestreaming/v1/service.proto #include "google/cloud/devicestreaming/v1/internal/direct_access_stub.h" +#include "google/cloud/devicestreaming/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_stub.h b/google/cloud/devicestreaming/v1/internal/direct_access_stub.h index b28276d2e73e0..e9f2855df59bc 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_stub.h +++ b/google/cloud/devicestreaming/v1/internal/direct_access_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVICESTREAMING_V1_INTERNAL_DIRECT_ACCESS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEVICESTREAMING_V1_INTERNAL_DIRECT_ACCESS_STUB_H +#include "google/cloud/devicestreaming/v1/service.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_stub_factory.cc b/google/cloud/devicestreaming/v1/internal/direct_access_stub_factory.cc index c74f8c2a02aa4..52003c2fa8990 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_stub_factory.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/devicestreaming/v1/internal/direct_access_metadata_decorator.h" #include "google/cloud/devicestreaming/v1/internal/direct_access_stub.h" #include "google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.h" +#include "google/cloud/devicestreaming/v1/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 #include #include diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.cc b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.cc index 710cdd2c40a0a..1f5d8b9631ecc 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace devicestreaming_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DirectAccessServiceTracingConnection::DirectAccessServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -91,17 +89,13 @@ DirectAccessServiceTracingConnection::AsyncAdbConnect() { return child_->AsyncAdbConnect(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDirectAccessServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.h b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.h index bb4ed007044fc..034cffd194abb 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.h +++ b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace devicestreaming_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DirectAccessServiceTracingConnection : public devicestreaming_v1::DirectAccessServiceConnection { public: @@ -72,8 +70,6 @@ class DirectAccessServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.cc b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.cc index a36f9db21ac87..9c470db4c2925 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.cc +++ b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace devicestreaming_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DirectAccessServiceTracingStub::DirectAccessServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -119,15 +117,9 @@ DirectAccessServiceTracingStub::AsyncAdbConnect( std::move(context), std::move(stream), std::move(span)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDirectAccessServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.h b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.h index debd060c9bcc9..13bdd73ad7ac4 100644 --- a/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.h +++ b/google/cloud/devicestreaming/v1/internal/direct_access_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace devicestreaming_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DirectAccessServiceTracingStub : public DirectAccessServiceStub { public: ~DirectAccessServiceTracingStub() override = default; @@ -80,8 +78,6 @@ class DirectAccessServiceTracingStub : public DirectAccessServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/BUILD.bazel b/google/cloud/dialogflow_cx/BUILD.bazel index 4c8a6bba0c1d8..abde82fd7e771 100644 --- a/google/cloud/dialogflow_cx/BUILD.bazel +++ b/google/cloud/dialogflow_cx/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = [""] googleapis_deps = [ - "@com_google_googleapis//google/cloud/dialogflow/cx/v3:cx_cc_grpc", + "@googleapis//google/cloud/dialogflow/cx/v3:cx_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/dialogflow_cx/agents_client.h b/google/cloud/dialogflow_cx/agents_client.h index 4aeee289a6d5b..9026c0dd93b2d 100644 --- a/google/cloud/dialogflow_cx/agents_client.h +++ b/google/cloud/dialogflow_cx/agents_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/agents_connection.h b/google/cloud/dialogflow_cx/agents_connection.h index 12e30dd0b7552..73ef8e09877aa 100644 --- a/google/cloud/dialogflow_cx/agents_connection.h +++ b/google/cloud/dialogflow_cx/agents_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_AGENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_AGENTS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/agent.pb.h" #include "google/cloud/dialogflow_cx/agents_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/agents_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/agents_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/agents_connection_idempotency_policy.h index e1f6482cd48e9..1217d966c722c 100644 --- a/google/cloud/dialogflow_cx/agents_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/agents_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_AGENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_AGENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/agent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/changelogs_connection.h b/google/cloud/dialogflow_cx/changelogs_connection.h index a72380a2e8c29..6578355f68cae 100644 --- a/google/cloud/dialogflow_cx/changelogs_connection.h +++ b/google/cloud/dialogflow_cx/changelogs_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_CHANGELOGS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_CHANGELOGS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/changelog.pb.h" #include "google/cloud/dialogflow_cx/changelogs_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/changelogs_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/changelogs_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/changelogs_connection_idempotency_policy.h index 426681eb00136..b7342c66ef9be 100644 --- a/google/cloud/dialogflow_cx/changelogs_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/changelogs_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_CHANGELOGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_CHANGELOGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/changelog.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/deployments_connection.h b/google/cloud/dialogflow_cx/deployments_connection.h index 04eb0b90a8285..3fbc9c288e0cb 100644 --- a/google/cloud/dialogflow_cx/deployments_connection.h +++ b/google/cloud/dialogflow_cx/deployments_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_DEPLOYMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_DEPLOYMENTS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/deployment.pb.h" #include "google/cloud/dialogflow_cx/deployments_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/deployments_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/deployments_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/deployments_connection_idempotency_policy.h index 65b7bdd9debde..99a921449c806 100644 --- a/google/cloud/dialogflow_cx/deployments_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/deployments_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_DEPLOYMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_DEPLOYMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/deployment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/entity_types_client.h b/google/cloud/dialogflow_cx/entity_types_client.h index e3afcc032058f..0ef6f7a8e43c7 100644 --- a/google/cloud/dialogflow_cx/entity_types_client.h +++ b/google/cloud/dialogflow_cx/entity_types_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/entity_types_connection.h b/google/cloud/dialogflow_cx/entity_types_connection.h index 0d6785404a4f4..e177b21ebfa3e 100644 --- a/google/cloud/dialogflow_cx/entity_types_connection.h +++ b/google/cloud/dialogflow_cx/entity_types_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENTITY_TYPES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENTITY_TYPES_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/entity_type.pb.h" #include "google/cloud/dialogflow_cx/entity_types_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/entity_types_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/entity_types_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/entity_types_connection_idempotency_policy.h index b074f11f7c526..4e9721a225fe4 100644 --- a/google/cloud/dialogflow_cx/entity_types_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/entity_types_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/environments_client.h b/google/cloud/dialogflow_cx/environments_client.h index 1b6045df30435..17c974a753034 100644 --- a/google/cloud/dialogflow_cx/environments_client.h +++ b/google/cloud/dialogflow_cx/environments_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/environments_connection.h b/google/cloud/dialogflow_cx/environments_connection.h index ac43a6c2e18cd..4aac8739a817f 100644 --- a/google/cloud/dialogflow_cx/environments_connection.h +++ b/google/cloud/dialogflow_cx/environments_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENVIRONMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENVIRONMENTS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/environment.pb.h" #include "google/cloud/dialogflow_cx/environments_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/environments_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/environments_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/environments_connection_idempotency_policy.h index 384e08ace0f51..a96e15cd28087 100644 --- a/google/cloud/dialogflow_cx/environments_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/environments_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/environment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/experiments_connection.h b/google/cloud/dialogflow_cx/experiments_connection.h index ec98ef7b63f98..c8a39caf0dac6 100644 --- a/google/cloud/dialogflow_cx/experiments_connection.h +++ b/google/cloud/dialogflow_cx/experiments_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_EXPERIMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_EXPERIMENTS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/experiment.pb.h" #include "google/cloud/dialogflow_cx/experiments_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/experiments_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/experiments_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/experiments_connection_idempotency_policy.h index 8e8178baa1bbb..d7ed25935a220 100644 --- a/google/cloud/dialogflow_cx/experiments_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/experiments_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_EXPERIMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_EXPERIMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/experiment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/flows_client.h b/google/cloud/dialogflow_cx/flows_client.h index 6dbf41f1e282a..4573f6e12ff58 100644 --- a/google/cloud/dialogflow_cx/flows_client.h +++ b/google/cloud/dialogflow_cx/flows_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/flows_connection.h b/google/cloud/dialogflow_cx/flows_connection.h index 88872e88dd4d7..a7349b3fc44ab 100644 --- a/google/cloud/dialogflow_cx/flows_connection.h +++ b/google/cloud/dialogflow_cx/flows_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_FLOWS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_FLOWS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/flow.pb.h" #include "google/cloud/dialogflow_cx/flows_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/flows_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/flows_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/flows_connection_idempotency_policy.h index 7528205402957..c05cc32c5e84e 100644 --- a/google/cloud/dialogflow_cx/flows_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/flows_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_FLOWS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_FLOWS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/flow.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/generators_connection.h b/google/cloud/dialogflow_cx/generators_connection.h index 9af589083b776..cf6f4f38310c5 100644 --- a/google/cloud/dialogflow_cx/generators_connection.h +++ b/google/cloud/dialogflow_cx/generators_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_GENERATORS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_GENERATORS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/generator.pb.h" #include "google/cloud/dialogflow_cx/generators_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/generators_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/generators_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/generators_connection_idempotency_policy.h index 86b5206882115..028a57d9eb7ac 100644 --- a/google/cloud/dialogflow_cx/generators_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/generators_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_GENERATORS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_GENERATORS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/generator.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/intents_client.h b/google/cloud/dialogflow_cx/intents_client.h index b13b17d616110..1f5d798fcbf64 100644 --- a/google/cloud/dialogflow_cx/intents_client.h +++ b/google/cloud/dialogflow_cx/intents_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/intents_connection.h b/google/cloud/dialogflow_cx/intents_connection.h index 8aad39120d489..0ecf95ce8b763 100644 --- a/google/cloud/dialogflow_cx/intents_connection.h +++ b/google/cloud/dialogflow_cx/intents_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTENTS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/intent.pb.h" #include "google/cloud/dialogflow_cx/intents_connection_idempotency_policy.h" #include "google/cloud/dialogflow_cx/internal/intents_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/intents_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/intents_connection_idempotency_policy.h index 415a6dac52a97..83bbb3176878b 100644 --- a/google/cloud/dialogflow_cx/intents_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/intents_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/intent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/agents_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/agents_auth_decorator.cc index dadf71aeb7af7..66bbbab9a6549 100644 --- a/google/cloud/dialogflow_cx/internal/agents_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/agents_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/agent.proto #include "google/cloud/dialogflow_cx/internal/agents_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/agent.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_auth_decorator.h b/google/cloud/dialogflow_cx/internal/agents_auth_decorator.h index 486fb77262c33..dcad41c4f80fe 100644 --- a/google/cloud/dialogflow_cx/internal/agents_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/agents_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/agents_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_connection_impl.h b/google/cloud/dialogflow_cx/internal/agents_connection_impl.h index d6eeb119fb407..a8a6d5acc3bf7 100644 --- a/google/cloud/dialogflow_cx/internal/agents_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/agents_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/agents_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/agents_logging_decorator.cc index e0803efbe9d21..50451857c74f6 100644 --- a/google/cloud/dialogflow_cx/internal/agents_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/agents_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/agent.proto #include "google/cloud/dialogflow_cx/internal/agents_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/agent.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_logging_decorator.h b/google/cloud/dialogflow_cx/internal/agents_logging_decorator.h index fa06b8deb7f36..0edf7388d8ea7 100644 --- a/google/cloud/dialogflow_cx/internal/agents_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/agents_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/agents_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.cc index 29b158a00a099..4ce4603231aad 100644 --- a/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/agent.proto #include "google/cloud/dialogflow_cx/internal/agents_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/agent.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.h index 1149dcab4b146..efd390a214312 100644 --- a/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/agents_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/agents_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_stub.cc b/google/cloud/dialogflow_cx/internal/agents_stub.cc index 4a55e1aa0899d..7d123c979710e 100644 --- a/google/cloud/dialogflow_cx/internal/agents_stub.cc +++ b/google/cloud/dialogflow_cx/internal/agents_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/agent.proto #include "google/cloud/dialogflow_cx/internal/agents_stub.h" +#include "google/cloud/dialogflow/cx/v3/agent.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_stub.h b/google/cloud/dialogflow_cx/internal/agents_stub.h index 9e4f91c087016..7cbb4d7fb6520 100644 --- a/google/cloud/dialogflow_cx/internal/agents_stub.h +++ b/google/cloud/dialogflow_cx/internal/agents_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_AGENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_AGENTS_STUB_H +#include "google/cloud/dialogflow/cx/v3/agent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc b/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc index e8e17f0752a14..bcca2fcb123f3 100644 --- a/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/agent.proto #include "google/cloud/dialogflow_cx/internal/agents_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/agent.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/agents_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/agents_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/agents_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/agents_stub.h" #include "google/cloud/dialogflow_cx/internal/agents_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc index cd8fbdd8b22c7..155d772db2a90 100644 --- a/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AgentsTracingConnection::AgentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -217,15 +215,11 @@ Status AgentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAgentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/agents_tracing_connection.h b/google/cloud/dialogflow_cx/internal/agents_tracing_connection.h index 2cc05d29086b7..aa94f1a4776d8 100644 --- a/google/cloud/dialogflow_cx/internal/agents_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/agents_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AgentsTracingConnection : public dialogflow_cx::AgentsConnection { public: ~AgentsTracingConnection() override = default; @@ -120,8 +118,6 @@ class AgentsTracingConnection : public dialogflow_cx::AgentsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc index 32b950043890c..c16e274de2c77 100644 --- a/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AgentsTracingStub::AgentsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -277,15 +275,9 @@ future AgentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAgentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/agents_tracing_stub.h b/google/cloud/dialogflow_cx/internal/agents_tracing_stub.h index 5ae16ab41577e..72a403b3fb6fc 100644 --- a/google/cloud/dialogflow_cx/internal/agents_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/agents_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AgentsTracingStub : public AgentsStub { public: ~AgentsTracingStub() override = default; @@ -148,8 +146,6 @@ class AgentsTracingStub : public AgentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/changelogs_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/changelogs_auth_decorator.cc index 01be514c6b38c..ec5f90cbf4f7a 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/changelog.proto #include "google/cloud/dialogflow_cx/internal/changelogs_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/changelog.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/changelogs_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/changelogs_logging_decorator.cc index 3ddfccf3d1e89..0a3373ccaccaa 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/changelog.proto #include "google/cloud/dialogflow_cx/internal/changelogs_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/changelog.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/changelogs_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/changelogs_metadata_decorator.cc index 7629efea8ef85..e6998a1f65d54 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/changelog.proto #include "google/cloud/dialogflow_cx/internal/changelogs_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/changelog.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/changelogs_stub.cc b/google/cloud/dialogflow_cx/internal/changelogs_stub.cc index 8beab905b3efa..a9c98dfaf6b77 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_stub.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/changelog.proto #include "google/cloud/dialogflow_cx/internal/changelogs_stub.h" +#include "google/cloud/dialogflow/cx/v3/changelog.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/changelogs_stub.h b/google/cloud/dialogflow_cx/internal/changelogs_stub.h index cd58b0dbab3ba..9e97b123b8360 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_stub.h +++ b/google/cloud/dialogflow_cx/internal/changelogs_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_CHANGELOGS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_CHANGELOGS_STUB_H +#include "google/cloud/dialogflow/cx/v3/changelog.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/changelogs_stub_factory.cc b/google/cloud/dialogflow_cx/internal/changelogs_stub_factory.cc index 56232069d55b0..1385709256116 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/changelog.proto #include "google/cloud/dialogflow_cx/internal/changelogs_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/changelog.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/changelogs_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/changelogs_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/changelogs_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/changelogs_stub.h" #include "google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc index f30a1142a85a4..848d553b0de32 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ChangelogsTracingConnection::ChangelogsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -102,16 +100,12 @@ Status ChangelogsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeChangelogsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.h b/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.h index 7af01c4067dce..21b23cfe01efd 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ChangelogsTracingConnection : public dialogflow_cx::ChangelogsConnection { public: ~ChangelogsTracingConnection() override = default; @@ -66,8 +64,6 @@ class ChangelogsTracingConnection : public dialogflow_cx::ChangelogsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.cc index e731c16051979..5f970f114bc1e 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ChangelogsTracingStub::ChangelogsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -113,15 +111,9 @@ Status ChangelogsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeChangelogsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.h b/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.h index 34eff99a81c9a..29fce9ef565e5 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/changelogs_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ChangelogsTracingStub : public ChangelogsStub { public: ~ChangelogsTracingStub() override = default; @@ -74,8 +72,6 @@ class ChangelogsTracingStub : public ChangelogsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/deployments_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/deployments_auth_decorator.cc index 18b2832b7d246..ac86c39552b49 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/deployment.proto #include "google/cloud/dialogflow_cx/internal/deployments_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/deployment.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/deployments_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/deployments_logging_decorator.cc index a336798505c40..a13f3ffe0fe16 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/deployment.proto #include "google/cloud/dialogflow_cx/internal/deployments_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/deployment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/deployments_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/deployments_metadata_decorator.cc index 5c2fe17f2eef5..bfa367a307d45 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/deployment.proto #include "google/cloud/dialogflow_cx/internal/deployments_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/deployment.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/deployments_stub.cc b/google/cloud/dialogflow_cx/internal/deployments_stub.cc index 05b277edd2a3f..9bf03881dd509 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_stub.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/deployment.proto #include "google/cloud/dialogflow_cx/internal/deployments_stub.h" +#include "google/cloud/dialogflow/cx/v3/deployment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/deployments_stub.h b/google/cloud/dialogflow_cx/internal/deployments_stub.h index 2d6777b56eb0f..6ef25940fa71c 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_stub.h +++ b/google/cloud/dialogflow_cx/internal/deployments_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_DEPLOYMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_DEPLOYMENTS_STUB_H +#include "google/cloud/dialogflow/cx/v3/deployment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/deployments_stub_factory.cc b/google/cloud/dialogflow_cx/internal/deployments_stub_factory.cc index 726f44a15a279..8814892dd9112 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/deployment.proto #include "google/cloud/dialogflow_cx/internal/deployments_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/deployment.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/deployments_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/deployments_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/deployments_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/deployments_stub.h" #include "google/cloud/dialogflow_cx/internal/deployments_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc index 13cc319073a48..a0d1bf20b709c 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeploymentsTracingConnection::DeploymentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -102,16 +100,12 @@ Status DeploymentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeploymentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.h b/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.h index 3cf7a578678df..7b2856c3a2180 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeploymentsTracingConnection : public dialogflow_cx::DeploymentsConnection { public: @@ -67,8 +65,6 @@ class DeploymentsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.cc index 6d0167f14d928..dacd1a9f0fac2 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DeploymentsTracingStub::DeploymentsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -113,15 +111,9 @@ Status DeploymentsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDeploymentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.h b/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.h index 24e9b53708bad..b47f3b4690b83 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/deployments_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DeploymentsTracingStub : public DeploymentsStub { public: ~DeploymentsTracingStub() override = default; @@ -75,8 +73,6 @@ class DeploymentsTracingStub : public DeploymentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.cc index a861ee8ca988f..b83a8501ccc7c 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/entity_type.proto #include "google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/entity_type.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.h b/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.h index a910505f05f61..66f915776991d 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/entity_types_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_connection_impl.h b/google/cloud/dialogflow_cx/internal/entity_types_connection_impl.h index abbdab069dd47..0ab2f926ad982 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.cc index 308b3da57a4a8..6c3e72bceb66d 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/entity_type.proto #include "google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/entity_type.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.h b/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.h index 0ebea1600ed04..fb4c4a3a2dc96 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/entity_types_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.cc index 305fa1edaa33a..1e467829a968d 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/entity_type.proto #include "google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/entity_type.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.h index 7a61f5708f391..12d8f3b152f42 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/entity_types_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_stub.cc b/google/cloud/dialogflow_cx/internal/entity_types_stub.cc index a2c08b990a0a6..79dbf3a202f1e 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_stub.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/entity_type.proto #include "google/cloud/dialogflow_cx/internal/entity_types_stub.h" +#include "google/cloud/dialogflow/cx/v3/entity_type.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_stub.h b/google/cloud/dialogflow_cx/internal/entity_types_stub.h index 898b19e3e4a6f..b94c028ba12b6 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_stub.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_ENTITY_TYPES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_ENTITY_TYPES_STUB_H +#include "google/cloud/dialogflow/cx/v3/entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc b/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc index 93d1fd496defc..f7a6a1d6baebe 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/entity_type.proto #include "google/cloud/dialogflow_cx/internal/entity_types_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/entity_type.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/entity_types_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/entity_types_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/entity_types_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/entity_types_stub.h" #include "google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc index 2819ff5fb640c..a5e5d48bfe8cf 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EntityTypesTracingConnection::EntityTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -192,16 +190,12 @@ Status EntityTypesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEntityTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.h b/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.h index 5d06913176635..a2c5d40a00555 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EntityTypesTracingConnection : public dialogflow_cx::EntityTypesConnection { public: @@ -105,8 +103,6 @@ class EntityTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.cc index 7748fe4a567e6..012c0a16cce4e 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EntityTypesTracingStub::EntityTypesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -234,15 +232,9 @@ future EntityTypesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEntityTypesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.h b/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.h index e3a16393be881..404eba641638f 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EntityTypesTracingStub : public EntityTypesStub { public: ~EntityTypesTracingStub() override = default; @@ -126,8 +124,6 @@ class EntityTypesTracingStub : public EntityTypesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/environments_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/environments_auth_decorator.cc index ac44b31bc8eb9..f5d99a9bf7f1a 100644 --- a/google/cloud/dialogflow_cx/internal/environments_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/environments_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/environment.proto #include "google/cloud/dialogflow_cx/internal/environments_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/environment.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_auth_decorator.h b/google/cloud/dialogflow_cx/internal/environments_auth_decorator.h index 57cf489dc6203..fa0c78942a150 100644 --- a/google/cloud/dialogflow_cx/internal/environments_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/environments_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/environments_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_connection_impl.h b/google/cloud/dialogflow_cx/internal/environments_connection_impl.h index a0f501b53e027..4e7b496588c1a 100644 --- a/google/cloud/dialogflow_cx/internal/environments_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/environments_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/environments_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/environments_logging_decorator.cc index d2b62810277c3..41cf1e2db53ac 100644 --- a/google/cloud/dialogflow_cx/internal/environments_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/environments_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/environment.proto #include "google/cloud/dialogflow_cx/internal/environments_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/environment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_logging_decorator.h b/google/cloud/dialogflow_cx/internal/environments_logging_decorator.h index 3fb6804fff21e..92feeaae74b24 100644 --- a/google/cloud/dialogflow_cx/internal/environments_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/environments_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/environments_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.cc index c4e2af0b31768..98a787e7361bb 100644 --- a/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/environment.proto #include "google/cloud/dialogflow_cx/internal/environments_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/environment.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.h index 8eb436b84d2dd..552a6496f3259 100644 --- a/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/environments_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/environments_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_stub.cc b/google/cloud/dialogflow_cx/internal/environments_stub.cc index a791dfc01384a..0d87a12703c39 100644 --- a/google/cloud/dialogflow_cx/internal/environments_stub.cc +++ b/google/cloud/dialogflow_cx/internal/environments_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/environment.proto #include "google/cloud/dialogflow_cx/internal/environments_stub.h" +#include "google/cloud/dialogflow/cx/v3/environment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_stub.h b/google/cloud/dialogflow_cx/internal/environments_stub.h index 2f3dccf245290..802fe67b1894b 100644 --- a/google/cloud/dialogflow_cx/internal/environments_stub.h +++ b/google/cloud/dialogflow_cx/internal/environments_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_ENVIRONMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_ENVIRONMENTS_STUB_H +#include "google/cloud/dialogflow/cx/v3/environment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc b/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc index 027be8f1cb724..7e0de763ebfac 100644 --- a/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/environment.proto #include "google/cloud/dialogflow_cx/internal/environments_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/environment.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/environments_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/environments_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/environments_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/environments_stub.h" #include "google/cloud/dialogflow_cx/internal/environments_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc index 99407f0c60f4b..c7413da5a6351 100644 --- a/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EnvironmentsTracingConnection::EnvironmentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -261,16 +259,12 @@ Status EnvironmentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEnvironmentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/environments_tracing_connection.h b/google/cloud/dialogflow_cx/internal/environments_tracing_connection.h index 88c66c23ef022..0eacdfc7c3d2f 100644 --- a/google/cloud/dialogflow_cx/internal/environments_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/environments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EnvironmentsTracingConnection : public dialogflow_cx::EnvironmentsConnection { public: @@ -132,8 +130,6 @@ class EnvironmentsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc index 3d263a6567f75..d257a582e100e 100644 --- a/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EnvironmentsTracingStub::EnvironmentsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -295,15 +293,9 @@ future EnvironmentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEnvironmentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/environments_tracing_stub.h b/google/cloud/dialogflow_cx/internal/environments_tracing_stub.h index 317eacb796ab6..e11e173b18a30 100644 --- a/google/cloud/dialogflow_cx/internal/environments_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/environments_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EnvironmentsTracingStub : public EnvironmentsStub { public: ~EnvironmentsTracingStub() override = default; @@ -152,8 +150,6 @@ class EnvironmentsTracingStub : public EnvironmentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/experiments_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/experiments_auth_decorator.cc index 6fb163d0aff35..fc0988de14a92 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/experiment.proto #include "google/cloud/dialogflow_cx/internal/experiments_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/experiment.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/experiments_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/experiments_logging_decorator.cc index a44bd6699461e..3d511559e8b17 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/experiment.proto #include "google/cloud/dialogflow_cx/internal/experiments_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/experiment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/experiments_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/experiments_metadata_decorator.cc index 7369c0a0cedfc..af9677da73eb4 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/experiment.proto #include "google/cloud/dialogflow_cx/internal/experiments_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/experiment.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/experiments_stub.cc b/google/cloud/dialogflow_cx/internal/experiments_stub.cc index 4be081005316e..7e24461642dfb 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_stub.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/experiment.proto #include "google/cloud/dialogflow_cx/internal/experiments_stub.h" +#include "google/cloud/dialogflow/cx/v3/experiment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/experiments_stub.h b/google/cloud/dialogflow_cx/internal/experiments_stub.h index 0236cf1e595a9..946a78900b6b3 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_stub.h +++ b/google/cloud/dialogflow_cx/internal/experiments_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_EXPERIMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_EXPERIMENTS_STUB_H +#include "google/cloud/dialogflow/cx/v3/experiment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/experiments_stub_factory.cc b/google/cloud/dialogflow_cx/internal/experiments_stub_factory.cc index e400f880f2e7c..f526902aa17c2 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/experiment.proto #include "google/cloud/dialogflow_cx/internal/experiments_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/experiment.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/experiments_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/experiments_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/experiments_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/experiments_stub.h" #include "google/cloud/dialogflow_cx/internal/experiments_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc index 78679007d7662..d24dfe1f379f4 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExperimentsTracingConnection::ExperimentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -146,16 +144,12 @@ Status ExperimentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExperimentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.h b/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.h index 8e5c7a3d0bdc5..0ae6229956956 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExperimentsTracingConnection : public dialogflow_cx::ExperimentsConnection { public: @@ -87,8 +85,6 @@ class ExperimentsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.cc index 36b6b78c20751..6a1f73993b4de 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExperimentsTracingStub::ExperimentsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -172,15 +170,9 @@ Status ExperimentsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExperimentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.h b/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.h index 88ed681e031ca..d6fc6a23bbd56 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/experiments_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExperimentsTracingStub : public ExperimentsStub { public: ~ExperimentsTracingStub() override = default; @@ -100,8 +98,6 @@ class ExperimentsTracingStub : public ExperimentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/flows_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/flows_auth_decorator.cc index 5db6e1de4ac53..3bd2757bc0c92 100644 --- a/google/cloud/dialogflow_cx/internal/flows_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/flows_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/flow.proto #include "google/cloud/dialogflow_cx/internal/flows_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/flow.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_auth_decorator.h b/google/cloud/dialogflow_cx/internal/flows_auth_decorator.h index a0d9b334bd820..9683d3492a407 100644 --- a/google/cloud/dialogflow_cx/internal/flows_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/flows_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/flows_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_connection_impl.h b/google/cloud/dialogflow_cx/internal/flows_connection_impl.h index 4438302af31e7..e309b7eaec089 100644 --- a/google/cloud/dialogflow_cx/internal/flows_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/flows_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/flows_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/flows_logging_decorator.cc index 074e3a69b5c3b..9de0fc15f3090 100644 --- a/google/cloud/dialogflow_cx/internal/flows_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/flows_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/flow.proto #include "google/cloud/dialogflow_cx/internal/flows_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/flow.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_logging_decorator.h b/google/cloud/dialogflow_cx/internal/flows_logging_decorator.h index ecea7850eb805..6254c19ba7775 100644 --- a/google/cloud/dialogflow_cx/internal/flows_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/flows_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/flows_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.cc index 958064c72847f..e128555aafefd 100644 --- a/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/flow.proto #include "google/cloud/dialogflow_cx/internal/flows_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/flow.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.h index f152047448ae4..2c223cac773d1 100644 --- a/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/flows_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/flows_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_stub.cc b/google/cloud/dialogflow_cx/internal/flows_stub.cc index b6d178b804618..4c39783ad94a5 100644 --- a/google/cloud/dialogflow_cx/internal/flows_stub.cc +++ b/google/cloud/dialogflow_cx/internal/flows_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/flow.proto #include "google/cloud/dialogflow_cx/internal/flows_stub.h" +#include "google/cloud/dialogflow/cx/v3/flow.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_stub.h b/google/cloud/dialogflow_cx/internal/flows_stub.h index 569730071d37b..2d4e252409b41 100644 --- a/google/cloud/dialogflow_cx/internal/flows_stub.h +++ b/google/cloud/dialogflow_cx/internal/flows_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_FLOWS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_FLOWS_STUB_H +#include "google/cloud/dialogflow/cx/v3/flow.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc b/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc index e7fbac9ded224..eac8479430caa 100644 --- a/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/flow.proto #include "google/cloud/dialogflow_cx/internal/flows_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/flow.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/flows_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/flows_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/flows_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/flows_stub.h" #include "google/cloud/dialogflow_cx/internal/flows_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc index 2ba436177489a..7407edc28a0bb 100644 --- a/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FlowsTracingConnection::FlowsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -208,15 +206,11 @@ Status FlowsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFlowsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/flows_tracing_connection.h b/google/cloud/dialogflow_cx/internal/flows_tracing_connection.h index 3c27aba0eef82..9cd262de0d57e 100644 --- a/google/cloud/dialogflow_cx/internal/flows_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/flows_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FlowsTracingConnection : public dialogflow_cx::FlowsConnection { public: ~FlowsTracingConnection() override = default; @@ -121,8 +119,6 @@ class FlowsTracingConnection : public dialogflow_cx::FlowsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc index a2319941a89b2..380a14abfa621 100644 --- a/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FlowsTracingStub::FlowsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -273,15 +271,9 @@ future FlowsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFlowsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/flows_tracing_stub.h b/google/cloud/dialogflow_cx/internal/flows_tracing_stub.h index 6cb42fa58dc4b..b469bc11a7252 100644 --- a/google/cloud/dialogflow_cx/internal/flows_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/flows_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FlowsTracingStub : public FlowsStub { public: ~FlowsTracingStub() override = default; @@ -147,8 +145,6 @@ class FlowsTracingStub : public FlowsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/generators_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/generators_auth_decorator.cc index bc81446a29aae..00e278261ca9b 100644 --- a/google/cloud/dialogflow_cx/internal/generators_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/generators_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/generator.proto #include "google/cloud/dialogflow_cx/internal/generators_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/generator.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/generators_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/generators_logging_decorator.cc index 0b1cdbc2eeff6..bdd7f70d81a90 100644 --- a/google/cloud/dialogflow_cx/internal/generators_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/generators_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/generator.proto #include "google/cloud/dialogflow_cx/internal/generators_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/generator.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/generators_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/generators_metadata_decorator.cc index 25240f4f0eb06..c4fe98819cd06 100644 --- a/google/cloud/dialogflow_cx/internal/generators_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/generators_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/generator.proto #include "google/cloud/dialogflow_cx/internal/generators_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/generator.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/generators_stub.cc b/google/cloud/dialogflow_cx/internal/generators_stub.cc index 38fa773d742d2..3acab5fb253be 100644 --- a/google/cloud/dialogflow_cx/internal/generators_stub.cc +++ b/google/cloud/dialogflow_cx/internal/generators_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/generator.proto #include "google/cloud/dialogflow_cx/internal/generators_stub.h" +#include "google/cloud/dialogflow/cx/v3/generator.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/generators_stub.h b/google/cloud/dialogflow_cx/internal/generators_stub.h index 5bd16ec421a1e..adc369f274df7 100644 --- a/google/cloud/dialogflow_cx/internal/generators_stub.h +++ b/google/cloud/dialogflow_cx/internal/generators_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_GENERATORS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_GENERATORS_STUB_H +#include "google/cloud/dialogflow/cx/v3/generator.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/generators_stub_factory.cc b/google/cloud/dialogflow_cx/internal/generators_stub_factory.cc index 7b6a6c6a8521c..e7d3035eab2da 100644 --- a/google/cloud/dialogflow_cx/internal/generators_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/generators_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/generator.proto #include "google/cloud/dialogflow_cx/internal/generators_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/generator.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/generators_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/generators_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/generators_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/generators_stub.h" #include "google/cloud/dialogflow_cx/internal/generators_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/generators_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/generators_tracing_connection.cc index 6c80a4ba30ca3..d54210e237892 100644 --- a/google/cloud/dialogflow_cx/internal/generators_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/generators_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GeneratorsTracingConnection::GeneratorsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -128,16 +126,12 @@ Status GeneratorsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGeneratorsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/generators_tracing_connection.h b/google/cloud/dialogflow_cx/internal/generators_tracing_connection.h index 188b7f8d5cd30..ac0674926b22f 100644 --- a/google/cloud/dialogflow_cx/internal/generators_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/generators_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GeneratorsTracingConnection : public dialogflow_cx::GeneratorsConnection { public: ~GeneratorsTracingConnection() override = default; @@ -78,8 +76,6 @@ class GeneratorsTracingConnection : public dialogflow_cx::GeneratorsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/generators_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/generators_tracing_stub.cc index ead9f1e37b0f5..f944896398550 100644 --- a/google/cloud/dialogflow_cx/internal/generators_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/generators_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GeneratorsTracingStub::GeneratorsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -148,15 +146,9 @@ Status GeneratorsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGeneratorsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/generators_tracing_stub.h b/google/cloud/dialogflow_cx/internal/generators_tracing_stub.h index fd82370195351..3535d3fb2d845 100644 --- a/google/cloud/dialogflow_cx/internal/generators_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/generators_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GeneratorsTracingStub : public GeneratorsStub { public: ~GeneratorsTracingStub() override = default; @@ -89,8 +87,6 @@ class GeneratorsTracingStub : public GeneratorsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/intents_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/intents_auth_decorator.cc index d2e33abc66021..7b0e731be9a52 100644 --- a/google/cloud/dialogflow_cx/internal/intents_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/intents_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/intent.proto #include "google/cloud/dialogflow_cx/internal/intents_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/intent.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_auth_decorator.h b/google/cloud/dialogflow_cx/internal/intents_auth_decorator.h index b7363c81baa2d..b006bc6a43f89 100644 --- a/google/cloud/dialogflow_cx/internal/intents_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/intents_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/intents_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_connection_impl.h b/google/cloud/dialogflow_cx/internal/intents_connection_impl.h index 58d2cc474994b..0af1536631afb 100644 --- a/google/cloud/dialogflow_cx/internal/intents_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/intents_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/intents_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/intents_logging_decorator.cc index 11e02e606afb7..d0700ae3bfd93 100644 --- a/google/cloud/dialogflow_cx/internal/intents_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/intents_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/intent.proto #include "google/cloud/dialogflow_cx/internal/intents_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/intent.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_logging_decorator.h b/google/cloud/dialogflow_cx/internal/intents_logging_decorator.h index 4158494a072bf..b55e44f7454b4 100644 --- a/google/cloud/dialogflow_cx/internal/intents_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/intents_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/intents_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.cc index dc3b6fb2f2a68..6905873819666 100644 --- a/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/intent.proto #include "google/cloud/dialogflow_cx/internal/intents_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/intent.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.h index 8b1907c955c0b..0a764a92ee87f 100644 --- a/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/intents_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/intents_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_stub.cc b/google/cloud/dialogflow_cx/internal/intents_stub.cc index ba731b07e5820..68584e6f7a71f 100644 --- a/google/cloud/dialogflow_cx/internal/intents_stub.cc +++ b/google/cloud/dialogflow_cx/internal/intents_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/intent.proto #include "google/cloud/dialogflow_cx/internal/intents_stub.h" +#include "google/cloud/dialogflow/cx/v3/intent.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_stub.h b/google/cloud/dialogflow_cx/internal/intents_stub.h index cf2d49a28c2a6..cbe654624ece7 100644 --- a/google/cloud/dialogflow_cx/internal/intents_stub.h +++ b/google/cloud/dialogflow_cx/internal/intents_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_INTENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_INTENTS_STUB_H +#include "google/cloud/dialogflow/cx/v3/intent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc b/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc index 5d041ebdcef7b..1828db4c82422 100644 --- a/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/intent.proto #include "google/cloud/dialogflow_cx/internal/intents_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/intent.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/intents_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/intents_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/intents_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/intents_stub.h" #include "google/cloud/dialogflow_cx/internal/intents_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc index 8401b6a96cdc2..db02ba2dd18c5 100644 --- a/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IntentsTracingConnection::IntentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -182,15 +180,11 @@ Status IntentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIntentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/intents_tracing_connection.h b/google/cloud/dialogflow_cx/internal/intents_tracing_connection.h index fec29bfa741e3..6d9d413ec744a 100644 --- a/google/cloud/dialogflow_cx/internal/intents_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/intents_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IntentsTracingConnection : public dialogflow_cx::IntentsConnection { public: ~IntentsTracingConnection() override = default; @@ -101,8 +99,6 @@ class IntentsTracingConnection : public dialogflow_cx::IntentsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc index 33dc34730dffc..22fc7a4ba9a4a 100644 --- a/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IntentsTracingStub::IntentsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -225,15 +223,9 @@ future IntentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIntentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/intents_tracing_stub.h b/google/cloud/dialogflow_cx/internal/intents_tracing_stub.h index 81a6c743a755c..c7988ec89fcea 100644 --- a/google/cloud/dialogflow_cx/internal/intents_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/intents_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IntentsTracingStub : public IntentsStub { public: ~IntentsTracingStub() override = default; @@ -125,8 +123,6 @@ class IntentsTracingStub : public IntentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/pages_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/pages_auth_decorator.cc index 8f85473a90b5e..b4bc9ffb87061 100644 --- a/google/cloud/dialogflow_cx/internal/pages_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/pages_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/page.proto #include "google/cloud/dialogflow_cx/internal/pages_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/page.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/pages_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/pages_logging_decorator.cc index f83e7a3b425a2..5ec744525367c 100644 --- a/google/cloud/dialogflow_cx/internal/pages_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/pages_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/page.proto #include "google/cloud/dialogflow_cx/internal/pages_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/page.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/pages_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/pages_metadata_decorator.cc index d13c67f371459..d9aa2fa0c76aa 100644 --- a/google/cloud/dialogflow_cx/internal/pages_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/pages_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/page.proto #include "google/cloud/dialogflow_cx/internal/pages_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/page.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/pages_stub.cc b/google/cloud/dialogflow_cx/internal/pages_stub.cc index 9712b36720241..ba6a24530bdd5 100644 --- a/google/cloud/dialogflow_cx/internal/pages_stub.cc +++ b/google/cloud/dialogflow_cx/internal/pages_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/page.proto #include "google/cloud/dialogflow_cx/internal/pages_stub.h" +#include "google/cloud/dialogflow/cx/v3/page.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/pages_stub.h b/google/cloud/dialogflow_cx/internal/pages_stub.h index 55da130c4c8f7..3fa21499d6b50 100644 --- a/google/cloud/dialogflow_cx/internal/pages_stub.h +++ b/google/cloud/dialogflow_cx/internal/pages_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_PAGES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_PAGES_STUB_H +#include "google/cloud/dialogflow/cx/v3/page.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/pages_stub_factory.cc b/google/cloud/dialogflow_cx/internal/pages_stub_factory.cc index b2b4442bcd1d3..296f92d0c7996 100644 --- a/google/cloud/dialogflow_cx/internal/pages_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/pages_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/page.proto #include "google/cloud/dialogflow_cx/internal/pages_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/page.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/pages_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/pages_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/pages_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/pages_stub.h" #include "google/cloud/dialogflow_cx/internal/pages_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc index 53ca82aac59cb..4fea6cb2afd12 100644 --- a/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PagesTracingConnection::PagesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -119,15 +117,11 @@ Status PagesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePagesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/pages_tracing_connection.h b/google/cloud/dialogflow_cx/internal/pages_tracing_connection.h index 4992da370f381..7949408c90bc0 100644 --- a/google/cloud/dialogflow_cx/internal/pages_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/pages_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PagesTracingConnection : public dialogflow_cx::PagesConnection { public: ~PagesTracingConnection() override = default; @@ -76,8 +74,6 @@ class PagesTracingConnection : public dialogflow_cx::PagesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/pages_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/pages_tracing_stub.cc index 414a9dac21184..b211d45742c90 100644 --- a/google/cloud/dialogflow_cx/internal/pages_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/pages_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PagesTracingStub::PagesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -144,15 +142,9 @@ Status PagesTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePagesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/pages_tracing_stub.h b/google/cloud/dialogflow_cx/internal/pages_tracing_stub.h index 70dfc762c0318..4365ffdc04dc3 100644 --- a/google/cloud/dialogflow_cx/internal/pages_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/pages_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PagesTracingStub : public PagesStub { public: ~PagesTracingStub() override = default; @@ -88,8 +86,6 @@ class PagesTracingStub : public PagesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/security_settings_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/security_settings_auth_decorator.cc index 2c2aaf0d53b73..ca39bf78cbdf4 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/security_settings.proto #include "google/cloud/dialogflow_cx/internal/security_settings_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/security_settings.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/security_settings_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/security_settings_logging_decorator.cc index 7aa5e99c754f5..a580ab3bc772f 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/security_settings.proto #include "google/cloud/dialogflow_cx/internal/security_settings_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/security_settings.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/security_settings_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/security_settings_metadata_decorator.cc index 5ea146c4ce05b..9ac874c88a643 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/security_settings.proto #include "google/cloud/dialogflow_cx/internal/security_settings_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/security_settings.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/security_settings_stub.cc b/google/cloud/dialogflow_cx/internal/security_settings_stub.cc index 9a95efdd234a4..684486612592c 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_stub.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/security_settings.proto #include "google/cloud/dialogflow_cx/internal/security_settings_stub.h" +#include "google/cloud/dialogflow/cx/v3/security_settings.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/security_settings_stub.h b/google/cloud/dialogflow_cx/internal/security_settings_stub.h index 5d2d0390e3d4e..d6eff08083360 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_stub.h +++ b/google/cloud/dialogflow_cx/internal/security_settings_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_SECURITY_SETTINGS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_SECURITY_SETTINGS_STUB_H +#include "google/cloud/dialogflow/cx/v3/security_settings.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/security_settings_stub_factory.cc b/google/cloud/dialogflow_cx/internal/security_settings_stub_factory.cc index 638e04b548de0..1d4128b492b93 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/security_settings.proto #include "google/cloud/dialogflow_cx/internal/security_settings_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/security_settings.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/security_settings_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/security_settings_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/security_settings_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/security_settings_stub.h" #include "google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc index fb11953ba28bb..7a09d1de098d5 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecuritySettingsServiceTracingConnection:: SecuritySettingsServiceTracingConnection( std::shared_ptr child) @@ -136,17 +134,13 @@ Status SecuritySettingsServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecuritySettingsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.h b/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.h index ba1db15830778..519977ad18846 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecuritySettingsServiceTracingConnection : public dialogflow_cx::SecuritySettingsServiceConnection { public: @@ -83,8 +81,6 @@ class SecuritySettingsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.cc index 5db71ed18a828..eddaddd891bd8 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecuritySettingsServiceTracingStub::SecuritySettingsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -165,16 +163,10 @@ Status SecuritySettingsServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecuritySettingsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.h b/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.h index b61970d9abb71..5dfb8d8383c39 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/security_settings_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecuritySettingsServiceTracingStub : public SecuritySettingsServiceStub { public: ~SecuritySettingsServiceTracingStub() override = default; @@ -94,8 +92,6 @@ class SecuritySettingsServiceTracingStub : public SecuritySettingsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_auth_decorator.cc index 300e67bcb0a0e..0ccef76fa04c5 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/session_entity_type.proto #include "google/cloud/dialogflow_cx/internal/session_entity_types_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/session_entity_type.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_logging_decorator.cc index 6d6fb9908a2fc..5f98540403d97 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/session_entity_type.proto #include "google/cloud/dialogflow_cx/internal/session_entity_types_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/session_entity_type.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_metadata_decorator.cc index 082fe6d4d80e1..58af901dceaf7 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/session_entity_type.proto #include "google/cloud/dialogflow_cx/internal/session_entity_types_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/session_entity_type.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_stub.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_stub.cc index f821d91b480cd..f95cfba654244 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_stub.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/session_entity_type.proto #include "google/cloud/dialogflow_cx/internal/session_entity_types_stub.h" +#include "google/cloud/dialogflow/cx/v3/session_entity_type.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_stub.h b/google/cloud/dialogflow_cx/internal/session_entity_types_stub.h index d64d3b5ab40eb..c7a103e9496fb 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_stub.h +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_SESSION_ENTITY_TYPES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_SESSION_ENTITY_TYPES_STUB_H +#include "google/cloud/dialogflow/cx/v3/session_entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_stub_factory.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_stub_factory.cc index 81e91f05f3a4a..e90f5a084aad3 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/session_entity_type.proto #include "google/cloud/dialogflow_cx/internal/session_entity_types_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/session_entity_type.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/session_entity_types_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/session_entity_types_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/session_entity_types_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/session_entity_types_stub.h" #include "google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc index b455a0009aa2e..f7536a92a3683 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionEntityTypesTracingConnection::SessionEntityTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -132,17 +130,13 @@ Status SessionEntityTypesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionEntityTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.h b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.h index 7299ae45339f1..a26dc6610bc79 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionEntityTypesTracingConnection : public dialogflow_cx::SessionEntityTypesConnection { public: @@ -83,8 +81,6 @@ class SessionEntityTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.cc index 95f2650e485e7..97fc5eb4d47f5 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionEntityTypesTracingStub::SessionEntityTypesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -164,15 +162,9 @@ Status SessionEntityTypesTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionEntityTypesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.h b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.h index 103e2ae0b4bbd..11666672c0408 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionEntityTypesTracingStub : public SessionEntityTypesStub { public: ~SessionEntityTypesTracingStub() override = default; @@ -94,8 +92,6 @@ class SessionEntityTypesTracingStub : public SessionEntityTypesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/sessions_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/sessions_auth_decorator.cc index e5d9c8b1dbdb0..bb582c203fb21 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/dialogflow/cx/v3/session.proto #include "google/cloud/dialogflow_cx/internal/sessions_auth_decorator.h" +#include "google/cloud/dialogflow/cx/v3/session.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/sessions_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/sessions_logging_decorator.cc index 7e2bf47261b8e..af6e519824c46 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_logging_decorator.cc @@ -17,11 +17,11 @@ // source: google/cloud/dialogflow/cx/v3/session.proto #include "google/cloud/dialogflow_cx/internal/sessions_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/session.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/sessions_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/sessions_metadata_decorator.cc index e374054aa9478..816605bca5003 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/session.proto #include "google/cloud/dialogflow_cx/internal/sessions_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/session.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/sessions_stub.cc b/google/cloud/dialogflow_cx/internal/sessions_stub.cc index af2c81bb4e383..7a536052fa69d 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_stub.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/session.proto #include "google/cloud/dialogflow_cx/internal/sessions_stub.h" +#include "google/cloud/dialogflow/cx/v3/session.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/sessions_stub.h b/google/cloud/dialogflow_cx/internal/sessions_stub.h index d83fcdc30edbd..2a078ab8477f2 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_stub.h +++ b/google/cloud/dialogflow_cx/internal/sessions_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_SESSIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_SESSIONS_STUB_H +#include "google/cloud/dialogflow/cx/v3/session.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/sessions_stub_factory.cc b/google/cloud/dialogflow_cx/internal/sessions_stub_factory.cc index 2d66f32a3a41f..5d5eb9e48bfb8 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/session.proto #include "google/cloud/dialogflow_cx/internal/sessions_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/session.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/sessions_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/sessions_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/sessions_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/sessions_stub.h" #include "google/cloud/dialogflow_cx/internal/sessions_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.cc index f09aba810d24b..76a80afd3437b 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionsTracingConnection::SessionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -136,16 +134,12 @@ Status SessionsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.h b/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.h index e8b81e6e4d877..2ec11f1be56d4 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/sessions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionsTracingConnection : public dialogflow_cx::SessionsConnection { public: ~SessionsTracingConnection() override = default; @@ -85,8 +83,6 @@ class SessionsTracingConnection : public dialogflow_cx::SessionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc index 0b77cc2e8f0fe..54142d6247ffc 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionsTracingStub::SessionsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -172,15 +170,9 @@ Status SessionsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.h b/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.h index 9df8634c2176d..45f6aab20d7d0 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionsTracingStub : public SessionsStub { public: ~SessionsTracingStub() override = default; @@ -100,8 +98,6 @@ class SessionsTracingStub : public SessionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.cc index 1f9981010aec7..8f52f878763d5 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/test_case.proto #include "google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/test_case.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.h b/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.h index d5216f19f5720..b397f5ead3b65 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/test_cases_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_connection_impl.h b/google/cloud/dialogflow_cx/internal/test_cases_connection_impl.h index 32661cc36ecd5..8192c7e3aec12 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.cc index f103d19b0630a..13514969f6e71 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/test_case.proto #include "google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/test_case.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.h b/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.h index 883be0ff23d0f..91ba88be25eaf 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/test_cases_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.cc index 57578122bdd87..c38eb538ecaf9 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/test_case.proto #include "google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/test_case.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.h index 8ed1ba64d7c96..c95180d43d86d 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/test_cases_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_stub.cc b/google/cloud/dialogflow_cx/internal/test_cases_stub.cc index 7cc653abdd904..6f8847c3e803c 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_stub.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/test_case.proto #include "google/cloud/dialogflow_cx/internal/test_cases_stub.h" +#include "google/cloud/dialogflow/cx/v3/test_case.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_stub.h b/google/cloud/dialogflow_cx/internal/test_cases_stub.h index 4666e4eee91fc..e6aea5c652b1c 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_stub.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_TEST_CASES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_TEST_CASES_STUB_H +#include "google/cloud/dialogflow/cx/v3/test_case.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc b/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc index 0bc3ca4878bf6..960f0f0623cd1 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/test_case.proto #include "google/cloud/dialogflow_cx/internal/test_cases_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/test_case.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/test_cases_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/test_cases_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/test_cases_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/test_cases_stub.h" #include "google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.cc index a9ed9c69fee3a..183aff5246fd0 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TestCasesTracingConnection::TestCasesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -279,16 +277,12 @@ Status TestCasesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTestCasesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.h b/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.h index 2568d3ab2fb01..1ff1e3b91e2dd 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TestCasesTracingConnection : public dialogflow_cx::TestCasesConnection { public: ~TestCasesTracingConnection() override = default; @@ -142,8 +140,6 @@ class TestCasesTracingConnection : public dialogflow_cx::TestCasesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc index 2393b4bdad6e8..8b0a4b892c3b4 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TestCasesTracingStub::TestCasesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -321,15 +319,9 @@ future TestCasesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTestCasesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.h b/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.h index d6a12429b5af4..603d71eec6042 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TestCasesTracingStub : public TestCasesStub { public: ~TestCasesTracingStub() override = default; @@ -166,8 +164,6 @@ class TestCasesTracingStub : public TestCasesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_auth_decorator.cc index 7f585279ab85c..16cb0458f7ae4 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/transition_route_group.proto #include "google/cloud/dialogflow_cx/internal/transition_route_groups_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/transition_route_group.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_logging_decorator.cc index 6280787768d5b..d8653316d9da9 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/transition_route_group.proto #include "google/cloud/dialogflow_cx/internal/transition_route_groups_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/transition_route_group.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_metadata_decorator.cc index efcd5c33634a6..016859c4f96a1 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/transition_route_group.proto #include "google/cloud/dialogflow_cx/internal/transition_route_groups_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/transition_route_group.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.cc index 3339652de96b5..8e5976285ecc8 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/transition_route_group.proto #include "google/cloud/dialogflow_cx/internal/transition_route_groups_stub.h" +#include "google/cloud/dialogflow/cx/v3/transition_route_group.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.h b/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.h index f9ec1278c2c1d..e7231393e350f 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.h +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_TRANSITION_ROUTE_GROUPS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_TRANSITION_ROUTE_GROUPS_STUB_H +#include "google/cloud/dialogflow/cx/v3/transition_route_group.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_stub_factory.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_stub_factory.cc index 62e3e5e34e814..a18779dcfc5e2 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/transition_route_group.proto #include "google/cloud/dialogflow_cx/internal/transition_route_groups_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/transition_route_group.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/transition_route_groups_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/transition_route_groups_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/transition_route_groups_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/transition_route_groups_stub.h" #include "google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc index cff83eaba9f6c..801da52381797 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TransitionRouteGroupsTracingConnection::TransitionRouteGroupsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -138,17 +136,13 @@ Status TransitionRouteGroupsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTransitionRouteGroupsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.h b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.h index 07bc2a4b3036e..68d6841e0f394 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TransitionRouteGroupsTracingConnection : public dialogflow_cx::TransitionRouteGroupsConnection { public: @@ -83,8 +81,6 @@ class TransitionRouteGroupsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.cc index d4b31dc216e2c..1147beec35f3a 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TransitionRouteGroupsTracingStub::TransitionRouteGroupsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -165,15 +163,9 @@ Status TransitionRouteGroupsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTransitionRouteGroupsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.h b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.h index 14d9fe781cb9d..1be0cde401249 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TransitionRouteGroupsTracingStub : public TransitionRouteGroupsStub { public: ~TransitionRouteGroupsTracingStub() override = default; @@ -94,8 +92,6 @@ class TransitionRouteGroupsTracingStub : public TransitionRouteGroupsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/versions_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/versions_auth_decorator.cc index 8d0a07a2b3f4b..994515942d5eb 100644 --- a/google/cloud/dialogflow_cx/internal/versions_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/versions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/version.proto #include "google/cloud/dialogflow_cx/internal/versions_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/version.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_auth_decorator.h b/google/cloud/dialogflow_cx/internal/versions_auth_decorator.h index 2bda16edea3cb..34bf3b84208a4 100644 --- a/google/cloud/dialogflow_cx/internal/versions_auth_decorator.h +++ b/google/cloud/dialogflow_cx/internal/versions_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/versions_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_connection_impl.h b/google/cloud/dialogflow_cx/internal/versions_connection_impl.h index 776fe5ba812bd..92400a4361253 100644 --- a/google/cloud/dialogflow_cx/internal/versions_connection_impl.h +++ b/google/cloud/dialogflow_cx/internal/versions_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/internal/versions_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/versions_logging_decorator.cc index 2e22558caa989..1991a0af3afc6 100644 --- a/google/cloud/dialogflow_cx/internal/versions_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/versions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/version.proto #include "google/cloud/dialogflow_cx/internal/versions_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/version.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_logging_decorator.h b/google/cloud/dialogflow_cx/internal/versions_logging_decorator.h index 167ef0917c36a..83064b3a33f2f 100644 --- a/google/cloud/dialogflow_cx/internal/versions_logging_decorator.h +++ b/google/cloud/dialogflow_cx/internal/versions_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/versions_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.cc index 955105677eb06..3259f69c1b910 100644 --- a/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/version.proto #include "google/cloud/dialogflow_cx/internal/versions_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/version.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.h b/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.h index 338a8579588a7..90f89c260181a 100644 --- a/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.h +++ b/google/cloud/dialogflow_cx/internal/versions_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_cx/internal/versions_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_stub.cc b/google/cloud/dialogflow_cx/internal/versions_stub.cc index 442ebb64bf6a1..f68dd5deb9a08 100644 --- a/google/cloud/dialogflow_cx/internal/versions_stub.cc +++ b/google/cloud/dialogflow_cx/internal/versions_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/cx/v3/version.proto #include "google/cloud/dialogflow_cx/internal/versions_stub.h" +#include "google/cloud/dialogflow/cx/v3/version.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_stub.h b/google/cloud/dialogflow_cx/internal/versions_stub.h index b5b3d202cc9fc..3fab4e8bf9e43 100644 --- a/google/cloud/dialogflow_cx/internal/versions_stub.h +++ b/google/cloud/dialogflow_cx/internal/versions_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_VERSIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_VERSIONS_STUB_H +#include "google/cloud/dialogflow/cx/v3/version.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc b/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc index 900ac939e0b0b..aa74305aa848b 100644 --- a/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/version.proto #include "google/cloud/dialogflow_cx/internal/versions_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/version.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/versions_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/versions_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/versions_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/versions_stub.h" #include "google/cloud/dialogflow_cx/internal/versions_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc index 882cd39d84753..654cc840eae83 100644 --- a/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VersionsTracingConnection::VersionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -183,16 +181,12 @@ Status VersionsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVersionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/versions_tracing_connection.h b/google/cloud/dialogflow_cx/internal/versions_tracing_connection.h index 691ca1ab1a87e..ad6e9c5bf5cf1 100644 --- a/google/cloud/dialogflow_cx/internal/versions_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/versions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VersionsTracingConnection : public dialogflow_cx::VersionsConnection { public: ~VersionsTracingConnection() override = default; @@ -102,8 +100,6 @@ class VersionsTracingConnection : public dialogflow_cx::VersionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc index 425fa673543ff..2559c00e94907 100644 --- a/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VersionsTracingStub::VersionsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -225,15 +223,9 @@ future VersionsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVersionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/versions_tracing_stub.h b/google/cloud/dialogflow_cx/internal/versions_tracing_stub.h index e03112a2207ba..eda18e7a51802 100644 --- a/google/cloud/dialogflow_cx/internal/versions_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/versions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VersionsTracingStub : public VersionsStub { public: ~VersionsTracingStub() override = default; @@ -126,8 +124,6 @@ class VersionsTracingStub : public VersionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/internal/webhooks_auth_decorator.cc b/google/cloud/dialogflow_cx/internal/webhooks_auth_decorator.cc index 9272dbd8ed069..c71d0f4836e81 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_auth_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/cx/v3/webhook.proto #include "google/cloud/dialogflow_cx/internal/webhooks_auth_decorator.h" -#include +#include "google/cloud/dialogflow/cx/v3/webhook.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/webhooks_logging_decorator.cc b/google/cloud/dialogflow_cx/internal/webhooks_logging_decorator.cc index 8f2c07d392975..fcacffeb2b1d6 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_logging_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/webhook.proto #include "google/cloud/dialogflow_cx/internal/webhooks_logging_decorator.h" +#include "google/cloud/dialogflow/cx/v3/webhook.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/webhooks_metadata_decorator.cc b/google/cloud/dialogflow_cx/internal/webhooks_metadata_decorator.cc index d8495d3445acb..df5bedd78b199 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_metadata_decorator.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/cx/v3/webhook.proto #include "google/cloud/dialogflow_cx/internal/webhooks_metadata_decorator.h" +#include "google/cloud/dialogflow/cx/v3/webhook.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 #include #include #include diff --git a/google/cloud/dialogflow_cx/internal/webhooks_stub.cc b/google/cloud/dialogflow_cx/internal/webhooks_stub.cc index ce4efa306c110..6b03ca02dca69 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_stub.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/cx/v3/webhook.proto #include "google/cloud/dialogflow_cx/internal/webhooks_stub.h" +#include "google/cloud/dialogflow/cx/v3/webhook.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/internal/webhooks_stub.h b/google/cloud/dialogflow_cx/internal/webhooks_stub.h index 54669df1256e5..4c6a14752fdae 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_stub.h +++ b/google/cloud/dialogflow_cx/internal/webhooks_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_WEBHOOKS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_INTERNAL_WEBHOOKS_STUB_H +#include "google/cloud/dialogflow/cx/v3/webhook.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/webhooks_stub_factory.cc b/google/cloud/dialogflow_cx/internal/webhooks_stub_factory.cc index aa6627b1aff05..91317bcdeca0a 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/cx/v3/webhook.proto #include "google/cloud/dialogflow_cx/internal/webhooks_stub_factory.h" +#include "google/cloud/dialogflow/cx/v3/webhook.grpc.pb.h" #include "google/cloud/dialogflow_cx/internal/webhooks_auth_decorator.h" #include "google/cloud/dialogflow_cx/internal/webhooks_logging_decorator.h" #include "google/cloud/dialogflow_cx/internal/webhooks_metadata_decorator.h" #include "google/cloud/dialogflow_cx/internal/webhooks_stub.h" #include "google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc index 078b02d68cb93..3fba25769349b 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WebhooksTracingConnection::WebhooksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -128,16 +126,12 @@ Status WebhooksTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWebhooksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.h b/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.h index c2c3e6851bed1..5c3560e87253d 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.h +++ b/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WebhooksTracingConnection : public dialogflow_cx::WebhooksConnection { public: ~WebhooksTracingConnection() override = default; @@ -77,8 +75,6 @@ class WebhooksTracingConnection : public dialogflow_cx::WebhooksConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.cc index f1a64d8b68bfb..14d4f4e609aec 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WebhooksTracingStub::WebhooksTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -147,15 +145,9 @@ Status WebhooksTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWebhooksTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.h b/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.h index 6a31da520bfcb..918d0f3618a5c 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.h +++ b/google/cloud/dialogflow_cx/internal/webhooks_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_cx_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WebhooksTracingStub : public WebhooksStub { public: ~WebhooksTracingStub() override = default; @@ -89,8 +87,6 @@ class WebhooksTracingStub : public WebhooksStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_cx/pages_connection.h b/google/cloud/dialogflow_cx/pages_connection.h index ba69f6c944709..2ad6bd33d9c57 100644 --- a/google/cloud/dialogflow_cx/pages_connection.h +++ b/google/cloud/dialogflow_cx/pages_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_PAGES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_PAGES_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/page.pb.h" #include "google/cloud/dialogflow_cx/internal/pages_retry_traits.h" #include "google/cloud/dialogflow_cx/pages_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/pages_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/pages_connection_idempotency_policy.h index 54133958ec11c..fbcbff1308106 100644 --- a/google/cloud/dialogflow_cx/pages_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/pages_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_PAGES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_PAGES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/page.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/quickstart/.bazelrc b/google/cloud/dialogflow_cx/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/dialogflow_cx/quickstart/.bazelrc +++ b/google/cloud/dialogflow_cx/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/dialogflow_cx/security_settings_connection.h b/google/cloud/dialogflow_cx/security_settings_connection.h index 1db1e120e3f61..c4e63ac5df60f 100644 --- a/google/cloud/dialogflow_cx/security_settings_connection.h +++ b/google/cloud/dialogflow_cx/security_settings_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SECURITY_SETTINGS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SECURITY_SETTINGS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/security_settings.pb.h" #include "google/cloud/dialogflow_cx/internal/security_settings_retry_traits.h" #include "google/cloud/dialogflow_cx/security_settings_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/security_settings_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/security_settings_connection_idempotency_policy.h index 8625fd8c1f072..032f1a8f7790e 100644 --- a/google/cloud/dialogflow_cx/security_settings_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/security_settings_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SECURITY_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SECURITY_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/security_settings.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/session_entity_types_connection.h b/google/cloud/dialogflow_cx/session_entity_types_connection.h index c5e885ff37970..e6b19ec426079 100644 --- a/google/cloud/dialogflow_cx/session_entity_types_connection.h +++ b/google/cloud/dialogflow_cx/session_entity_types_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSION_ENTITY_TYPES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSION_ENTITY_TYPES_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/session_entity_type.pb.h" #include "google/cloud/dialogflow_cx/internal/session_entity_types_retry_traits.h" #include "google/cloud/dialogflow_cx/session_entity_types_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/session_entity_types_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/session_entity_types_connection_idempotency_policy.h index 0ecdf38336c8b..694c6802227f6 100644 --- a/google/cloud/dialogflow_cx/session_entity_types_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/session_entity_types_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSION_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSION_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/session_entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/sessions_connection.h b/google/cloud/dialogflow_cx/sessions_connection.h index 69767c2305b09..3d84d8a2fe208 100644 --- a/google/cloud/dialogflow_cx/sessions_connection.h +++ b/google/cloud/dialogflow_cx/sessions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSIONS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/session.pb.h" #include "google/cloud/dialogflow_cx/internal/sessions_retry_traits.h" #include "google/cloud/dialogflow_cx/sessions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/sessions_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/sessions_connection_idempotency_policy.h index 018abe47b3c81..84619b4463918 100644 --- a/google/cloud/dialogflow_cx/sessions_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/sessions_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_SESSIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/session.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/test_cases_client.h b/google/cloud/dialogflow_cx/test_cases_client.h index 29d3fc99542a7..4c73a33d22fe6 100644 --- a/google/cloud/dialogflow_cx/test_cases_client.h +++ b/google/cloud/dialogflow_cx/test_cases_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/test_cases_connection.h b/google/cloud/dialogflow_cx/test_cases_connection.h index 03b2b58d8e5dd..21921a3be243c 100644 --- a/google/cloud/dialogflow_cx/test_cases_connection.h +++ b/google/cloud/dialogflow_cx/test_cases_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TEST_CASES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TEST_CASES_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/test_case.pb.h" #include "google/cloud/dialogflow_cx/internal/test_cases_retry_traits.h" #include "google/cloud/dialogflow_cx/test_cases_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/test_cases_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/test_cases_connection_idempotency_policy.h index 58a00f42b2dc3..2c065c52edfe1 100644 --- a/google/cloud/dialogflow_cx/test_cases_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/test_cases_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TEST_CASES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TEST_CASES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/test_case.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/transition_route_groups_connection.h b/google/cloud/dialogflow_cx/transition_route_groups_connection.h index 59649117d382d..3cad847992f72 100644 --- a/google/cloud/dialogflow_cx/transition_route_groups_connection.h +++ b/google/cloud/dialogflow_cx/transition_route_groups_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TRANSITION_ROUTE_GROUPS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TRANSITION_ROUTE_GROUPS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/transition_route_group.pb.h" #include "google/cloud/dialogflow_cx/internal/transition_route_groups_retry_traits.h" #include "google/cloud/dialogflow_cx/transition_route_groups_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/transition_route_groups_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/transition_route_groups_connection_idempotency_policy.h index 267f3b226ec66..4dcd54a51e2b0 100644 --- a/google/cloud/dialogflow_cx/transition_route_groups_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/transition_route_groups_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TRANSITION_ROUTE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_TRANSITION_ROUTE_GROUPS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/transition_route_group.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/versions_client.h b/google/cloud/dialogflow_cx/versions_client.h index bec4658dd10ba..00b6d1bead35b 100644 --- a/google/cloud/dialogflow_cx/versions_client.h +++ b/google/cloud/dialogflow_cx/versions_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_cx/versions_connection.h b/google/cloud/dialogflow_cx/versions_connection.h index 13f2cc295e699..a320bab2ca436 100644 --- a/google/cloud/dialogflow_cx/versions_connection.h +++ b/google/cloud/dialogflow_cx/versions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_VERSIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_VERSIONS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/version.pb.h" #include "google/cloud/dialogflow_cx/internal/versions_retry_traits.h" #include "google/cloud/dialogflow_cx/versions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_cx/versions_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/versions_connection_idempotency_policy.h index 7dacaff9f166a..8469f13376ded 100644 --- a/google/cloud/dialogflow_cx/versions_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/versions_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/version.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_cx/webhooks_connection.h b/google/cloud/dialogflow_cx/webhooks_connection.h index 656e5de808058..c8a35ac3e9ab8 100644 --- a/google/cloud/dialogflow_cx/webhooks_connection.h +++ b/google/cloud/dialogflow_cx/webhooks_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_WEBHOOKS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_WEBHOOKS_CONNECTION_H +#include "google/cloud/dialogflow/cx/v3/webhook.pb.h" #include "google/cloud/dialogflow_cx/internal/webhooks_retry_traits.h" #include "google/cloud/dialogflow_cx/webhooks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_cx/webhooks_connection_idempotency_policy.h b/google/cloud/dialogflow_cx/webhooks_connection_idempotency_policy.h index 9f131147cf944..8c6b7b9fe2a0f 100644 --- a/google/cloud/dialogflow_cx/webhooks_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_cx/webhooks_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_WEBHOOKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_CX_WEBHOOKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/cx/v3/webhook.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/BUILD.bazel b/google/cloud/dialogflow_es/BUILD.bazel index 891db088da2ec..34b4e49287673 100644 --- a/google/cloud/dialogflow_es/BUILD.bazel +++ b/google/cloud/dialogflow_es/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = [""] googleapis_deps = [ - "@com_google_googleapis//google/cloud/dialogflow/v2:dialogflow_cc_grpc", + "@googleapis//google/cloud/dialogflow/v2:dialogflow_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/dialogflow_es/agents_client.h b/google/cloud/dialogflow_es/agents_client.h index bd176d10d8590..6dd2a5a5a404a 100644 --- a/google/cloud/dialogflow_es/agents_client.h +++ b/google/cloud/dialogflow_es/agents_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/agents_connection.h b/google/cloud/dialogflow_es/agents_connection.h index 75a34a8e493f7..65562a4d17597 100644 --- a/google/cloud/dialogflow_es/agents_connection.h +++ b/google/cloud/dialogflow_es/agents_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_AGENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_AGENTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/agent.pb.h" #include "google/cloud/dialogflow_es/agents_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/agents_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/agents_connection_idempotency_policy.h b/google/cloud/dialogflow_es/agents_connection_idempotency_policy.h index b1a59cd22b0e0..cab4320727978 100644 --- a/google/cloud/dialogflow_es/agents_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/agents_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_AGENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_AGENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/agent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/answer_records_connection.h b/google/cloud/dialogflow_es/answer_records_connection.h index 0420e3ccca703..b0cc19b818d78 100644 --- a/google/cloud/dialogflow_es/answer_records_connection.h +++ b/google/cloud/dialogflow_es/answer_records_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ANSWER_RECORDS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ANSWER_RECORDS_CONNECTION_H +#include "google/cloud/dialogflow/v2/answer_record.pb.h" #include "google/cloud/dialogflow_es/answer_records_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/answer_records_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/answer_records_connection_idempotency_policy.h b/google/cloud/dialogflow_es/answer_records_connection_idempotency_policy.h index 058e1eabb5859..c22be1c8a22a0 100644 --- a/google/cloud/dialogflow_es/answer_records_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/answer_records_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ANSWER_RECORDS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ANSWER_RECORDS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/answer_record.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/contexts_connection.h b/google/cloud/dialogflow_es/contexts_connection.h index 24cbc38c4016c..c6680cd1609d6 100644 --- a/google/cloud/dialogflow_es/contexts_connection.h +++ b/google/cloud/dialogflow_es/contexts_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONTEXTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONTEXTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/context.pb.h" #include "google/cloud/dialogflow_es/contexts_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/contexts_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/contexts_connection_idempotency_policy.h b/google/cloud/dialogflow_es/contexts_connection_idempotency_policy.h index 5c32a64cce4e7..553ab1448cf18 100644 --- a/google/cloud/dialogflow_es/contexts_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/contexts_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONTEXTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONTEXTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/context.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/conversation_datasets_client.h b/google/cloud/dialogflow_es/conversation_datasets_client.h index a161a65f4db22..7b3fdfdccfcc9 100644 --- a/google/cloud/dialogflow_es/conversation_datasets_client.h +++ b/google/cloud/dialogflow_es/conversation_datasets_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/conversation_datasets_connection.h b/google/cloud/dialogflow_es/conversation_datasets_connection.h index fa99430519956..44da840ab5869 100644 --- a/google/cloud/dialogflow_es/conversation_datasets_connection.h +++ b/google/cloud/dialogflow_es/conversation_datasets_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_DATASETS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_DATASETS_CONNECTION_H +#include "google/cloud/dialogflow/v2/conversation_dataset.pb.h" #include "google/cloud/dialogflow_es/conversation_datasets_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/conversation_datasets_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/conversation_datasets_connection_idempotency_policy.h b/google/cloud/dialogflow_es/conversation_datasets_connection_idempotency_policy.h index 91f66c445a335..c46074ddb5dd0 100644 --- a/google/cloud/dialogflow_es/conversation_datasets_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/conversation_datasets_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_DATASETS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_DATASETS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/conversation_dataset.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/conversation_models_client.h b/google/cloud/dialogflow_es/conversation_models_client.h index 4916d94c04ed7..7b5d82e02f88c 100644 --- a/google/cloud/dialogflow_es/conversation_models_client.h +++ b/google/cloud/dialogflow_es/conversation_models_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/conversation_models_connection.h b/google/cloud/dialogflow_es/conversation_models_connection.h index 8bda5ccaab45c..235a784048f7f 100644 --- a/google/cloud/dialogflow_es/conversation_models_connection.h +++ b/google/cloud/dialogflow_es/conversation_models_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_MODELS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_MODELS_CONNECTION_H +#include "google/cloud/dialogflow/v2/conversation_model.pb.h" #include "google/cloud/dialogflow_es/conversation_models_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/conversation_models_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/conversation_models_connection_idempotency_policy.h b/google/cloud/dialogflow_es/conversation_models_connection_idempotency_policy.h index b6a90141cfa1c..4eec02306292f 100644 --- a/google/cloud/dialogflow_es/conversation_models_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/conversation_models_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_MODELS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_MODELS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/conversation_model.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/conversation_profiles_client.h b/google/cloud/dialogflow_es/conversation_profiles_client.h index 276003e246b96..d4efbbd18e47b 100644 --- a/google/cloud/dialogflow_es/conversation_profiles_client.h +++ b/google/cloud/dialogflow_es/conversation_profiles_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/conversation_profiles_connection.h b/google/cloud/dialogflow_es/conversation_profiles_connection.h index 75eafc20599f0..fb6f9ded7f156 100644 --- a/google/cloud/dialogflow_es/conversation_profiles_connection.h +++ b/google/cloud/dialogflow_es/conversation_profiles_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_PROFILES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_PROFILES_CONNECTION_H +#include "google/cloud/dialogflow/v2/conversation_profile.pb.h" #include "google/cloud/dialogflow_es/conversation_profiles_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/conversation_profiles_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/conversation_profiles_connection_idempotency_policy.h b/google/cloud/dialogflow_es/conversation_profiles_connection_idempotency_policy.h index 613836222d388..c845e528171dc 100644 --- a/google/cloud/dialogflow_es/conversation_profiles_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/conversation_profiles_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_PROFILES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATION_PROFILES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/conversation_profile.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/conversations_connection.h b/google/cloud/dialogflow_es/conversations_connection.h index c84b7ed7cd744..d1109cc6fc705 100644 --- a/google/cloud/dialogflow_es/conversations_connection.h +++ b/google/cloud/dialogflow_es/conversations_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATIONS_CONNECTION_H +#include "google/cloud/dialogflow/v2/conversation.pb.h" #include "google/cloud/dialogflow_es/conversations_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/conversations_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/conversations_connection_idempotency_policy.h b/google/cloud/dialogflow_es/conversations_connection_idempotency_policy.h index ff63bfbde9d6d..783d6bb089192 100644 --- a/google/cloud/dialogflow_es/conversations_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/conversations_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_CONVERSATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/conversation.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/documents_client.h b/google/cloud/dialogflow_es/documents_client.h index 97f9b8229e036..06efc7bb18e75 100644 --- a/google/cloud/dialogflow_es/documents_client.h +++ b/google/cloud/dialogflow_es/documents_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/documents_connection.h b/google/cloud/dialogflow_es/documents_connection.h index 4fea6e998b960..006915733738d 100644 --- a/google/cloud/dialogflow_es/documents_connection.h +++ b/google/cloud/dialogflow_es/documents_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_DOCUMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_DOCUMENTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/document.pb.h" #include "google/cloud/dialogflow_es/documents_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/documents_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/documents_connection_idempotency_policy.h b/google/cloud/dialogflow_es/documents_connection_idempotency_policy.h index df6e2052946c9..088840d2da999 100644 --- a/google/cloud/dialogflow_es/documents_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/documents_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_DOCUMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_DOCUMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/document.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/encryption_spec_client.h b/google/cloud/dialogflow_es/encryption_spec_client.h index d663cb64de21b..88a8f2e607f30 100644 --- a/google/cloud/dialogflow_es/encryption_spec_client.h +++ b/google/cloud/dialogflow_es/encryption_spec_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/encryption_spec_connection.h b/google/cloud/dialogflow_es/encryption_spec_connection.h index 244c0b4851dc4..90a0acb0dd526 100644 --- a/google/cloud/dialogflow_es/encryption_spec_connection.h +++ b/google/cloud/dialogflow_es/encryption_spec_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENCRYPTION_SPEC_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENCRYPTION_SPEC_CONNECTION_H +#include "google/cloud/dialogflow/v2/encryption_spec.pb.h" #include "google/cloud/dialogflow_es/encryption_spec_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/encryption_spec_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/encryption_spec_connection_idempotency_policy.h b/google/cloud/dialogflow_es/encryption_spec_connection_idempotency_policy.h index 4cf9115040e4b..a7a79ff2e975c 100644 --- a/google/cloud/dialogflow_es/encryption_spec_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/encryption_spec_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENCRYPTION_SPEC_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENCRYPTION_SPEC_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/encryption_spec.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/entity_types_client.h b/google/cloud/dialogflow_es/entity_types_client.h index a59cdaaff8a98..03723b8853e34 100644 --- a/google/cloud/dialogflow_es/entity_types_client.h +++ b/google/cloud/dialogflow_es/entity_types_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/entity_types_connection.h b/google/cloud/dialogflow_es/entity_types_connection.h index b44c5b2393efa..7722b2a9bcd47 100644 --- a/google/cloud/dialogflow_es/entity_types_connection.h +++ b/google/cloud/dialogflow_es/entity_types_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENTITY_TYPES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENTITY_TYPES_CONNECTION_H +#include "google/cloud/dialogflow/v2/entity_type.pb.h" #include "google/cloud/dialogflow_es/entity_types_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/entity_types_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/entity_types_connection_idempotency_policy.h b/google/cloud/dialogflow_es/entity_types_connection_idempotency_policy.h index 7e896ea74d661..e47ee45d1eb87 100644 --- a/google/cloud/dialogflow_es/entity_types_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/entity_types_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/environments_connection.h b/google/cloud/dialogflow_es/environments_connection.h index 7a2c937b529de..1b0c84690e5e2 100644 --- a/google/cloud/dialogflow_es/environments_connection.h +++ b/google/cloud/dialogflow_es/environments_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENVIRONMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENVIRONMENTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/environment.pb.h" #include "google/cloud/dialogflow_es/environments_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/environments_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/environments_connection_idempotency_policy.h b/google/cloud/dialogflow_es/environments_connection_idempotency_policy.h index 5ce5ef5ac37d4..1b7a5dd732c82 100644 --- a/google/cloud/dialogflow_es/environments_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/environments_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/environment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/fulfillments_connection.h b/google/cloud/dialogflow_es/fulfillments_connection.h index 048dc448411c2..c184c481827dc 100644 --- a/google/cloud/dialogflow_es/fulfillments_connection.h +++ b/google/cloud/dialogflow_es/fulfillments_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_FULFILLMENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_FULFILLMENTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/fulfillment.pb.h" #include "google/cloud/dialogflow_es/fulfillments_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/fulfillments_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/fulfillments_connection_idempotency_policy.h b/google/cloud/dialogflow_es/fulfillments_connection_idempotency_policy.h index 5e6e3dc407104..f42465e910fc7 100644 --- a/google/cloud/dialogflow_es/fulfillments_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/fulfillments_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_FULFILLMENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_FULFILLMENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/fulfillment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/generators_connection.h b/google/cloud/dialogflow_es/generators_connection.h index 3b9bd277d6632..33e2c05b66c45 100644 --- a/google/cloud/dialogflow_es/generators_connection.h +++ b/google/cloud/dialogflow_es/generators_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_GENERATORS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_GENERATORS_CONNECTION_H +#include "google/cloud/dialogflow/v2/generator.pb.h" #include "google/cloud/dialogflow_es/generators_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/generators_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/generators_connection_idempotency_policy.h b/google/cloud/dialogflow_es/generators_connection_idempotency_policy.h index 089858fc6949a..5a37b374b5f12 100644 --- a/google/cloud/dialogflow_es/generators_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/generators_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_GENERATORS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_GENERATORS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/generator.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/intents_client.h b/google/cloud/dialogflow_es/intents_client.h index c1751613400ff..545db73bce79d 100644 --- a/google/cloud/dialogflow_es/intents_client.h +++ b/google/cloud/dialogflow_es/intents_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/intents_connection.h b/google/cloud/dialogflow_es/intents_connection.h index b198d3f2bddab..62996a5d04b2a 100644 --- a/google/cloud/dialogflow_es/intents_connection.h +++ b/google/cloud/dialogflow_es/intents_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTENTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/intent.pb.h" #include "google/cloud/dialogflow_es/intents_connection_idempotency_policy.h" #include "google/cloud/dialogflow_es/internal/intents_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +31,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/intents_connection_idempotency_policy.h b/google/cloud/dialogflow_es/intents_connection_idempotency_policy.h index ce1be9ae11824..c5b2e99312deb 100644 --- a/google/cloud/dialogflow_es/intents_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/intents_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/intent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/agents_auth_decorator.cc b/google/cloud/dialogflow_es/internal/agents_auth_decorator.cc index f886bc170b823..93f5c66480382 100644 --- a/google/cloud/dialogflow_es/internal/agents_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/agents_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/agent.proto #include "google/cloud/dialogflow_es/internal/agents_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/agent.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_auth_decorator.h b/google/cloud/dialogflow_es/internal/agents_auth_decorator.h index 60a1c64685fed..bc7604fc6d50b 100644 --- a/google/cloud/dialogflow_es/internal/agents_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/agents_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/agents_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_connection_impl.h b/google/cloud/dialogflow_es/internal/agents_connection_impl.h index 780687645c700..a846a1dba54c0 100644 --- a/google/cloud/dialogflow_es/internal/agents_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/agents_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/agents_logging_decorator.cc b/google/cloud/dialogflow_es/internal/agents_logging_decorator.cc index eb7df10f992db..41bef6bafcdd5 100644 --- a/google/cloud/dialogflow_es/internal/agents_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/agents_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/agent.proto #include "google/cloud/dialogflow_es/internal/agents_logging_decorator.h" +#include "google/cloud/dialogflow/v2/agent.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_logging_decorator.h b/google/cloud/dialogflow_es/internal/agents_logging_decorator.h index 80f19c5ccbece..816f79c40c238 100644 --- a/google/cloud/dialogflow_es/internal/agents_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/agents_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/agents_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/agents_metadata_decorator.cc index 3613340f24fc2..0a63e4e3a3119 100644 --- a/google/cloud/dialogflow_es/internal/agents_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/agents_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/agent.proto #include "google/cloud/dialogflow_es/internal/agents_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/agent.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_metadata_decorator.h b/google/cloud/dialogflow_es/internal/agents_metadata_decorator.h index 4ed41e60e0826..20c22710af947 100644 --- a/google/cloud/dialogflow_es/internal/agents_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/agents_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/agents_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_stub.cc b/google/cloud/dialogflow_es/internal/agents_stub.cc index 29cdea7fcf52c..04df801d3822b 100644 --- a/google/cloud/dialogflow_es/internal/agents_stub.cc +++ b/google/cloud/dialogflow_es/internal/agents_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/agent.proto #include "google/cloud/dialogflow_es/internal/agents_stub.h" +#include "google/cloud/dialogflow/v2/agent.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_stub.h b/google/cloud/dialogflow_es/internal/agents_stub.h index 5dd099fec530f..2ca8a710b2fbf 100644 --- a/google/cloud/dialogflow_es/internal/agents_stub.h +++ b/google/cloud/dialogflow_es/internal/agents_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_AGENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_AGENTS_STUB_H +#include "google/cloud/dialogflow/v2/agent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_stub_factory.cc b/google/cloud/dialogflow_es/internal/agents_stub_factory.cc index ef6eac42e88e2..43e0df1375ff7 100644 --- a/google/cloud/dialogflow_es/internal/agents_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/agents_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/agent.proto #include "google/cloud/dialogflow_es/internal/agents_stub_factory.h" +#include "google/cloud/dialogflow/v2/agent.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/agents_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/agents_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/agents_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/agents_stub.h" #include "google/cloud/dialogflow_es/internal/agents_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc b/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc index ce20dd6f8af5e..50626bdf3b7e5 100644 --- a/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AgentsTracingConnection::AgentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -225,15 +223,11 @@ Status AgentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAgentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/agents_tracing_connection.h b/google/cloud/dialogflow_es/internal/agents_tracing_connection.h index 01f3d4b5d2a15..5f36e62fd81a5 100644 --- a/google/cloud/dialogflow_es/internal/agents_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/agents_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AgentsTracingConnection : public dialogflow_es::AgentsConnection { public: ~AgentsTracingConnection() override = default; @@ -120,8 +118,6 @@ class AgentsTracingConnection : public dialogflow_es::AgentsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc b/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc index d0d7ff8dd5606..f035752512bbe 100644 --- a/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AgentsTracingStub::AgentsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -273,15 +271,9 @@ future AgentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAgentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/agents_tracing_stub.h b/google/cloud/dialogflow_es/internal/agents_tracing_stub.h index f822514aa1635..4c5ff6a48f0f4 100644 --- a/google/cloud/dialogflow_es/internal/agents_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/agents_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AgentsTracingStub : public AgentsStub { public: ~AgentsTracingStub() override = default; @@ -144,8 +142,6 @@ class AgentsTracingStub : public AgentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/answer_records_auth_decorator.cc b/google/cloud/dialogflow_es/internal/answer_records_auth_decorator.cc index e7eb32a9b5b5e..33d2e4c445e5b 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/answer_record.proto #include "google/cloud/dialogflow_es/internal/answer_records_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/answer_record.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/answer_records_logging_decorator.cc b/google/cloud/dialogflow_es/internal/answer_records_logging_decorator.cc index 3d228f681f4c9..098773576653e 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/answer_record.proto #include "google/cloud/dialogflow_es/internal/answer_records_logging_decorator.h" +#include "google/cloud/dialogflow/v2/answer_record.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/answer_records_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/answer_records_metadata_decorator.cc index 9a67143f97cd4..2283eefe8ad2d 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/answer_record.proto #include "google/cloud/dialogflow_es/internal/answer_records_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/answer_record.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/answer_records_stub.cc b/google/cloud/dialogflow_es/internal/answer_records_stub.cc index 5eefeb85545ed..65fc34facf9ca 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_stub.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/answer_record.proto #include "google/cloud/dialogflow_es/internal/answer_records_stub.h" +#include "google/cloud/dialogflow/v2/answer_record.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/answer_records_stub.h b/google/cloud/dialogflow_es/internal/answer_records_stub.h index b5d2e25113524..1384ef739414c 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_stub.h +++ b/google/cloud/dialogflow_es/internal/answer_records_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ANSWER_RECORDS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ANSWER_RECORDS_STUB_H +#include "google/cloud/dialogflow/v2/answer_record.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/answer_records_stub_factory.cc b/google/cloud/dialogflow_es/internal/answer_records_stub_factory.cc index ad318881d723c..7c1757d9a765d 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/answer_record.proto #include "google/cloud/dialogflow_es/internal/answer_records_stub_factory.h" +#include "google/cloud/dialogflow/v2/answer_record.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/answer_records_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/answer_records_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/answer_records_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/answer_records_stub.h" #include "google/cloud/dialogflow_es/internal/answer_records_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc b/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc index 017760478a98b..8f0e07d0cc0fd 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AnswerRecordsTracingConnection::AnswerRecordsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -102,16 +100,12 @@ Status AnswerRecordsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAnswerRecordsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.h b/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.h index 053a893330b28..10cb9f93ea2ea 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AnswerRecordsTracingConnection : public dialogflow_es::AnswerRecordsConnection { public: @@ -66,8 +64,6 @@ class AnswerRecordsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.cc b/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.cc index f3cf17b00bd9b..84e3f4c560b9c 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AnswerRecordsTracingStub::AnswerRecordsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -114,15 +112,9 @@ Status AnswerRecordsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAnswerRecordsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.h b/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.h index 4a25399c4bcaf..6646e1563fef1 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/answer_records_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AnswerRecordsTracingStub : public AnswerRecordsStub { public: ~AnswerRecordsTracingStub() override = default; @@ -75,8 +73,6 @@ class AnswerRecordsTracingStub : public AnswerRecordsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/contexts_auth_decorator.cc b/google/cloud/dialogflow_es/internal/contexts_auth_decorator.cc index f41fea037d147..8ba235eb7ae6e 100644 --- a/google/cloud/dialogflow_es/internal/contexts_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/contexts_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/context.proto #include "google/cloud/dialogflow_es/internal/contexts_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/context.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/contexts_logging_decorator.cc b/google/cloud/dialogflow_es/internal/contexts_logging_decorator.cc index fe66c6e82f291..b8a85b2e309d2 100644 --- a/google/cloud/dialogflow_es/internal/contexts_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/contexts_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/context.proto #include "google/cloud/dialogflow_es/internal/contexts_logging_decorator.h" +#include "google/cloud/dialogflow/v2/context.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/contexts_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/contexts_metadata_decorator.cc index 2f43012a9c0be..8c8737abf1b4e 100644 --- a/google/cloud/dialogflow_es/internal/contexts_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/contexts_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/context.proto #include "google/cloud/dialogflow_es/internal/contexts_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/context.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/contexts_stub.cc b/google/cloud/dialogflow_es/internal/contexts_stub.cc index 69d6806604a97..6a937d6943554 100644 --- a/google/cloud/dialogflow_es/internal/contexts_stub.cc +++ b/google/cloud/dialogflow_es/internal/contexts_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/context.proto #include "google/cloud/dialogflow_es/internal/contexts_stub.h" +#include "google/cloud/dialogflow/v2/context.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/contexts_stub.h b/google/cloud/dialogflow_es/internal/contexts_stub.h index 22b8dbf264a08..e263614f11a51 100644 --- a/google/cloud/dialogflow_es/internal/contexts_stub.h +++ b/google/cloud/dialogflow_es/internal/contexts_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONTEXTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONTEXTS_STUB_H +#include "google/cloud/dialogflow/v2/context.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/contexts_stub_factory.cc b/google/cloud/dialogflow_es/internal/contexts_stub_factory.cc index 729866f97cee2..d2047a485a41e 100644 --- a/google/cloud/dialogflow_es/internal/contexts_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/contexts_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/context.proto #include "google/cloud/dialogflow_es/internal/contexts_stub_factory.h" +#include "google/cloud/dialogflow/v2/context.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/contexts_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/contexts_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/contexts_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/contexts_stub.h" #include "google/cloud/dialogflow_es/internal/contexts_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc b/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc index f41d06741313e..25264417dd9ac 100644 --- a/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContextsTracingConnection::ContextsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -135,16 +133,12 @@ Status ContextsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContextsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/contexts_tracing_connection.h b/google/cloud/dialogflow_es/internal/contexts_tracing_connection.h index 96ea4b943c562..826b421215cc6 100644 --- a/google/cloud/dialogflow_es/internal/contexts_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/contexts_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContextsTracingConnection : public dialogflow_es::ContextsConnection { public: ~ContextsTracingConnection() override = default; @@ -80,8 +78,6 @@ class ContextsTracingConnection : public dialogflow_es::ContextsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/contexts_tracing_stub.cc b/google/cloud/dialogflow_es/internal/contexts_tracing_stub.cc index f03a75f891c53..9391938e73b80 100644 --- a/google/cloud/dialogflow_es/internal/contexts_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/contexts_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ContextsTracingStub::ContextsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -158,15 +156,9 @@ Status ContextsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeContextsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/contexts_tracing_stub.h b/google/cloud/dialogflow_es/internal/contexts_tracing_stub.h index 87fe72f5074c8..3145f98054d5f 100644 --- a/google/cloud/dialogflow_es/internal/contexts_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/contexts_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ContextsTracingStub : public ContextsStub { public: ~ContextsTracingStub() override = default; @@ -93,8 +91,6 @@ class ContextsTracingStub : public ContextsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.cc index f3ada29605abf..fe0e182c473da 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/conversation_dataset.proto #include "google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/conversation_dataset.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.h b/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.h index 2667217e7180c..600ce75fd4207 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_datasets_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_connection_impl.h b/google/cloud/dialogflow_es/internal/conversation_datasets_connection_impl.h index 8d2b57f45589a..78a38964ea823 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.cc index 6e7962f40d20f..8f8f676c15e7a 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/conversation_dataset.proto #include "google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.h" +#include "google/cloud/dialogflow/v2/conversation_dataset.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.h b/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.h index e9a949fd6cc31..e321b6c87aa62 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_datasets_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.cc index 824bee67453af..d556e9f838144 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/conversation_dataset.proto #include "google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/conversation_dataset.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.h b/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.h index 48774ba5427d0..621979f484850 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_datasets_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc index a6871b3669eaf..8fc0334406d56 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/conversation_dataset.proto #include "google/cloud/dialogflow_es/internal/conversation_datasets_stub.h" +#include "google/cloud/dialogflow/v2/conversation_dataset.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h index e81ee6255998f..849e0372835ed 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATION_DATASETS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATION_DATASETS_STUB_H +#include "google/cloud/dialogflow/v2/conversation_dataset.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc index 736bd848375a9..14d413e9f1056 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/conversation_dataset.proto #include "google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.h" +#include "google/cloud/dialogflow/v2/conversation_dataset.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/conversation_datasets_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_datasets_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_datasets_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_datasets_stub.h" #include "google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc index d9cc70dc3e7f2..e0fdf0cbff90f 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationDatasetsTracingConnection::ConversationDatasetsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -213,17 +211,13 @@ Status ConversationDatasetsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationDatasetsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.h b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.h index 48920e83f816d..7b6cded789e6d 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationDatasetsTracingConnection : public dialogflow_es::ConversationDatasetsConnection { public: @@ -115,8 +113,6 @@ class ConversationDatasetsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc index 7dead452e5ea5..fc5f56ef0d195 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationDatasetsTracingStub::ConversationDatasetsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -245,15 +243,9 @@ future ConversationDatasetsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationDatasetsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.h b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.h index 8d42999214a57..78c550b49f38d 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationDatasetsTracingStub : public ConversationDatasetsStub { public: ~ConversationDatasetsTracingStub() override = default; @@ -127,8 +125,6 @@ class ConversationDatasetsTracingStub : public ConversationDatasetsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.cc index aae3b5e7796a9..1f38a7caeabc7 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/conversation_model.proto #include "google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/conversation_model.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.h b/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.h index 65965652491ea..4d8ddb06d7273 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_models_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_connection_impl.h b/google/cloud/dialogflow_es/internal/conversation_models_connection_impl.h index de3fdd28ff5ce..831c50a1a5762 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.cc index e1d7777fef097..e6e1aac06f3c3 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/conversation_model.proto #include "google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.h" +#include "google/cloud/dialogflow/v2/conversation_model.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.h b/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.h index 1c5ac09d0bd3b..128c638393df1 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_models_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.cc index 8c35ce72ee964..4827b347fb6ac 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/conversation_model.proto #include "google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/conversation_model.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.h b/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.h index ee1827b663aa7..6e5d88d4172cc 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_models_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_stub.cc b/google/cloud/dialogflow_es/internal/conversation_models_stub.cc index 7ec52c36c1ed8..b861da8e2a4b8 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/conversation_model.proto #include "google/cloud/dialogflow_es/internal/conversation_models_stub.h" +#include "google/cloud/dialogflow/v2/conversation_model.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_stub.h b/google/cloud/dialogflow_es/internal/conversation_models_stub.h index b06aedf3e20e7..b2aff6cfa7bdf 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATION_MODELS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATION_MODELS_STUB_H +#include "google/cloud/dialogflow/v2/conversation_model.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc index b9588a62a1527..1766641ed64b3 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/conversation_model.proto #include "google/cloud/dialogflow_es/internal/conversation_models_stub_factory.h" +#include "google/cloud/dialogflow/v2/conversation_model.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/conversation_models_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_models_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_models_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_models_stub.h" #include "google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc index 5afa2351d1a59..db8334434acb3 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationModelsTracingConnection::ConversationModelsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -301,17 +299,13 @@ Status ConversationModelsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationModelsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.h b/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.h index 441c40a290e11..e646cc5777b6e 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationModelsTracingConnection : public dialogflow_es::ConversationModelsConnection { public: @@ -155,8 +153,6 @@ class ConversationModelsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc index 9f1e7af19914c..a2a77350bce26 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationModelsTracingStub::ConversationModelsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -337,15 +335,9 @@ future ConversationModelsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationModelsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.h b/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.h index 6ab727cd8f9e2..b82bdd01d89a4 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationModelsTracingStub : public ConversationModelsStub { public: ~ConversationModelsTracingStub() override = default; @@ -164,8 +162,6 @@ class ConversationModelsTracingStub : public ConversationModelsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.cc index 8cf6b4fd78450..019b3a7fddb93 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/conversation_profile.proto #include "google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/conversation_profile.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.h b/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.h index a52ea337d249e..e2ac6a74e2dc0 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_profiles_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_connection_impl.h b/google/cloud/dialogflow_es/internal/conversation_profiles_connection_impl.h index ba2829b44a97c..ea9c66f545f14 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.cc index 64140d2088831..0c4b3642f6010 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/conversation_profile.proto #include "google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.h" +#include "google/cloud/dialogflow/v2/conversation_profile.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.h b/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.h index a0f85a9e3e494..95398188e1f4b 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_profiles_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.cc index bbc01deac5cc4..81a3e4c54ad2e 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/conversation_profile.proto #include "google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/conversation_profile.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.h b/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.h index ce623f0bc6ead..41b741b5040f8 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/conversation_profiles_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc index 738c66e6d2e1e..08bdb735f32f3 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/conversation_profile.proto #include "google/cloud/dialogflow_es/internal/conversation_profiles_stub.h" +#include "google/cloud/dialogflow/v2/conversation_profile.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h index 95a6150935be2..4c5dd27a6088b 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATION_PROFILES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATION_PROFILES_STUB_H +#include "google/cloud/dialogflow/v2/conversation_profile.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc index 9c8701f862472..23c34bab02765 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/conversation_profile.proto #include "google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.h" +#include "google/cloud/dialogflow/v2/conversation_profile.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/conversation_profiles_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_profiles_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_profiles_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/conversation_profiles_stub.h" #include "google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc index 514db7e718199..15b8bb840a0d7 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationProfilesTracingConnection::ConversationProfilesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -208,17 +206,13 @@ Status ConversationProfilesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationProfilesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.h b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.h index 5a994ec4737d0..c7ceb3d29d55a 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationProfilesTracingConnection : public dialogflow_es::ConversationProfilesConnection { public: @@ -111,8 +109,6 @@ class ConversationProfilesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc index 6445f6e6e9873..9d852d85c6b77 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationProfilesTracingStub::ConversationProfilesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -257,15 +255,9 @@ future ConversationProfilesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationProfilesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.h b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.h index 9994722b6a7d5..d9cd6ddaf8b1f 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationProfilesTracingStub : public ConversationProfilesStub { public: ~ConversationProfilesTracingStub() override = default; @@ -132,8 +130,6 @@ class ConversationProfilesTracingStub : public ConversationProfilesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/conversations_auth_decorator.cc b/google/cloud/dialogflow_es/internal/conversations_auth_decorator.cc index 51e5850f67b1e..919493e61ae96 100644 --- a/google/cloud/dialogflow_es/internal/conversations_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversations_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/conversation.proto #include "google/cloud/dialogflow_es/internal/conversations_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/conversation.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversations_logging_decorator.cc b/google/cloud/dialogflow_es/internal/conversations_logging_decorator.cc index 7b4b17d87bb2c..19ca398aa804f 100644 --- a/google/cloud/dialogflow_es/internal/conversations_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversations_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/conversation.proto #include "google/cloud/dialogflow_es/internal/conversations_logging_decorator.h" +#include "google/cloud/dialogflow/v2/conversation.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversations_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/conversations_metadata_decorator.cc index 756b5da85f48f..10b853d97d3da 100644 --- a/google/cloud/dialogflow_es/internal/conversations_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/conversations_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/conversation.proto #include "google/cloud/dialogflow_es/internal/conversations_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/conversation.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversations_stub.cc b/google/cloud/dialogflow_es/internal/conversations_stub.cc index 375c6000f5bf2..05f64cd0d6f2d 100644 --- a/google/cloud/dialogflow_es/internal/conversations_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversations_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/conversation.proto #include "google/cloud/dialogflow_es/internal/conversations_stub.h" +#include "google/cloud/dialogflow/v2/conversation.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/conversations_stub.h b/google/cloud/dialogflow_es/internal/conversations_stub.h index 702fcc7d1884f..669d452b8b1d4 100644 --- a/google/cloud/dialogflow_es/internal/conversations_stub.h +++ b/google/cloud/dialogflow_es/internal/conversations_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_CONVERSATIONS_STUB_H +#include "google/cloud/dialogflow/v2/conversation.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversations_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversations_stub_factory.cc index 4d91f838a99c1..d4236895ff3a7 100644 --- a/google/cloud/dialogflow_es/internal/conversations_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversations_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/conversation.proto #include "google/cloud/dialogflow_es/internal/conversations_stub_factory.h" +#include "google/cloud/dialogflow/v2/conversation.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/conversations_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/conversations_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/conversations_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/conversations_stub.h" #include "google/cloud/dialogflow_es/internal/conversations_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc index 541c63c872d0f..7c96b871fe577 100644 --- a/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationsTracingConnection::ConversationsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -189,16 +187,12 @@ Status ConversationsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/conversations_tracing_connection.h b/google/cloud/dialogflow_es/internal/conversations_tracing_connection.h index 35109ca60d333..aff2e8830bc1e 100644 --- a/google/cloud/dialogflow_es/internal/conversations_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/conversations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationsTracingConnection : public dialogflow_es::ConversationsConnection { public: @@ -106,8 +104,6 @@ class ConversationsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/conversations_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversations_tracing_stub.cc index 6330763910d3f..356bcaf50f20e 100644 --- a/google/cloud/dialogflow_es/internal/conversations_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversations_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationsTracingStub::ConversationsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -230,15 +228,9 @@ Status ConversationsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversations_tracing_stub.h b/google/cloud/dialogflow_es/internal/conversations_tracing_stub.h index 59be254a438ea..62e1838f3f1da 100644 --- a/google/cloud/dialogflow_es/internal/conversations_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/conversations_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationsTracingStub : public ConversationsStub { public: ~ConversationsTracingStub() override = default; @@ -125,8 +123,6 @@ class ConversationsTracingStub : public ConversationsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/documents_auth_decorator.cc b/google/cloud/dialogflow_es/internal/documents_auth_decorator.cc index 251c9ecb6e744..ad07391d03c15 100644 --- a/google/cloud/dialogflow_es/internal/documents_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/documents_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/document.proto #include "google/cloud/dialogflow_es/internal/documents_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/document.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_auth_decorator.h b/google/cloud/dialogflow_es/internal/documents_auth_decorator.h index fe7d36473fd79..a3ef884540f1c 100644 --- a/google/cloud/dialogflow_es/internal/documents_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/documents_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/documents_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_connection_impl.h b/google/cloud/dialogflow_es/internal/documents_connection_impl.h index c753e4c642757..7633b82253c4e 100644 --- a/google/cloud/dialogflow_es/internal/documents_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/documents_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/documents_logging_decorator.cc b/google/cloud/dialogflow_es/internal/documents_logging_decorator.cc index 657a9b07f70d4..d6dec96dc2b7a 100644 --- a/google/cloud/dialogflow_es/internal/documents_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/documents_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/document.proto #include "google/cloud/dialogflow_es/internal/documents_logging_decorator.h" +#include "google/cloud/dialogflow/v2/document.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_logging_decorator.h b/google/cloud/dialogflow_es/internal/documents_logging_decorator.h index ea5a5fe94d2ae..74c672997437b 100644 --- a/google/cloud/dialogflow_es/internal/documents_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/documents_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/documents_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/documents_metadata_decorator.cc index e39a8d4b9875d..1395a29cfd889 100644 --- a/google/cloud/dialogflow_es/internal/documents_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/documents_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/document.proto #include "google/cloud/dialogflow_es/internal/documents_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/document.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_metadata_decorator.h b/google/cloud/dialogflow_es/internal/documents_metadata_decorator.h index e7d7390fa1011..d03a2f51eb9df 100644 --- a/google/cloud/dialogflow_es/internal/documents_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/documents_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/documents_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_stub.cc b/google/cloud/dialogflow_es/internal/documents_stub.cc index 75d7de091e12d..466b115610bbe 100644 --- a/google/cloud/dialogflow_es/internal/documents_stub.cc +++ b/google/cloud/dialogflow_es/internal/documents_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/document.proto #include "google/cloud/dialogflow_es/internal/documents_stub.h" +#include "google/cloud/dialogflow/v2/document.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_stub.h b/google/cloud/dialogflow_es/internal/documents_stub.h index f50bb26d6c28c..a300c2743d5d8 100644 --- a/google/cloud/dialogflow_es/internal/documents_stub.h +++ b/google/cloud/dialogflow_es/internal/documents_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_DOCUMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_DOCUMENTS_STUB_H +#include "google/cloud/dialogflow/v2/document.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_stub_factory.cc b/google/cloud/dialogflow_es/internal/documents_stub_factory.cc index 2c80903dd0bd1..a925c8c434042 100644 --- a/google/cloud/dialogflow_es/internal/documents_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/documents_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/document.proto #include "google/cloud/dialogflow_es/internal/documents_stub_factory.h" +#include "google/cloud/dialogflow/v2/document.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/documents_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/documents_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/documents_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/documents_stub.h" #include "google/cloud/dialogflow_es/internal/documents_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc b/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc index 310bd2aebfcc6..a1ff1a285a224 100644 --- a/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentsTracingConnection::DocumentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -275,16 +273,12 @@ Status DocumentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/documents_tracing_connection.h b/google/cloud/dialogflow_es/internal/documents_tracing_connection.h index 75fde695e6d68..5aef5bdb83483 100644 --- a/google/cloud/dialogflow_es/internal/documents_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/documents_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentsTracingConnection : public dialogflow_es::DocumentsConnection { public: ~DocumentsTracingConnection() override = default; @@ -137,8 +135,6 @@ class DocumentsTracingConnection : public dialogflow_es::DocumentsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc b/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc index 515bf7b8a7cea..004a8c06753da 100644 --- a/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentsTracingStub::DocumentsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -296,15 +294,9 @@ future DocumentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/documents_tracing_stub.h b/google/cloud/dialogflow_es/internal/documents_tracing_stub.h index 5927be7b7d580..1b62f191f0139 100644 --- a/google/cloud/dialogflow_es/internal/documents_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/documents_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentsTracingStub : public DocumentsStub { public: ~DocumentsTracingStub() override = default; @@ -158,8 +156,6 @@ class DocumentsTracingStub : public DocumentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.cc b/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.cc index b6d9c4e6376e0..c0f644aa12c39 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/encryption_spec.proto #include "google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/encryption_spec.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.h b/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.h index 813bcccb81cff..e0a9db560cdfb 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/encryption_spec_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_connection_impl.h b/google/cloud/dialogflow_es/internal/encryption_spec_connection_impl.h index 9449b6d22b968..527568f90164e 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.cc b/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.cc index a8cc61d3d5ccf..f999de49853c7 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/encryption_spec.proto #include "google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.h" +#include "google/cloud/dialogflow/v2/encryption_spec.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.h b/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.h index 596e426bdf21b..f5b0345403437 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/encryption_spec_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.cc index c73e8569b7df7..bda7a650db6ec 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/encryption_spec.proto #include "google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/encryption_spec.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.h b/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.h index 6cd0409429ccb..adffa3f25e98b 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/encryption_spec_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc b/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc index 491be95e26fa0..82af55e4e1b08 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/encryption_spec.proto #include "google/cloud/dialogflow_es/internal/encryption_spec_stub.h" +#include "google/cloud/dialogflow/v2/encryption_spec.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_stub.h b/google/cloud/dialogflow_es/internal/encryption_spec_stub.h index 260f3cf97bc00..8b323f2e6abd7 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_stub.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ENCRYPTION_SPEC_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ENCRYPTION_SPEC_STUB_H +#include "google/cloud/dialogflow/v2/encryption_spec.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc b/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc index e04be4a282aee..ec1b8d240fd14 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/encryption_spec.proto #include "google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.h" +#include "google/cloud/dialogflow/v2/encryption_spec.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/encryption_spec_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/encryption_spec_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/encryption_spec_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/encryption_spec_stub.h" #include "google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.cc b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.cc index df5bcd78fba87..6ae98c97a3d7a 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EncryptionSpecServiceTracingConnection::EncryptionSpecServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -128,17 +126,13 @@ Status EncryptionSpecServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEncryptionSpecServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.h b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.h index 35a34fcc9bf42..c0beb5e6b59d2 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EncryptionSpecServiceTracingConnection : public dialogflow_es::EncryptionSpecServiceConnection { public: @@ -79,8 +77,6 @@ class EncryptionSpecServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.cc b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.cc index cd53ed068fb78..2357991488424 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EncryptionSpecServiceTracingStub::EncryptionSpecServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -163,15 +161,9 @@ future EncryptionSpecServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEncryptionSpecServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.h b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.h index 71fd6f2e3e5f1..6ce17b8534aab 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EncryptionSpecServiceTracingStub : public EncryptionSpecServiceStub { public: ~EncryptionSpecServiceTracingStub() override = default; @@ -95,8 +93,6 @@ class EncryptionSpecServiceTracingStub : public EncryptionSpecServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.cc b/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.cc index e18b96df1208b..d5c15e318fbc7 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/entity_type.proto #include "google/cloud/dialogflow_es/internal/entity_types_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/entity_type.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.h b/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.h index 698a8a8a4428a..894e745a8903b 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/entity_types_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/entity_types_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_connection_impl.h b/google/cloud/dialogflow_es/internal/entity_types_connection_impl.h index 4a9280b2e717e..5c87379d5a259 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/entity_types_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.cc b/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.cc index 3ed5626d268c0..6ffb07bbdc826 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/entity_type.proto #include "google/cloud/dialogflow_es/internal/entity_types_logging_decorator.h" +#include "google/cloud/dialogflow/v2/entity_type.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.h b/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.h index a1710cabff46e..96c438939ee03 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/entity_types_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/entity_types_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.cc index a66c2633812b1..7c83d879e018d 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/entity_type.proto #include "google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/entity_type.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.h b/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.h index 05cc16bc3db4c..40ce4736ae291 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/entity_types_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_stub.cc b/google/cloud/dialogflow_es/internal/entity_types_stub.cc index 88d39297fbd93..5ee394d0c9401 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_stub.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/entity_type.proto #include "google/cloud/dialogflow_es/internal/entity_types_stub.h" +#include "google/cloud/dialogflow/v2/entity_type.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_stub.h b/google/cloud/dialogflow_es/internal/entity_types_stub.h index fea939fcab29b..812bb0ce96795 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_stub.h +++ b/google/cloud/dialogflow_es/internal/entity_types_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ENTITY_TYPES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ENTITY_TYPES_STUB_H +#include "google/cloud/dialogflow/v2/entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc b/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc index ebbe7dac4011f..7edd6c52bd3e8 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/entity_type.proto #include "google/cloud/dialogflow_es/internal/entity_types_stub_factory.h" +#include "google/cloud/dialogflow/v2/entity_type.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/entity_types_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/entity_types_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/entity_types_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/entity_types_stub.h" #include "google/cloud/dialogflow_es/internal/entity_types_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc b/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc index 9b25e9c24b759..80ae416f589da 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EntityTypesTracingConnection::EntityTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -287,16 +285,12 @@ Status EntityTypesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEntityTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.h b/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.h index c7a451a91bdca..3214539d82bb7 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EntityTypesTracingConnection : public dialogflow_es::EntityTypesConnection { public: @@ -142,8 +140,6 @@ class EntityTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc b/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc index 2bf773d17b70e..99fcd91cdb2f0 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EntityTypesTracingStub::EntityTypesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -317,15 +315,9 @@ future EntityTypesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEntityTypesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.h b/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.h index 7757f7f17f880..d6206fba61108 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EntityTypesTracingStub : public EntityTypesStub { public: ~EntityTypesTracingStub() override = default; @@ -161,8 +159,6 @@ class EntityTypesTracingStub : public EntityTypesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/environments_auth_decorator.cc b/google/cloud/dialogflow_es/internal/environments_auth_decorator.cc index 3894d472a633f..d1d5083ef2200 100644 --- a/google/cloud/dialogflow_es/internal/environments_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/environments_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/environment.proto #include "google/cloud/dialogflow_es/internal/environments_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/environment.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/environments_logging_decorator.cc b/google/cloud/dialogflow_es/internal/environments_logging_decorator.cc index 355d13a9e34bf..b3f3decc34f96 100644 --- a/google/cloud/dialogflow_es/internal/environments_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/environments_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/environment.proto #include "google/cloud/dialogflow_es/internal/environments_logging_decorator.h" +#include "google/cloud/dialogflow/v2/environment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/environments_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/environments_metadata_decorator.cc index 4ef5ba01da821..83dabb84c5293 100644 --- a/google/cloud/dialogflow_es/internal/environments_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/environments_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/environment.proto #include "google/cloud/dialogflow_es/internal/environments_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/environment.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/environments_stub.cc b/google/cloud/dialogflow_es/internal/environments_stub.cc index c01f4d3e37be0..8dbf8abd9e6d5 100644 --- a/google/cloud/dialogflow_es/internal/environments_stub.cc +++ b/google/cloud/dialogflow_es/internal/environments_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/environment.proto #include "google/cloud/dialogflow_es/internal/environments_stub.h" +#include "google/cloud/dialogflow/v2/environment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/environments_stub.h b/google/cloud/dialogflow_es/internal/environments_stub.h index 32bdc10b6c32f..7785114b9ac9f 100644 --- a/google/cloud/dialogflow_es/internal/environments_stub.h +++ b/google/cloud/dialogflow_es/internal/environments_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ENVIRONMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_ENVIRONMENTS_STUB_H +#include "google/cloud/dialogflow/v2/environment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/environments_stub_factory.cc b/google/cloud/dialogflow_es/internal/environments_stub_factory.cc index 5697432bbd7b9..abbf52e497b5a 100644 --- a/google/cloud/dialogflow_es/internal/environments_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/environments_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/environment.proto #include "google/cloud/dialogflow_es/internal/environments_stub_factory.h" +#include "google/cloud/dialogflow/v2/environment.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/environments_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/environments_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/environments_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/environments_stub.h" #include "google/cloud/dialogflow_es/internal/environments_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc b/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc index 6291b4e4d33fe..902eb255bc62b 100644 --- a/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EnvironmentsTracingConnection::EnvironmentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -140,16 +138,12 @@ Status EnvironmentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEnvironmentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/environments_tracing_connection.h b/google/cloud/dialogflow_es/internal/environments_tracing_connection.h index 16477692b18b8..4cbe821654ea3 100644 --- a/google/cloud/dialogflow_es/internal/environments_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/environments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EnvironmentsTracingConnection : public dialogflow_es::EnvironmentsConnection { public: @@ -83,8 +81,6 @@ class EnvironmentsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/environments_tracing_stub.cc b/google/cloud/dialogflow_es/internal/environments_tracing_stub.cc index 68f7fe39b4c2c..0eb7657c476e4 100644 --- a/google/cloud/dialogflow_es/internal/environments_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/environments_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EnvironmentsTracingStub::EnvironmentsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -162,15 +160,9 @@ Status EnvironmentsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEnvironmentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/environments_tracing_stub.h b/google/cloud/dialogflow_es/internal/environments_tracing_stub.h index 4a283c83d2c48..6c1f56b0441b4 100644 --- a/google/cloud/dialogflow_es/internal/environments_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/environments_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EnvironmentsTracingStub : public EnvironmentsStub { public: ~EnvironmentsTracingStub() override = default; @@ -95,8 +93,6 @@ class EnvironmentsTracingStub : public EnvironmentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/fulfillments_auth_decorator.cc b/google/cloud/dialogflow_es/internal/fulfillments_auth_decorator.cc index 973acdea5c2f9..e21410a863c13 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/fulfillment.proto #include "google/cloud/dialogflow_es/internal/fulfillments_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/fulfillment.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/fulfillments_logging_decorator.cc b/google/cloud/dialogflow_es/internal/fulfillments_logging_decorator.cc index 4b8568f60b4b2..80b3b354b9143 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/fulfillment.proto #include "google/cloud/dialogflow_es/internal/fulfillments_logging_decorator.h" +#include "google/cloud/dialogflow/v2/fulfillment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/fulfillments_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/fulfillments_metadata_decorator.cc index 22e4a27f1de05..54a6f4d1a8939 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/fulfillment.proto #include "google/cloud/dialogflow_es/internal/fulfillments_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/fulfillment.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/fulfillments_stub.cc b/google/cloud/dialogflow_es/internal/fulfillments_stub.cc index 4f9ec79825ee9..d509b680f4295 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_stub.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/fulfillment.proto #include "google/cloud/dialogflow_es/internal/fulfillments_stub.h" +#include "google/cloud/dialogflow/v2/fulfillment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/fulfillments_stub.h b/google/cloud/dialogflow_es/internal/fulfillments_stub.h index 98a3fd3619b0f..38c3dd74e8f38 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_stub.h +++ b/google/cloud/dialogflow_es/internal/fulfillments_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_FULFILLMENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_FULFILLMENTS_STUB_H +#include "google/cloud/dialogflow/v2/fulfillment.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/fulfillments_stub_factory.cc b/google/cloud/dialogflow_es/internal/fulfillments_stub_factory.cc index 28937e87773c8..bfa5c4da5020c 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/fulfillment.proto #include "google/cloud/dialogflow_es/internal/fulfillments_stub_factory.h" +#include "google/cloud/dialogflow/v2/fulfillment.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/fulfillments_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/fulfillments_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/fulfillments_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/fulfillments_stub.h" #include "google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.cc b/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.cc index 3641d3ab3c3cd..43e2ae1bd0142 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FulfillmentsTracingConnection::FulfillmentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -99,16 +97,12 @@ Status FulfillmentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFulfillmentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.h b/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.h index 5869d851822db..bde9f70678662 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/fulfillments_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FulfillmentsTracingConnection : public dialogflow_es::FulfillmentsConnection { public: @@ -67,8 +65,6 @@ class FulfillmentsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.cc b/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.cc index c2e87d582c952..b88be5b1e9221 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FulfillmentsTracingStub::FulfillmentsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -114,15 +112,9 @@ Status FulfillmentsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFulfillmentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.h b/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.h index ba698cd5887f4..422c15213989f 100644 --- a/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/fulfillments_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FulfillmentsTracingStub : public FulfillmentsStub { public: ~FulfillmentsTracingStub() override = default; @@ -74,8 +72,6 @@ class FulfillmentsTracingStub : public FulfillmentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/generators_auth_decorator.cc b/google/cloud/dialogflow_es/internal/generators_auth_decorator.cc index edf2a0a966732..9c281ae3fe105 100644 --- a/google/cloud/dialogflow_es/internal/generators_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/generators_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/generator.proto #include "google/cloud/dialogflow_es/internal/generators_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/generator.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/generators_logging_decorator.cc b/google/cloud/dialogflow_es/internal/generators_logging_decorator.cc index 10427994b6c97..e048effa29d7d 100644 --- a/google/cloud/dialogflow_es/internal/generators_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/generators_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/generator.proto #include "google/cloud/dialogflow_es/internal/generators_logging_decorator.h" +#include "google/cloud/dialogflow/v2/generator.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/generators_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/generators_metadata_decorator.cc index 2effbf1cc48bb..4f06e01576c04 100644 --- a/google/cloud/dialogflow_es/internal/generators_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/generators_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/generator.proto #include "google/cloud/dialogflow_es/internal/generators_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/generator.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/generators_stub.cc b/google/cloud/dialogflow_es/internal/generators_stub.cc index 33a55cbc7baa1..3760eaaa84899 100644 --- a/google/cloud/dialogflow_es/internal/generators_stub.cc +++ b/google/cloud/dialogflow_es/internal/generators_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/generator.proto #include "google/cloud/dialogflow_es/internal/generators_stub.h" +#include "google/cloud/dialogflow/v2/generator.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/generators_stub.h b/google/cloud/dialogflow_es/internal/generators_stub.h index 0516f218b58cb..808e41fe2a184 100644 --- a/google/cloud/dialogflow_es/internal/generators_stub.h +++ b/google/cloud/dialogflow_es/internal/generators_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_GENERATORS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_GENERATORS_STUB_H +#include "google/cloud/dialogflow/v2/generator.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/generators_stub_factory.cc b/google/cloud/dialogflow_es/internal/generators_stub_factory.cc index 6331fa105a118..3bfb40f895792 100644 --- a/google/cloud/dialogflow_es/internal/generators_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/generators_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/generator.proto #include "google/cloud/dialogflow_es/internal/generators_stub_factory.h" +#include "google/cloud/dialogflow/v2/generator.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/generators_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/generators_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/generators_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/generators_stub.h" #include "google/cloud/dialogflow_es/internal/generators_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/generators_tracing_connection.cc b/google/cloud/dialogflow_es/internal/generators_tracing_connection.cc index cd0fb508222f9..6592612070cc6 100644 --- a/google/cloud/dialogflow_es/internal/generators_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/generators_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GeneratorsTracingConnection::GeneratorsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -127,16 +125,12 @@ Status GeneratorsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGeneratorsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/generators_tracing_connection.h b/google/cloud/dialogflow_es/internal/generators_tracing_connection.h index 8a35e70b932ec..3dff2f30ae0b1 100644 --- a/google/cloud/dialogflow_es/internal/generators_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/generators_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GeneratorsTracingConnection : public dialogflow_es::GeneratorsConnection { public: ~GeneratorsTracingConnection() override = default; @@ -77,8 +75,6 @@ class GeneratorsTracingConnection : public dialogflow_es::GeneratorsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/generators_tracing_stub.cc b/google/cloud/dialogflow_es/internal/generators_tracing_stub.cc index 400f5ebe0f4cc..f9999b6d82658 100644 --- a/google/cloud/dialogflow_es/internal/generators_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/generators_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GeneratorsTracingStub::GeneratorsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -148,15 +146,9 @@ Status GeneratorsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGeneratorsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/generators_tracing_stub.h b/google/cloud/dialogflow_es/internal/generators_tracing_stub.h index 053912a1c3aad..686d2c3ccfb08 100644 --- a/google/cloud/dialogflow_es/internal/generators_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/generators_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GeneratorsTracingStub : public GeneratorsStub { public: ~GeneratorsTracingStub() override = default; @@ -89,8 +87,6 @@ class GeneratorsTracingStub : public GeneratorsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/intents_auth_decorator.cc b/google/cloud/dialogflow_es/internal/intents_auth_decorator.cc index 0af9d2c103958..8d3df3e8e410b 100644 --- a/google/cloud/dialogflow_es/internal/intents_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/intents_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/intent.proto #include "google/cloud/dialogflow_es/internal/intents_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/intent.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_auth_decorator.h b/google/cloud/dialogflow_es/internal/intents_auth_decorator.h index d2442a656e49f..e7b575df25b45 100644 --- a/google/cloud/dialogflow_es/internal/intents_auth_decorator.h +++ b/google/cloud/dialogflow_es/internal/intents_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/intents_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_connection_impl.h b/google/cloud/dialogflow_es/internal/intents_connection_impl.h index c1e9033b3d0c2..a70b7454ae157 100644 --- a/google/cloud/dialogflow_es/internal/intents_connection_impl.h +++ b/google/cloud/dialogflow_es/internal/intents_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/internal/intents_logging_decorator.cc b/google/cloud/dialogflow_es/internal/intents_logging_decorator.cc index cfa978149ba31..32a4d51c167cc 100644 --- a/google/cloud/dialogflow_es/internal/intents_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/intents_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/intent.proto #include "google/cloud/dialogflow_es/internal/intents_logging_decorator.h" +#include "google/cloud/dialogflow/v2/intent.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_logging_decorator.h b/google/cloud/dialogflow_es/internal/intents_logging_decorator.h index b84600c33876d..fe085e4a18a0e 100644 --- a/google/cloud/dialogflow_es/internal/intents_logging_decorator.h +++ b/google/cloud/dialogflow_es/internal/intents_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/intents_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/intents_metadata_decorator.cc index a632500b1ef25..d954c56425e2d 100644 --- a/google/cloud/dialogflow_es/internal/intents_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/intents_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/intent.proto #include "google/cloud/dialogflow_es/internal/intents_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/intent.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_metadata_decorator.h b/google/cloud/dialogflow_es/internal/intents_metadata_decorator.h index a0b83da70e180..2cc4b6b81687d 100644 --- a/google/cloud/dialogflow_es/internal/intents_metadata_decorator.h +++ b/google/cloud/dialogflow_es/internal/intents_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/dialogflow_es/internal/intents_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_stub.cc b/google/cloud/dialogflow_es/internal/intents_stub.cc index eecf78a0e437d..7b9bac9be80a7 100644 --- a/google/cloud/dialogflow_es/internal/intents_stub.cc +++ b/google/cloud/dialogflow_es/internal/intents_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/intent.proto #include "google/cloud/dialogflow_es/internal/intents_stub.h" +#include "google/cloud/dialogflow/v2/intent.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_stub.h b/google/cloud/dialogflow_es/internal/intents_stub.h index 60f357412e85e..907419c56ccf9 100644 --- a/google/cloud/dialogflow_es/internal/intents_stub.h +++ b/google/cloud/dialogflow_es/internal/intents_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_INTENTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_INTENTS_STUB_H +#include "google/cloud/dialogflow/v2/intent.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/protobuf/struct.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_stub_factory.cc b/google/cloud/dialogflow_es/internal/intents_stub_factory.cc index 83fea3c9d75b7..dc16af3eeb048 100644 --- a/google/cloud/dialogflow_es/internal/intents_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/intents_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/intent.proto #include "google/cloud/dialogflow_es/internal/intents_stub_factory.h" +#include "google/cloud/dialogflow/v2/intent.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/intents_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/intents_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/intents_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/intents_stub.h" #include "google/cloud/dialogflow_es/internal/intents_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc b/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc index 64549db776ed6..f236591267e51 100644 --- a/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IntentsTracingConnection::IntentsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -187,15 +185,11 @@ Status IntentsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIntentsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/intents_tracing_connection.h b/google/cloud/dialogflow_es/internal/intents_tracing_connection.h index 105ad30b9531f..7203b4f368dfd 100644 --- a/google/cloud/dialogflow_es/internal/intents_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/intents_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IntentsTracingConnection : public dialogflow_es::IntentsConnection { public: ~IntentsTracingConnection() override = default; @@ -100,8 +98,6 @@ class IntentsTracingConnection : public dialogflow_es::IntentsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc b/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc index 4fb9e6900e691..e28eb7d57b4a0 100644 --- a/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IntentsTracingStub::IntentsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -226,15 +224,9 @@ future IntentsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIntentsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/intents_tracing_stub.h b/google/cloud/dialogflow_es/internal/intents_tracing_stub.h index 9bcca67edc1d8..f9982e5c02428 100644 --- a/google/cloud/dialogflow_es/internal/intents_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/intents_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IntentsTracingStub : public IntentsStub { public: ~IntentsTracingStub() override = default; @@ -123,8 +121,6 @@ class IntentsTracingStub : public IntentsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_auth_decorator.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_auth_decorator.cc index 0ed5f8fd9bd15..d3650665a21ab 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/knowledge_base.proto #include "google/cloud/dialogflow_es/internal/knowledge_bases_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/knowledge_base.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_logging_decorator.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_logging_decorator.cc index 5132d91036f2d..b186b8a6076f8 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/knowledge_base.proto #include "google/cloud/dialogflow_es/internal/knowledge_bases_logging_decorator.h" +#include "google/cloud/dialogflow/v2/knowledge_base.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_metadata_decorator.cc index eba56e2ac0f9e..35eac10dd1595 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/knowledge_base.proto #include "google/cloud/dialogflow_es/internal/knowledge_bases_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/knowledge_base.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_stub.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_stub.cc index 214805c605279..77b6ffdc72f65 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_stub.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/knowledge_base.proto #include "google/cloud/dialogflow_es/internal/knowledge_bases_stub.h" +#include "google/cloud/dialogflow/v2/knowledge_base.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_stub.h b/google/cloud/dialogflow_es/internal/knowledge_bases_stub.h index 4581fd452a0f2..035006a91578e 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_stub.h +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_KNOWLEDGE_BASES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_KNOWLEDGE_BASES_STUB_H +#include "google/cloud/dialogflow/v2/knowledge_base.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_stub_factory.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_stub_factory.cc index f3343f081f766..99173a80b403d 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/knowledge_base.proto #include "google/cloud/dialogflow_es/internal/knowledge_bases_stub_factory.h" +#include "google/cloud/dialogflow/v2/knowledge_base.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/knowledge_bases_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/knowledge_bases_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/knowledge_bases_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/knowledge_bases_stub.h" #include "google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc index e54a3e978e39a..5498b616dfa9a 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KnowledgeBasesTracingConnection::KnowledgeBasesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -128,16 +126,12 @@ Status KnowledgeBasesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKnowledgeBasesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.h b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.h index 31fdc8108611b..594283daed039 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KnowledgeBasesTracingConnection : public dialogflow_es::KnowledgeBasesConnection { public: @@ -79,8 +77,6 @@ class KnowledgeBasesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.cc index bb2ff686c9f1c..acf3b9397d350 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KnowledgeBasesTracingStub::KnowledgeBasesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -150,15 +148,9 @@ Status KnowledgeBasesTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKnowledgeBasesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.h b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.h index be8598e83ca3a..3ba875254c347 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KnowledgeBasesTracingStub : public KnowledgeBasesStub { public: ~KnowledgeBasesTracingStub() override = default; @@ -90,8 +88,6 @@ class KnowledgeBasesTracingStub : public KnowledgeBasesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/participants_auth_decorator.cc b/google/cloud/dialogflow_es/internal/participants_auth_decorator.cc index ae14125c9717f..8b25bc9570258 100644 --- a/google/cloud/dialogflow_es/internal/participants_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/participants_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/dialogflow/v2/participant.proto #include "google/cloud/dialogflow_es/internal/participants_auth_decorator.h" +#include "google/cloud/dialogflow/v2/participant.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/participants_logging_decorator.cc b/google/cloud/dialogflow_es/internal/participants_logging_decorator.cc index e9a4ff83fb719..42175e50bb4f7 100644 --- a/google/cloud/dialogflow_es/internal/participants_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/participants_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/participant.proto #include "google/cloud/dialogflow_es/internal/participants_logging_decorator.h" +#include "google/cloud/dialogflow/v2/participant.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/participants_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/participants_metadata_decorator.cc index 3c85881422804..9b9a943cd67cc 100644 --- a/google/cloud/dialogflow_es/internal/participants_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/participants_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/participant.proto #include "google/cloud/dialogflow_es/internal/participants_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/participant.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/participants_stub.cc b/google/cloud/dialogflow_es/internal/participants_stub.cc index 3ee8c6fda21a1..944c1dc6c85f2 100644 --- a/google/cloud/dialogflow_es/internal/participants_stub.cc +++ b/google/cloud/dialogflow_es/internal/participants_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/participant.proto #include "google/cloud/dialogflow_es/internal/participants_stub.h" +#include "google/cloud/dialogflow/v2/participant.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/participants_stub.h b/google/cloud/dialogflow_es/internal/participants_stub.h index a3efb4ea23804..8c9c253875ceb 100644 --- a/google/cloud/dialogflow_es/internal/participants_stub.h +++ b/google/cloud/dialogflow_es/internal/participants_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_PARTICIPANTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_PARTICIPANTS_STUB_H +#include "google/cloud/dialogflow/v2/participant.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/participants_stub_factory.cc b/google/cloud/dialogflow_es/internal/participants_stub_factory.cc index 8e11801eee331..ded0707dc26c5 100644 --- a/google/cloud/dialogflow_es/internal/participants_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/participants_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/participant.proto #include "google/cloud/dialogflow_es/internal/participants_stub_factory.h" +#include "google/cloud/dialogflow/v2/participant.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/participants_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/participants_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/participants_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/participants_stub.h" #include "google/cloud/dialogflow_es/internal/participants_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc b/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc index 728220911761d..df70bafe9c2b7 100644 --- a/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ParticipantsTracingConnection::ParticipantsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -173,16 +171,12 @@ Status ParticipantsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeParticipantsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/participants_tracing_connection.h b/google/cloud/dialogflow_es/internal/participants_tracing_connection.h index 236ee7f7bb93f..a914ea6aaa76b 100644 --- a/google/cloud/dialogflow_es/internal/participants_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/participants_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ParticipantsTracingConnection : public dialogflow_es::ParticipantsConnection { public: @@ -102,8 +100,6 @@ class ParticipantsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc b/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc index 1f6ff0d466454..90c845471a7ff 100644 --- a/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ParticipantsTracingStub::ParticipantsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -219,15 +217,9 @@ Status ParticipantsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeParticipantsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/participants_tracing_stub.h b/google/cloud/dialogflow_es/internal/participants_tracing_stub.h index 234cc47f9b3d1..97aeb93942071 100644 --- a/google/cloud/dialogflow_es/internal/participants_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/participants_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ParticipantsTracingStub : public ParticipantsStub { public: ~ParticipantsTracingStub() override = default; @@ -120,8 +118,6 @@ class ParticipantsTracingStub : public ParticipantsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_auth_decorator.cc b/google/cloud/dialogflow_es/internal/session_entity_types_auth_decorator.cc index 4f88141007125..50c22beb90e15 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/session_entity_type.proto #include "google/cloud/dialogflow_es/internal/session_entity_types_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/session_entity_type.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_logging_decorator.cc b/google/cloud/dialogflow_es/internal/session_entity_types_logging_decorator.cc index 505061365240b..21b60a4c54d65 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/session_entity_type.proto #include "google/cloud/dialogflow_es/internal/session_entity_types_logging_decorator.h" +#include "google/cloud/dialogflow/v2/session_entity_type.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/session_entity_types_metadata_decorator.cc index f01fa8c8d131c..cfe1b100a6be3 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/session_entity_type.proto #include "google/cloud/dialogflow_es/internal/session_entity_types_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/session_entity_type.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_stub.cc b/google/cloud/dialogflow_es/internal/session_entity_types_stub.cc index cbab06dba02e0..4180b307626e6 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_stub.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/session_entity_type.proto #include "google/cloud/dialogflow_es/internal/session_entity_types_stub.h" +#include "google/cloud/dialogflow/v2/session_entity_type.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_stub.h b/google/cloud/dialogflow_es/internal/session_entity_types_stub.h index 7c73d34c1186d..cb328414dc578 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_stub.h +++ b/google/cloud/dialogflow_es/internal/session_entity_types_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_SESSION_ENTITY_TYPES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_SESSION_ENTITY_TYPES_STUB_H +#include "google/cloud/dialogflow/v2/session_entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_stub_factory.cc b/google/cloud/dialogflow_es/internal/session_entity_types_stub_factory.cc index 937b169e71910..322d9e4011083 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/session_entity_type.proto #include "google/cloud/dialogflow_es/internal/session_entity_types_stub_factory.h" +#include "google/cloud/dialogflow/v2/session_entity_type.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/session_entity_types_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/session_entity_types_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/session_entity_types_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/session_entity_types_stub.h" #include "google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.cc b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.cc index c67408487b7c6..64bc3aa3a12ca 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionEntityTypesTracingConnection::SessionEntityTypesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -131,17 +129,13 @@ Status SessionEntityTypesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionEntityTypesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.h b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.h index f48041dba7723..08ed6091cd0b5 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionEntityTypesTracingConnection : public dialogflow_es::SessionEntityTypesConnection { public: @@ -83,8 +81,6 @@ class SessionEntityTypesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.cc b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.cc index 1628fc9d17afc..9c92b7bcc733e 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionEntityTypesTracingStub::SessionEntityTypesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -162,15 +160,9 @@ Status SessionEntityTypesTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionEntityTypesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.h b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.h index 5399cd0010daf..688d69ce26a5f 100644 --- a/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/session_entity_types_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionEntityTypesTracingStub : public SessionEntityTypesStub { public: ~SessionEntityTypesTracingStub() override = default; @@ -94,8 +92,6 @@ class SessionEntityTypesTracingStub : public SessionEntityTypesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/sessions_auth_decorator.cc b/google/cloud/dialogflow_es/internal/sessions_auth_decorator.cc index fde13dcac5733..c5b3e63455bc5 100644 --- a/google/cloud/dialogflow_es/internal/sessions_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/sessions_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/dialogflow/v2/session.proto #include "google/cloud/dialogflow_es/internal/sessions_auth_decorator.h" +#include "google/cloud/dialogflow/v2/session.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/sessions_logging_decorator.cc b/google/cloud/dialogflow_es/internal/sessions_logging_decorator.cc index 7ff27c2052d9e..fceb70bac2a35 100644 --- a/google/cloud/dialogflow_es/internal/sessions_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/sessions_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/session.proto #include "google/cloud/dialogflow_es/internal/sessions_logging_decorator.h" +#include "google/cloud/dialogflow/v2/session.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/sessions_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/sessions_metadata_decorator.cc index 2a652b601a431..738eb317d1c9f 100644 --- a/google/cloud/dialogflow_es/internal/sessions_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/sessions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/session.proto #include "google/cloud/dialogflow_es/internal/sessions_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/session.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/sessions_stub.cc b/google/cloud/dialogflow_es/internal/sessions_stub.cc index 98506692d7848..3759113888e36 100644 --- a/google/cloud/dialogflow_es/internal/sessions_stub.cc +++ b/google/cloud/dialogflow_es/internal/sessions_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/dialogflow/v2/session.proto #include "google/cloud/dialogflow_es/internal/sessions_stub.h" +#include "google/cloud/dialogflow/v2/session.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/sessions_stub.h b/google/cloud/dialogflow_es/internal/sessions_stub.h index a31887e2ac812..80aac5a9ac62e 100644 --- a/google/cloud/dialogflow_es/internal/sessions_stub.h +++ b/google/cloud/dialogflow_es/internal/sessions_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_SESSIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_SESSIONS_STUB_H +#include "google/cloud/dialogflow/v2/session.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/sessions_stub_factory.cc b/google/cloud/dialogflow_es/internal/sessions_stub_factory.cc index 9f9f41adf1073..1f5640e49ad53 100644 --- a/google/cloud/dialogflow_es/internal/sessions_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/sessions_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/session.proto #include "google/cloud/dialogflow_es/internal/sessions_stub_factory.h" +#include "google/cloud/dialogflow/v2/session.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/sessions_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/sessions_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/sessions_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/sessions_stub.h" #include "google/cloud/dialogflow_es/internal/sessions_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/sessions_tracing_connection.cc b/google/cloud/dialogflow_es/internal/sessions_tracing_connection.cc index cdd034ce46a73..8d8e3d0b3a958 100644 --- a/google/cloud/dialogflow_es/internal/sessions_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/sessions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionsTracingConnection::SessionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -97,16 +95,12 @@ Status SessionsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/sessions_tracing_connection.h b/google/cloud/dialogflow_es/internal/sessions_tracing_connection.h index 9e709e59ecd9d..98015b5009a20 100644 --- a/google/cloud/dialogflow_es/internal/sessions_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/sessions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionsTracingConnection : public dialogflow_es::SessionsConnection { public: ~SessionsTracingConnection() override = default; @@ -67,8 +65,6 @@ class SessionsTracingConnection : public dialogflow_es::SessionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc b/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc index 2382ab17231f4..45fcaea7292df 100644 --- a/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SessionsTracingStub::SessionsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -119,15 +117,9 @@ Status SessionsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSessionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/sessions_tracing_stub.h b/google/cloud/dialogflow_es/internal/sessions_tracing_stub.h index 2373cbdaa9477..06ceecf510b37 100644 --- a/google/cloud/dialogflow_es/internal/sessions_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/sessions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SessionsTracingStub : public SessionsStub { public: ~SessionsTracingStub() override = default; @@ -77,8 +75,6 @@ class SessionsTracingStub : public SessionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/internal/versions_auth_decorator.cc b/google/cloud/dialogflow_es/internal/versions_auth_decorator.cc index 886bd1c6f07a3..3543468244f18 100644 --- a/google/cloud/dialogflow_es/internal/versions_auth_decorator.cc +++ b/google/cloud/dialogflow_es/internal/versions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/dialogflow/v2/version.proto #include "google/cloud/dialogflow_es/internal/versions_auth_decorator.h" -#include +#include "google/cloud/dialogflow/v2/version.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/versions_logging_decorator.cc b/google/cloud/dialogflow_es/internal/versions_logging_decorator.cc index 223869f10aaef..6648880817ffe 100644 --- a/google/cloud/dialogflow_es/internal/versions_logging_decorator.cc +++ b/google/cloud/dialogflow_es/internal/versions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/version.proto #include "google/cloud/dialogflow_es/internal/versions_logging_decorator.h" +#include "google/cloud/dialogflow/v2/version.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/dialogflow_es/internal/versions_metadata_decorator.cc b/google/cloud/dialogflow_es/internal/versions_metadata_decorator.cc index caefaf1313e08..305a42a617b90 100644 --- a/google/cloud/dialogflow_es/internal/versions_metadata_decorator.cc +++ b/google/cloud/dialogflow_es/internal/versions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/dialogflow/v2/version.proto #include "google/cloud/dialogflow_es/internal/versions_metadata_decorator.h" +#include "google/cloud/dialogflow/v2/version.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 #include #include #include diff --git a/google/cloud/dialogflow_es/internal/versions_stub.cc b/google/cloud/dialogflow_es/internal/versions_stub.cc index 737849e7469e0..7e9940f2cfbd7 100644 --- a/google/cloud/dialogflow_es/internal/versions_stub.cc +++ b/google/cloud/dialogflow_es/internal/versions_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/dialogflow/v2/version.proto #include "google/cloud/dialogflow_es/internal/versions_stub.h" +#include "google/cloud/dialogflow/v2/version.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/internal/versions_stub.h b/google/cloud/dialogflow_es/internal/versions_stub.h index f292d03d777f4..92f90a99ef5fb 100644 --- a/google/cloud/dialogflow_es/internal/versions_stub.h +++ b/google/cloud/dialogflow_es/internal/versions_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_VERSIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_INTERNAL_VERSIONS_STUB_H +#include "google/cloud/dialogflow/v2/version.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/versions_stub_factory.cc b/google/cloud/dialogflow_es/internal/versions_stub_factory.cc index 5a35f880b7f75..e502fa4620458 100644 --- a/google/cloud/dialogflow_es/internal/versions_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/versions_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/dialogflow/v2/version.proto #include "google/cloud/dialogflow_es/internal/versions_stub_factory.h" +#include "google/cloud/dialogflow/v2/version.grpc.pb.h" #include "google/cloud/dialogflow_es/internal/versions_auth_decorator.h" #include "google/cloud/dialogflow_es/internal/versions_logging_decorator.h" #include "google/cloud/dialogflow_es/internal/versions_metadata_decorator.h" #include "google/cloud/dialogflow_es/internal/versions_stub.h" #include "google/cloud/dialogflow_es/internal/versions_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/dialogflow_es/internal/versions_tracing_connection.cc b/google/cloud/dialogflow_es/internal/versions_tracing_connection.cc index 74f76fc5aece3..b98337246c6e8 100644 --- a/google/cloud/dialogflow_es/internal/versions_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/versions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VersionsTracingConnection::VersionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -127,16 +125,12 @@ Status VersionsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVersionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dialogflow_es/internal/versions_tracing_connection.h b/google/cloud/dialogflow_es/internal/versions_tracing_connection.h index 9add177d8d782..8ac39b326309f 100644 --- a/google/cloud/dialogflow_es/internal/versions_tracing_connection.h +++ b/google/cloud/dialogflow_es/internal/versions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VersionsTracingConnection : public dialogflow_es::VersionsConnection { public: ~VersionsTracingConnection() override = default; @@ -76,8 +74,6 @@ class VersionsTracingConnection : public dialogflow_es::VersionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dialogflow_es/internal/versions_tracing_stub.cc b/google/cloud/dialogflow_es/internal/versions_tracing_stub.cc index 354012cf4225e..c1abf8c731f3d 100644 --- a/google/cloud/dialogflow_es/internal/versions_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/versions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VersionsTracingStub::VersionsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -147,15 +145,9 @@ Status VersionsTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVersionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/versions_tracing_stub.h b/google/cloud/dialogflow_es/internal/versions_tracing_stub.h index 329f3539086d6..709912c9db932 100644 --- a/google/cloud/dialogflow_es/internal/versions_tracing_stub.h +++ b/google/cloud/dialogflow_es/internal/versions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dialogflow_es_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VersionsTracingStub : public VersionsStub { public: ~VersionsTracingStub() override = default; @@ -88,8 +86,6 @@ class VersionsTracingStub : public VersionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/dialogflow_es/knowledge_bases_connection.h b/google/cloud/dialogflow_es/knowledge_bases_connection.h index d99bd477ef388..8cf65f238e221 100644 --- a/google/cloud/dialogflow_es/knowledge_bases_connection.h +++ b/google/cloud/dialogflow_es/knowledge_bases_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_KNOWLEDGE_BASES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_KNOWLEDGE_BASES_CONNECTION_H +#include "google/cloud/dialogflow/v2/knowledge_base.pb.h" #include "google/cloud/dialogflow_es/internal/knowledge_bases_retry_traits.h" #include "google/cloud/dialogflow_es/knowledge_bases_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/knowledge_bases_connection_idempotency_policy.h b/google/cloud/dialogflow_es/knowledge_bases_connection_idempotency_policy.h index 19ee297dad4c4..e079e30e388c6 100644 --- a/google/cloud/dialogflow_es/knowledge_bases_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/knowledge_bases_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_KNOWLEDGE_BASES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_KNOWLEDGE_BASES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/knowledge_base.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/participants_connection.h b/google/cloud/dialogflow_es/participants_connection.h index 6172d262c32bd..fde1a2b471bcf 100644 --- a/google/cloud/dialogflow_es/participants_connection.h +++ b/google/cloud/dialogflow_es/participants_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_PARTICIPANTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_PARTICIPANTS_CONNECTION_H +#include "google/cloud/dialogflow/v2/participant.pb.h" #include "google/cloud/dialogflow_es/internal/participants_retry_traits.h" #include "google/cloud/dialogflow_es/participants_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/participants_connection_idempotency_policy.h b/google/cloud/dialogflow_es/participants_connection_idempotency_policy.h index 951ebd091422a..3df8057038019 100644 --- a/google/cloud/dialogflow_es/participants_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/participants_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_PARTICIPANTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_PARTICIPANTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/participant.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/quickstart/.bazelrc b/google/cloud/dialogflow_es/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/dialogflow_es/quickstart/.bazelrc +++ b/google/cloud/dialogflow_es/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/dialogflow_es/session_entity_types_connection.h b/google/cloud/dialogflow_es/session_entity_types_connection.h index 671a4c84c1042..acdc0d0a7ab1b 100644 --- a/google/cloud/dialogflow_es/session_entity_types_connection.h +++ b/google/cloud/dialogflow_es/session_entity_types_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSION_ENTITY_TYPES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSION_ENTITY_TYPES_CONNECTION_H +#include "google/cloud/dialogflow/v2/session_entity_type.pb.h" #include "google/cloud/dialogflow_es/internal/session_entity_types_retry_traits.h" #include "google/cloud/dialogflow_es/session_entity_types_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/session_entity_types_connection_idempotency_policy.h b/google/cloud/dialogflow_es/session_entity_types_connection_idempotency_policy.h index 40f4b88783f8a..7a3aaed78f3e1 100644 --- a/google/cloud/dialogflow_es/session_entity_types_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/session_entity_types_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSION_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSION_ENTITY_TYPES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/session_entity_type.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/sessions_connection.h b/google/cloud/dialogflow_es/sessions_connection.h index 87045e2e46e7b..1bc3e1f32ae4b 100644 --- a/google/cloud/dialogflow_es/sessions_connection.h +++ b/google/cloud/dialogflow_es/sessions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSIONS_CONNECTION_H +#include "google/cloud/dialogflow/v2/session.pb.h" #include "google/cloud/dialogflow_es/internal/sessions_retry_traits.h" #include "google/cloud/dialogflow_es/sessions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/sessions_connection_idempotency_policy.h b/google/cloud/dialogflow_es/sessions_connection_idempotency_policy.h index 55f650c2d6ca7..31e945c2a749a 100644 --- a/google/cloud/dialogflow_es/sessions_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/sessions_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_SESSIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/session.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dialogflow_es/versions_connection.h b/google/cloud/dialogflow_es/versions_connection.h index 18a57548c0c5d..1f6670fcd7b55 100644 --- a/google/cloud/dialogflow_es/versions_connection.h +++ b/google/cloud/dialogflow_es/versions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_VERSIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_VERSIONS_CONNECTION_H +#include "google/cloud/dialogflow/v2/version.pb.h" #include "google/cloud/dialogflow_es/internal/versions_retry_traits.h" #include "google/cloud/dialogflow_es/versions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/dialogflow_es/versions_connection_idempotency_policy.h b/google/cloud/dialogflow_es/versions_connection_idempotency_policy.h index 3288acda73a9e..6962038f43aef 100644 --- a/google/cloud/dialogflow_es/versions_connection_idempotency_policy.h +++ b/google/cloud/dialogflow_es/versions_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DIALOGFLOW_ES_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/dialogflow/v2/version.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/BUILD.bazel b/google/cloud/discoveryengine/BUILD.bazel index 3670e12cae5ab..4e00cdb5fb071 100644 --- a/google/cloud/discoveryengine/BUILD.bazel +++ b/google/cloud/discoveryengine/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/discoveryengine/v1:discoveryengine_cc_grpc", + "@googleapis//google/cloud/discoveryengine/v1:discoveryengine_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/discoveryengine/quickstart/.bazelrc b/google/cloud/discoveryengine/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/discoveryengine/quickstart/.bazelrc +++ b/google/cloud/discoveryengine/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/discoveryengine/v1/completion_client.h b/google/cloud/discoveryengine/v1/completion_client.h index 0d82e290d0592..14d32507e21aa 100644 --- a/google/cloud/discoveryengine/v1/completion_client.h +++ b/google/cloud/discoveryengine/v1/completion_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/completion_connection.h b/google/cloud/discoveryengine/v1/completion_connection.h index 999c873e60f35..c987880ffb52a 100644 --- a/google/cloud/discoveryengine/v1/completion_connection.h +++ b/google/cloud/discoveryengine/v1/completion_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_COMPLETION_CONNECTION_H #include "google/cloud/discoveryengine/v1/completion_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/completion_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/completion_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/completion_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/completion_connection_idempotency_policy.h index 3f34fec1ed967..aea26257eadcf 100644 --- a/google/cloud/discoveryengine/v1/completion_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/completion_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/completion_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/control_connection.h b/google/cloud/discoveryengine/v1/control_connection.h index 059a4e1b2dcdd..309d9eecdbd43 100644 --- a/google/cloud/discoveryengine/v1/control_connection.h +++ b/google/cloud/discoveryengine/v1/control_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_CONTROL_CONNECTION_H #include "google/cloud/discoveryengine/v1/control_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/control_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/control_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/discoveryengine/v1/control_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/control_connection_idempotency_policy.h index 2b7ca3d82f4e3..4a97bea1ecc75 100644 --- a/google/cloud/discoveryengine/v1/control_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/control_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/control_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/conversational_search_connection.h b/google/cloud/discoveryengine/v1/conversational_search_connection.h index 40550f69dbc58..0e7dc0f3938a9 100644 --- a/google/cloud/discoveryengine/v1/conversational_search_connection.h +++ b/google/cloud/discoveryengine/v1/conversational_search_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_CONVERSATIONAL_SEARCH_CONNECTION_H #include "google/cloud/discoveryengine/v1/conversational_search_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/conversational_search_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/conversational_search_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/discoveryengine/v1/conversational_search_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/conversational_search_connection_idempotency_policy.h index 59d29955967a3..813a34a74bbaa 100644 --- a/google/cloud/discoveryengine/v1/conversational_search_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/conversational_search_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_CONVERSATIONAL_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_CONVERSATIONAL_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/conversational_search_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/data_store_client.h b/google/cloud/discoveryengine/v1/data_store_client.h index bdc1454257ded..2246f1da5ed89 100644 --- a/google/cloud/discoveryengine/v1/data_store_client.h +++ b/google/cloud/discoveryengine/v1/data_store_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/data_store_connection.h b/google/cloud/discoveryengine/v1/data_store_connection.h index 1d7c007f4c0d2..37e2edcbf0563 100644 --- a/google/cloud/discoveryengine/v1/data_store_connection.h +++ b/google/cloud/discoveryengine/v1/data_store_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_DATA_STORE_CONNECTION_H #include "google/cloud/discoveryengine/v1/data_store_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/data_store_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/data_store_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/data_store_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/data_store_connection_idempotency_policy.h index f51cc65dd0063..4eecdaff2daea 100644 --- a/google/cloud/discoveryengine/v1/data_store_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/data_store_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_DATA_STORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_DATA_STORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/data_store_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/document_client.h b/google/cloud/discoveryengine/v1/document_client.h index 33b23cc39014e..04f437afa6e13 100644 --- a/google/cloud/discoveryengine/v1/document_client.h +++ b/google/cloud/discoveryengine/v1/document_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/document_connection.h b/google/cloud/discoveryengine/v1/document_connection.h index aef2c44d58c39..6260954c3c4ca 100644 --- a/google/cloud/discoveryengine/v1/document_connection.h +++ b/google/cloud/discoveryengine/v1/document_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_DOCUMENT_CONNECTION_H #include "google/cloud/discoveryengine/v1/document_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/document_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/document_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/document_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/document_connection_idempotency_policy.h index 3bb76b6005f31..e8a6c883d20be 100644 --- a/google/cloud/discoveryengine/v1/document_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/document_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_DOCUMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_DOCUMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/document_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/engine_client.h b/google/cloud/discoveryengine/v1/engine_client.h index 26dc988e8b86e..b0ae5eca997e7 100644 --- a/google/cloud/discoveryengine/v1/engine_client.h +++ b/google/cloud/discoveryengine/v1/engine_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/engine_connection.h b/google/cloud/discoveryengine/v1/engine_connection.h index e4537710a2e39..6bd554fc42eb1 100644 --- a/google/cloud/discoveryengine/v1/engine_connection.h +++ b/google/cloud/discoveryengine/v1/engine_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_ENGINE_CONNECTION_H #include "google/cloud/discoveryengine/v1/engine_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/engine_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/engine_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/engine_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/engine_connection_idempotency_policy.h index 18ce8f89ec45b..3502974a7052c 100644 --- a/google/cloud/discoveryengine/v1/engine_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/engine_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_ENGINE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_ENGINE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/engine_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/grounded_generation_connection.h b/google/cloud/discoveryengine/v1/grounded_generation_connection.h index c87846c0421a3..abc9e7aaebffb 100644 --- a/google/cloud/discoveryengine/v1/grounded_generation_connection.h +++ b/google/cloud/discoveryengine/v1/grounded_generation_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_GROUNDED_GENERATION_CONNECTION_H #include "google/cloud/discoveryengine/v1/grounded_generation_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/grounded_generation_service.pb.h" #include "google/cloud/discoveryengine/v1/internal/grounded_generation_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/async_read_write_stream_impl.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/discoveryengine/v1/grounded_generation_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/grounded_generation_connection_idempotency_policy.h index c053980f13811..e23cc6b28cdcf 100644 --- a/google/cloud/discoveryengine/v1/grounded_generation_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/grounded_generation_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_GROUNDED_GENERATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_GROUNDED_GENERATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/grounded_generation_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.cc index 6bf0b7a2b26f4..b855c5bafa48e 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/completion_service.proto #include "google/cloud/discoveryengine/v1/internal/completion_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/completion_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.h index b579fff646e2b..8d0fb4678d2a3 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/completion_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/completion_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_connection_impl.h b/google/cloud/discoveryengine/v1/internal/completion_connection_impl.h index 780a784739eba..213e808e987f1 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/completion_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.cc index cbc546d4eea97..92bb3dffb9f84 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/completion_service.proto #include "google/cloud/discoveryengine/v1/internal/completion_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/completion_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.h index 3eb930926a316..635494d346d16 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/completion_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/completion_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.cc index e4743faf27ade..07e7d74e1eaf6 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/completion_service.proto #include "google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/completion_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.h index f6c3b30e55abf..dd4c321d3b65b 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/completion_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_stub.cc b/google/cloud/discoveryengine/v1/internal/completion_stub.cc index a34b063ab96ab..d62bc259d8408 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/completion_service.proto #include "google/cloud/discoveryengine/v1/internal/completion_stub.h" +#include "google/cloud/discoveryengine/v1/completion_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_stub.h b/google/cloud/discoveryengine/v1/internal/completion_stub.h index 209aac0ab06b7..93e404dc493c0 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_stub.h +++ b/google/cloud/discoveryengine/v1/internal/completion_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_COMPLETION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_COMPLETION_STUB_H +#include "google/cloud/discoveryengine/v1/completion_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc index e68387de4dba8..b3d3a9efc6b5b 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/completion_service.proto #include "google/cloud/discoveryengine/v1/internal/completion_stub_factory.h" +#include "google/cloud/discoveryengine/v1/completion_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/completion_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/completion_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/completion_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.cc index 7fda420a235fa..464a9734d9f1e 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompletionServiceTracingConnection::CompletionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -219,17 +217,13 @@ Status CompletionServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompletionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.h index 86becac3c7514..857485bbe3335 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/completion_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompletionServiceTracingConnection : public discoveryengine_v1::CompletionServiceConnection { public: @@ -121,8 +119,6 @@ class CompletionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.cc index 515d3004e538e..6321fc3a18a26 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompletionServiceTracingStub::CompletionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -235,15 +233,9 @@ future CompletionServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompletionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.h index 5ab758f63daf2..462b1ba73d797 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/completion_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompletionServiceTracingStub : public CompletionServiceStub { public: ~CompletionServiceTracingStub() override = default; @@ -126,8 +124,6 @@ class CompletionServiceTracingStub : public CompletionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/control_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/control_auth_decorator.cc index c2a3e884b39de..dab55d73bd929 100644 --- a/google/cloud/discoveryengine/v1/internal/control_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/control_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/control_service.proto #include "google/cloud/discoveryengine/v1/internal/control_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/control_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/control_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/control_logging_decorator.cc index 655e3ff7eb887..fc74a225eef59 100644 --- a/google/cloud/discoveryengine/v1/internal/control_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/control_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/control_service.proto #include "google/cloud/discoveryengine/v1/internal/control_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/control_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/control_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/control_metadata_decorator.cc index 53d28c78999e7..57dc615b034e6 100644 --- a/google/cloud/discoveryengine/v1/internal/control_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/control_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/control_service.proto #include "google/cloud/discoveryengine/v1/internal/control_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/control_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/control_stub.cc b/google/cloud/discoveryengine/v1/internal/control_stub.cc index 24726010f87c6..7858525375b08 100644 --- a/google/cloud/discoveryengine/v1/internal/control_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/control_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/control_service.proto #include "google/cloud/discoveryengine/v1/internal/control_stub.h" +#include "google/cloud/discoveryengine/v1/control_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/control_stub.h b/google/cloud/discoveryengine/v1/internal/control_stub.h index dd1e2c7342023..6b1d545a9b608 100644 --- a/google/cloud/discoveryengine/v1/internal/control_stub.h +++ b/google/cloud/discoveryengine/v1/internal/control_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_CONTROL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_CONTROL_STUB_H +#include "google/cloud/discoveryengine/v1/control_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/control_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/control_stub_factory.cc index 2f2d4329e8c1a..d26f38e3ac53c 100644 --- a/google/cloud/discoveryengine/v1/internal/control_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/control_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/control_service.proto #include "google/cloud/discoveryengine/v1/internal/control_stub_factory.h" +#include "google/cloud/discoveryengine/v1/control_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/control_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/control_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/control_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/control_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/control_tracing_connection.cc index 2ff651087b03c..0d060d1548a7f 100644 --- a/google/cloud/discoveryengine/v1/internal/control_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/control_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ControlServiceTracingConnection::ControlServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -108,16 +106,12 @@ Status ControlServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeControlServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/control_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/control_tracing_connection.h index dd5a765632857..25d76093bb46b 100644 --- a/google/cloud/discoveryengine/v1/internal/control_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/control_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ControlServiceTracingConnection : public discoveryengine_v1::ControlServiceConnection { public: @@ -72,8 +70,6 @@ class ControlServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/control_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/control_tracing_stub.cc index 2c3390052fa18..309ab73046a34 100644 --- a/google/cloud/discoveryengine/v1/internal/control_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/control_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ControlServiceTracingStub::ControlServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -126,15 +124,9 @@ Status ControlServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeControlServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/control_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/control_tracing_stub.h index bdf5234864e67..931ed4b232715 100644 --- a/google/cloud/discoveryengine/v1/internal/control_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/control_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ControlServiceTracingStub : public ControlServiceStub { public: ~ControlServiceTracingStub() override = default; @@ -81,8 +79,6 @@ class ControlServiceTracingStub : public ControlServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_auth_decorator.cc index cbe072555afd9..e68d489abf84c 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/conversational_search_service.proto #include "google/cloud/discoveryengine/v1/internal/conversational_search_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/conversational_search_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_logging_decorator.cc index 7ef505b51a7dd..e3435711fc930 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/conversational_search_service.proto #include "google/cloud/discoveryengine/v1/internal/conversational_search_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/conversational_search_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_metadata_decorator.cc index 9604bde6ac4b3..994796a3da17e 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/conversational_search_service.proto #include "google/cloud/discoveryengine/v1/internal/conversational_search_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/conversational_search_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_stub.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_stub.cc index 0a3323bbbb5c0..8f3ba801e68aa 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/conversational_search_service.proto #include "google/cloud/discoveryengine/v1/internal/conversational_search_stub.h" +#include "google/cloud/discoveryengine/v1/conversational_search_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_stub.h b/google/cloud/discoveryengine/v1/internal/conversational_search_stub.h index 792ca511ce0a4..008314bba6d0c 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_stub.h +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_CONVERSATIONAL_SEARCH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_CONVERSATIONAL_SEARCH_STUB_H +#include "google/cloud/discoveryengine/v1/conversational_search_service.grpc.pb.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_stub_factory.cc index 9c7cd929071a4..dfa8b68e7800f 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/conversational_search_service.proto #include "google/cloud/discoveryengine/v1/internal/conversational_search_stub_factory.h" +#include "google/cloud/discoveryengine/v1/conversational_search_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/conversational_search_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/conversational_search_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/conversational_search_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc index 595126689e3b7..b8d9bd2ba5e53 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationalSearchServiceTracingConnection:: ConversationalSearchServiceTracingConnection( std::shared_ptr< @@ -214,18 +212,14 @@ Status ConversationalSearchServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationalSearchServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.h index 44ec66491a1fd..be9f459e26011 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationalSearchServiceTracingConnection : public discoveryengine_v1::ConversationalSearchServiceConnection { public: @@ -112,8 +110,6 @@ class ConversationalSearchServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.cc index 9cde5c8b06752..15c8489430b4c 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConversationalSearchServiceTracingStub::ConversationalSearchServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -259,17 +257,11 @@ Status ConversationalSearchServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConversationalSearchServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.h index 655a7ea866c53..66481d2a9f3f7 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConversationalSearchServiceTracingStub : public ConversationalSearchServiceStub { public: @@ -132,8 +130,6 @@ class ConversationalSearchServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.cc index ef6350d3b1f89..a168d6af1f11c 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/data_store_service.proto #include "google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/data_store_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.h index 29a8a9412d476..50d79987a8578 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/data_store_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_connection_impl.h b/google/cloud/discoveryengine/v1/internal/data_store_connection_impl.h index 0b37285ea6739..9f74a140cec09 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.cc index 82dcff1d19230..f428da6437b9c 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/data_store_service.proto #include "google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/data_store_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.h index e2e5f5097a01a..a0f36d4112320 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/data_store_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.cc index d0999c697c84e..7c6b313f52ebd 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/data_store_service.proto #include "google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/data_store_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.h index 5a57b4d68d59b..8f1b48da020b1 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/data_store_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_stub.cc b/google/cloud/discoveryengine/v1/internal/data_store_stub.cc index 77adc23b091f8..62ae339f16e41 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/data_store_service.proto #include "google/cloud/discoveryengine/v1/internal/data_store_stub.h" +#include "google/cloud/discoveryengine/v1/data_store_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_stub.h b/google/cloud/discoveryengine/v1/internal/data_store_stub.h index 6619c1d598740..c9f87ad0aee57 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_stub.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_DATA_STORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_DATA_STORE_STUB_H +#include "google/cloud/discoveryengine/v1/data_store_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc index b5ae58facd084..becd4d1e12ac2 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/data_store_service.proto #include "google/cloud/discoveryengine/v1/internal/data_store_stub_factory.h" +#include "google/cloud/discoveryengine/v1/data_store_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/data_store_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/data_store_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/data_store_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.cc index 4a0d06ef0c96d..0369c749fc4db 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataStoreServiceTracingConnection::DataStoreServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -149,16 +147,12 @@ Status DataStoreServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataStoreServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.h index bf846f5d6f820..b6f5287cb0ff5 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataStoreServiceTracingConnection : public discoveryengine_v1::DataStoreServiceConnection { public: @@ -91,8 +89,6 @@ class DataStoreServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.cc index 0de2d4d8a7cb9..b418467b9e287 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataStoreServiceTracingStub::DataStoreServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -185,15 +183,9 @@ future DataStoreServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataStoreServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.h index 84684210b514c..d4eb49557d1c6 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataStoreServiceTracingStub : public DataStoreServiceStub { public: ~DataStoreServiceTracingStub() override = default; @@ -109,8 +107,6 @@ class DataStoreServiceTracingStub : public DataStoreServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/document_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/document_auth_decorator.cc index 0157bcacd7a06..e5d00d258b2fe 100644 --- a/google/cloud/discoveryengine/v1/internal/document_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/document_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/document_service.proto #include "google/cloud/discoveryengine/v1/internal/document_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/document_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/document_auth_decorator.h index f453d9a82bbae..98d8561ec66c8 100644 --- a/google/cloud/discoveryengine/v1/internal/document_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/document_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/document_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_connection_impl.h b/google/cloud/discoveryengine/v1/internal/document_connection_impl.h index 67a310aebf0e5..ad09378d2d18c 100644 --- a/google/cloud/discoveryengine/v1/internal/document_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/document_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/document_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/document_logging_decorator.cc index 046f17fe7305f..72f08ac25b9bf 100644 --- a/google/cloud/discoveryengine/v1/internal/document_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/document_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/document_service.proto #include "google/cloud/discoveryengine/v1/internal/document_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/document_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/document_logging_decorator.h index d723ecbeeb745..47203d2744361 100644 --- a/google/cloud/discoveryengine/v1/internal/document_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/document_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/document_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.cc index 9b2913308adda..5415f2c1a7663 100644 --- a/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/document_service.proto #include "google/cloud/discoveryengine/v1/internal/document_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/document_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.h index 47d783e65cefd..8943116039874 100644 --- a/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/document_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/document_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_stub.cc b/google/cloud/discoveryengine/v1/internal/document_stub.cc index 1afd2442621eb..888d36bec11cc 100644 --- a/google/cloud/discoveryengine/v1/internal/document_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/document_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/document_service.proto #include "google/cloud/discoveryengine/v1/internal/document_stub.h" +#include "google/cloud/discoveryengine/v1/document_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_stub.h b/google/cloud/discoveryengine/v1/internal/document_stub.h index 6beea70424212..17603e0735c09 100644 --- a/google/cloud/discoveryengine/v1/internal/document_stub.h +++ b/google/cloud/discoveryengine/v1/internal/document_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_DOCUMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_DOCUMENT_STUB_H +#include "google/cloud/discoveryengine/v1/document_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc index 9bdba67dbe15c..55a9583919c37 100644 --- a/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/document_service.proto #include "google/cloud/discoveryengine/v1/internal/document_stub_factory.h" +#include "google/cloud/discoveryengine/v1/document_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/document_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/document_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/document_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc index 45ffa8207e82d..b80e319c99443 100644 --- a/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentServiceTracingConnection::DocumentServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -177,16 +175,12 @@ Status DocumentServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/document_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/document_tracing_connection.h index 350dc37e959b3..6717582a37fc5 100644 --- a/google/cloud/discoveryengine/v1/internal/document_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/document_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentServiceTracingConnection : public discoveryengine_v1::DocumentServiceConnection { public: @@ -105,8 +103,6 @@ class DocumentServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc index 2023f11c07cea..f1a246dbe52fd 100644 --- a/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentServiceTracingStub::DocumentServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -223,15 +221,9 @@ future DocumentServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/document_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/document_tracing_stub.h index c664b522bb627..fb7efab636d3c 100644 --- a/google/cloud/discoveryengine/v1/internal/document_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/document_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentServiceTracingStub : public DocumentServiceStub { public: ~DocumentServiceTracingStub() override = default; @@ -125,8 +123,6 @@ class DocumentServiceTracingStub : public DocumentServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.cc index d5cb0b2c30259..859fe2ad43771 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/engine_service.proto #include "google/cloud/discoveryengine/v1/internal/engine_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/engine_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.h index 37bea7f19fd56..208dedb7581ce 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/engine_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/engine_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_connection_impl.h b/google/cloud/discoveryengine/v1/internal/engine_connection_impl.h index 50011826db5dd..dc05583df4725 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/engine_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.cc index 4dae430faf2eb..4ddcaa54571ef 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/engine_service.proto #include "google/cloud/discoveryengine/v1/internal/engine_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/engine_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.h index 5b06c27bad3d6..cf5ace57fcf21 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/engine_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/engine_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.cc index 7887e8021a255..25c16f4d22ddf 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/engine_service.proto #include "google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/engine_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.h index 10c0d20333322..9d39b249d7553 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/engine_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_stub.cc b/google/cloud/discoveryengine/v1/internal/engine_stub.cc index 2d15feb2bb232..0ed1b3d7efd5f 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/engine_service.proto #include "google/cloud/discoveryengine/v1/internal/engine_stub.h" +#include "google/cloud/discoveryengine/v1/engine_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_stub.h b/google/cloud/discoveryengine/v1/internal/engine_stub.h index 3b1e021dead75..8dcb4ea9cfcf3 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_stub.h +++ b/google/cloud/discoveryengine/v1/internal/engine_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_ENGINE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_ENGINE_STUB_H +#include "google/cloud/discoveryengine/v1/engine_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc index 98a5a25c1c8e8..0f648ff75ce07 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/engine_service.proto #include "google/cloud/discoveryengine/v1/internal/engine_stub_factory.h" +#include "google/cloud/discoveryengine/v1/engine_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/engine_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/engine_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/engine_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.cc index f87adc6628303..bf290baaaf7d9 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EngineServiceTracingConnection::EngineServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -147,16 +145,12 @@ Status EngineServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEngineServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.h index 0ca0744ebd2d0..7f973c779e675 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/engine_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EngineServiceTracingConnection : public discoveryengine_v1::EngineServiceConnection { public: @@ -88,8 +86,6 @@ class EngineServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.cc index 672c2e3fe17ea..af73ec726fc83 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EngineServiceTracingStub::EngineServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -180,15 +178,9 @@ future EngineServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEngineServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.h index fbfeddc505867..71a09bf56d6d8 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/engine_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EngineServiceTracingStub : public EngineServiceStub { public: ~EngineServiceTracingStub() override = default; @@ -107,8 +105,6 @@ class EngineServiceTracingStub : public EngineServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_auth_decorator.cc index 29b4b91b984c5..5d85671f42dbf 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/discoveryengine/v1/grounded_generation_service.proto #include "google/cloud/discoveryengine/v1/internal/grounded_generation_auth_decorator.h" +#include "google/cloud/discoveryengine/v1/grounded_generation_service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_logging_decorator.cc index c5e5e35291e5b..dee2b9be33f25 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/grounded_generation_service.proto #include "google/cloud/discoveryengine/v1/internal/grounded_generation_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/grounded_generation_service.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_metadata_decorator.cc index 8e71cb18328b0..f8efa85772581 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/grounded_generation_service.proto #include "google/cloud/discoveryengine/v1/internal/grounded_generation_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/grounded_generation_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.cc index 694185d99ba1c..498608fe8170d 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/grounded_generation_service.proto #include "google/cloud/discoveryengine/v1/internal/grounded_generation_stub.h" +#include "google/cloud/discoveryengine/v1/grounded_generation_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.h b/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.h index 233077c490a53..d0ff358af8a5e 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.h +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_GROUNDED_GENERATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_GROUNDED_GENERATION_STUB_H +#include "google/cloud/discoveryengine/v1/grounded_generation_service.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_stub_factory.cc index 6e3cf8ce27cf7..29e8bab9993df 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/discoveryengine/v1/grounded_generation_service.proto #include "google/cloud/discoveryengine/v1/internal/grounded_generation_stub_factory.h" +#include "google/cloud/discoveryengine/v1/grounded_generation_service.grpc.pb.h" #include "google/cloud/discoveryengine/v1/internal/grounded_generation_auth_decorator.h" #include "google/cloud/discoveryengine/v1/internal/grounded_generation_logging_decorator.h" #include "google/cloud/discoveryengine/v1/internal/grounded_generation_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.cc index 5cc3ce76790f9..2d16b7ab4a4f7 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GroundedGenerationServiceTracingConnection:: GroundedGenerationServiceTracingConnection( std::shared_ptr @@ -94,18 +92,14 @@ Status GroundedGenerationServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGroundedGenerationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.h index 0718b7e359230..489748bc3e3c7 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GroundedGenerationServiceTracingConnection : public discoveryengine_v1::GroundedGenerationServiceConnection { public: @@ -70,8 +68,6 @@ class GroundedGenerationServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.cc index dffa19aed231f..f38f4fec60ffb 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GroundedGenerationServiceTracingStub::GroundedGenerationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -118,17 +116,11 @@ Status GroundedGenerationServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGroundedGenerationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.h index 5a9c30d30cb0a..960920e153d57 100644 --- a/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/grounded_generation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GroundedGenerationServiceTracingStub : public GroundedGenerationServiceStub { public: @@ -78,8 +76,6 @@ class GroundedGenerationServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/project_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/project_auth_decorator.cc index 0ca6a327ea1bb..08dac137cd6fa 100644 --- a/google/cloud/discoveryengine/v1/internal/project_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/project_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/project_service.proto #include "google/cloud/discoveryengine/v1/internal/project_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/project_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/project_auth_decorator.h index be5cc030ae373..7cd26e37eae08 100644 --- a/google/cloud/discoveryengine/v1/internal/project_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/project_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/project_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_connection_impl.h b/google/cloud/discoveryengine/v1/internal/project_connection_impl.h index 59f70bce44f88..bb6378aff04e9 100644 --- a/google/cloud/discoveryengine/v1/internal/project_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/project_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/project_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/project_logging_decorator.cc index e4325fab2a566..6521120601e90 100644 --- a/google/cloud/discoveryengine/v1/internal/project_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/project_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/project_service.proto #include "google/cloud/discoveryengine/v1/internal/project_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/project_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/project_logging_decorator.h index 1b753de110d96..a84c4231f4917 100644 --- a/google/cloud/discoveryengine/v1/internal/project_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/project_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/project_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.cc index d3ee74b157bb9..e7af46feba22b 100644 --- a/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/project_service.proto #include "google/cloud/discoveryengine/v1/internal/project_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/project_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.h index 4fd4ef9d9584b..1e7453f671ee6 100644 --- a/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/project_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/project_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_stub.cc b/google/cloud/discoveryengine/v1/internal/project_stub.cc index 5d59bf7362b49..4d6db357f9f36 100644 --- a/google/cloud/discoveryengine/v1/internal/project_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/project_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/project_service.proto #include "google/cloud/discoveryengine/v1/internal/project_stub.h" +#include "google/cloud/discoveryengine/v1/project_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_stub.h b/google/cloud/discoveryengine/v1/internal/project_stub.h index fd6da5e8aaa5a..278f667535a64 100644 --- a/google/cloud/discoveryengine/v1/internal/project_stub.h +++ b/google/cloud/discoveryengine/v1/internal/project_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_PROJECT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_PROJECT_STUB_H +#include "google/cloud/discoveryengine/v1/project_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc index e2ca3b19a60cf..499a441b78765 100644 --- a/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/project_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/project_stub.h" #include "google/cloud/discoveryengine/v1/internal/project_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/project_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/project_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/project_tracing_connection.cc index 6211f5c509f5e..a4b2c9d793acb 100644 --- a/google/cloud/discoveryengine/v1/internal/project_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/project_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProjectServiceTracingConnection::ProjectServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -93,16 +91,12 @@ Status ProjectServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProjectServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/project_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/project_tracing_connection.h index 44b0319842f06..2b9e4172cb7f5 100644 --- a/google/cloud/discoveryengine/v1/internal/project_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/project_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProjectServiceTracingConnection : public discoveryengine_v1::ProjectServiceConnection { public: @@ -66,8 +64,6 @@ class ProjectServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/project_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/project_tracing_stub.cc index aff9e88719194..04ee0979834d1 100644 --- a/google/cloud/discoveryengine/v1/internal/project_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/project_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProjectServiceTracingStub::ProjectServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -124,15 +122,9 @@ future ProjectServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProjectServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/project_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/project_tracing_stub.h index 99bce2b450fc9..a6bf7f279be21 100644 --- a/google/cloud/discoveryengine/v1/internal/project_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/project_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProjectServiceTracingStub : public ProjectServiceStub { public: ~ProjectServiceTracingStub() override = default; @@ -80,8 +78,6 @@ class ProjectServiceTracingStub : public ProjectServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/rank_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/rank_auth_decorator.cc index afbd02d36ac8f..c181fa6668872 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/rank_service.proto #include "google/cloud/discoveryengine/v1/internal/rank_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/rank_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/rank_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/rank_logging_decorator.cc index a46b891a73321..7f769341d3c0c 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/rank_service.proto #include "google/cloud/discoveryengine/v1/internal/rank_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/rank_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/rank_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/rank_metadata_decorator.cc index 8ae9eb26bedf6..529e255e5bc8c 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/rank_service.proto #include "google/cloud/discoveryengine/v1/internal/rank_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/rank_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/rank_stub.cc b/google/cloud/discoveryengine/v1/internal/rank_stub.cc index c1698914f47f7..2b66b93717206 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/rank_service.proto #include "google/cloud/discoveryengine/v1/internal/rank_stub.h" +#include "google/cloud/discoveryengine/v1/rank_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/rank_stub.h b/google/cloud/discoveryengine/v1/internal/rank_stub.h index e5de4b4515e43..9b702829e7247 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_stub.h +++ b/google/cloud/discoveryengine/v1/internal/rank_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_RANK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_RANK_STUB_H +#include "google/cloud/discoveryengine/v1/rank_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/rank_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/rank_stub_factory.cc index 3560b93aac2a8..89635a4607ff9 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/rank_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/rank_stub.h" #include "google/cloud/discoveryengine/v1/internal/rank_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/rank_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.cc index 4c65538171c5f..f711b61875daf 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RankServiceTracingConnection::RankServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -70,16 +68,12 @@ Status RankServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRankServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.h index 01b3665491011..a17a417f016e4 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/rank_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RankServiceTracingConnection : public discoveryengine_v1::RankServiceConnection { public: @@ -56,8 +54,6 @@ class RankServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.cc index 45ff8ecd3f45e..1702e915ba28c 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RankServiceTracingStub::RankServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -78,15 +76,9 @@ Status RankServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRankServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.h index a908ee498afba..5b30f6ee38f73 100644 --- a/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/rank_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RankServiceTracingStub : public RankServiceStub { public: ~RankServiceTracingStub() override = default; @@ -60,8 +58,6 @@ class RankServiceTracingStub : public RankServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/recommendation_auth_decorator.cc index ff5b4c990c09f..94a2ff6804bef 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/recommendation_service.proto #include "google/cloud/discoveryengine/v1/internal/recommendation_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/recommendation_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/recommendation_logging_decorator.cc index c76c42f255714..291dac69631e7 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/recommendation_service.proto #include "google/cloud/discoveryengine/v1/internal/recommendation_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/recommendation_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/recommendation_metadata_decorator.cc index 165a96d52dbd6..c4bc01bfc91ed 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/recommendation_service.proto #include "google/cloud/discoveryengine/v1/internal/recommendation_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/recommendation_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_stub.cc b/google/cloud/discoveryengine/v1/internal/recommendation_stub.cc index 5368fdb04542a..4df83d5b52898 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/recommendation_service.proto #include "google/cloud/discoveryengine/v1/internal/recommendation_stub.h" +#include "google/cloud/discoveryengine/v1/recommendation_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_stub.h b/google/cloud/discoveryengine/v1/internal/recommendation_stub.h index 06e9005151068..93160764c3c82 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_stub.h +++ b/google/cloud/discoveryengine/v1/internal/recommendation_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_RECOMMENDATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_RECOMMENDATION_STUB_H +#include "google/cloud/discoveryengine/v1/recommendation_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/recommendation_stub_factory.cc index aa5321901a2de..7fd9fea9fc5c6 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/recommendation_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/recommendation_stub.h" #include "google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/recommendation_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.cc index 56ebdb8f20fe0..81e4bdeb159bd 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RecommendationServiceTracingConnection::RecommendationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -70,17 +68,13 @@ Status RecommendationServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRecommendationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.h index a0165b3e9cbc5..3e55702f26f7f 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RecommendationServiceTracingConnection : public discoveryengine_v1::RecommendationServiceConnection { public: @@ -58,8 +56,6 @@ class RecommendationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.cc index f3fa9ca14c512..0b49443a437be 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RecommendationServiceTracingStub::RecommendationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -81,15 +79,9 @@ Status RecommendationServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRecommendationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.h index a2918b9e3b2bf..b3e65d6791d63 100644 --- a/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/recommendation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RecommendationServiceTracingStub : public RecommendationServiceStub { public: ~RecommendationServiceTracingStub() override = default; @@ -62,8 +60,6 @@ class RecommendationServiceTracingStub : public RecommendationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.cc index bc5e120e6ad98..5b9980bfe00bc 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/schema_service.proto #include "google/cloud/discoveryengine/v1/internal/schema_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/schema_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.h index ebb9e62f60b82..655e02b1a36c8 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/schema_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/schema_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_connection_impl.h b/google/cloud/discoveryengine/v1/internal/schema_connection_impl.h index 08a153668f18c..a6cef5b41853a 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/schema_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.cc index 34bf0c2c3e9fb..66a327a0d6de0 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/schema_service.proto #include "google/cloud/discoveryengine/v1/internal/schema_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/schema_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.h index 51d498631cffb..005d2f26e8fed 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/schema_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/schema_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.cc index 83a10a84ac4d4..a8d1a83a4eed3 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/schema_service.proto #include "google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/schema_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.h index 36869f36a7b74..d8171d20dec0b 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/schema_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_stub.cc b/google/cloud/discoveryengine/v1/internal/schema_stub.cc index 833fb62641cec..88eceed6391fe 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/schema_service.proto #include "google/cloud/discoveryengine/v1/internal/schema_stub.h" +#include "google/cloud/discoveryengine/v1/schema_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_stub.h b/google/cloud/discoveryengine/v1/internal/schema_stub.h index 9df5d222e280c..df4ee00d446e7 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_stub.h +++ b/google/cloud/discoveryengine/v1/internal/schema_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_SCHEMA_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_SCHEMA_STUB_H +#include "google/cloud/discoveryengine/v1/schema_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc index 9173a97a662ce..f3185d902ca06 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/schema_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/schema_stub.h" #include "google/cloud/discoveryengine/v1/internal/schema_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/schema_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc index 157ba629ae1e1..a2327a7e60345 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SchemaServiceTracingConnection::SchemaServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -166,16 +164,12 @@ Status SchemaServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSchemaServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.h index a24d8204ab138..8eb7ab8180172 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SchemaServiceTracingConnection : public discoveryengine_v1::SchemaServiceConnection { public: @@ -96,8 +94,6 @@ class SchemaServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc index fba3138c5a9c8..a509a2721671f 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SchemaServiceTracingStub::SchemaServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -193,15 +191,9 @@ future SchemaServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSchemaServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.h index 00d91f29f4ee4..e79af6697402e 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SchemaServiceTracingStub : public SchemaServiceStub { public: ~SchemaServiceTracingStub() override = default; @@ -114,8 +112,6 @@ class SchemaServiceTracingStub : public SchemaServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/search_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/search_auth_decorator.cc index 23c4d6e7409eb..3b06a7dd8c2ed 100644 --- a/google/cloud/discoveryengine/v1/internal/search_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/search_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/search_service.proto #include "google/cloud/discoveryengine/v1/internal/search_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/search_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/search_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/search_logging_decorator.cc index 7ce4583aabb54..903f1c1c69070 100644 --- a/google/cloud/discoveryengine/v1/internal/search_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/search_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/search_service.proto #include "google/cloud/discoveryengine/v1/internal/search_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/search_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/search_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/search_metadata_decorator.cc index 52f777dd88124..84ac895cb27f8 100644 --- a/google/cloud/discoveryengine/v1/internal/search_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/search_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/search_service.proto #include "google/cloud/discoveryengine/v1/internal/search_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/search_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/search_stub.cc b/google/cloud/discoveryengine/v1/internal/search_stub.cc index cf9f2e1ad55fe..cf0035251c283 100644 --- a/google/cloud/discoveryengine/v1/internal/search_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/search_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/search_service.proto #include "google/cloud/discoveryengine/v1/internal/search_stub.h" +#include "google/cloud/discoveryengine/v1/search_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/search_stub.h b/google/cloud/discoveryengine/v1/internal/search_stub.h index c28b0ee5eaf55..b393e12b793fd 100644 --- a/google/cloud/discoveryengine/v1/internal/search_stub.h +++ b/google/cloud/discoveryengine/v1/internal/search_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_SEARCH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_SEARCH_STUB_H +#include "google/cloud/discoveryengine/v1/search_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/search_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/search_stub_factory.cc index 76617f7cb15e1..5367cb300b0c1 100644 --- a/google/cloud/discoveryengine/v1/internal/search_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/search_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/search_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/search_stub.h" #include "google/cloud/discoveryengine/v1/internal/search_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/search_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc index 2855e8133aa53..a083de4803088 100644 --- a/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SearchServiceTracingConnection::SearchServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -85,16 +83,12 @@ Status SearchServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSearchServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/search_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/search_tracing_connection.h index 97e108232c77b..67203515e3a1f 100644 --- a/google/cloud/discoveryengine/v1/internal/search_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/search_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SearchServiceTracingConnection : public discoveryengine_v1::SearchServiceConnection { public: @@ -60,8 +58,6 @@ class SearchServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/search_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/search_tracing_stub.cc index dd9cbe5ce9ecb..3e0788af0d70e 100644 --- a/google/cloud/discoveryengine/v1/internal/search_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/search_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SearchServiceTracingStub::SearchServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -90,15 +88,9 @@ Status SearchServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSearchServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/search_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/search_tracing_stub.h index 05c591bf48ea2..cf8612aa6351e 100644 --- a/google/cloud/discoveryengine/v1/internal/search_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/search_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SearchServiceTracingStub : public SearchServiceStub { public: ~SearchServiceTracingStub() override = default; @@ -66,8 +64,6 @@ class SearchServiceTracingStub : public SearchServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.cc index d4115520873a5..fa8512d7fb170 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/site_search_engine_service.proto #include "google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/site_search_engine_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.h index dd689f58b8566..c5313626f3c1f 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_connection_impl.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_connection_impl.h index a0f88453cec86..0d96bff555555 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.cc index f2bfd3cd47df2..1db7c2ef64636 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/site_search_engine_service.proto #include "google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/site_search_engine_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.h index 893eecf0be0f6..1c6e78576ded0 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.cc index 6cd5c4614ba5d..4be4195c33585 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/site_search_engine_service.proto #include "google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/site_search_engine_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.h index e2d20a908dd5e..edc25bec95da2 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc index 02495f5f6255c..e3b0ea914a7b6 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/site_search_engine_service.proto #include "google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h" +#include "google/cloud/discoveryengine/v1/site_search_engine_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h index 375af980e396d..04f473fce1f78 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_SITE_SEARCH_ENGINE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_SITE_SEARCH_ENGINE_STUB_H +#include "google/cloud/discoveryengine/v1/site_search_engine_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc index f1b61082ee684..3fbe32383842e 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/site_search_engine_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h" #include "google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/site_search_engine_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.cc index 4a7bc41665321..46797dd0dca98 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SiteSearchEngineServiceTracingConnection:: SiteSearchEngineServiceTracingConnection( std::shared_ptr @@ -459,18 +457,14 @@ Status SiteSearchEngineServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSiteSearchEngineServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.h index 95aaeca1080c2..ef6f6189577ec 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SiteSearchEngineServiceTracingConnection : public discoveryengine_v1::SiteSearchEngineServiceConnection { public: @@ -214,8 +212,6 @@ class SiteSearchEngineServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.cc index 0b71308719d60..aef306c1a33a2 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SiteSearchEngineServiceTracingStub::SiteSearchEngineServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -470,16 +468,10 @@ future SiteSearchEngineServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSiteSearchEngineServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.h index e3f4862e8514b..e921f12337596 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SiteSearchEngineServiceTracingStub : public SiteSearchEngineServiceStub { public: ~SiteSearchEngineServiceTracingStub() override = default; @@ -220,8 +218,6 @@ class SiteSearchEngineServiceTracingStub : public SiteSearchEngineServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.cc b/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.cc index e0568a9bfb438..5aa3861f8ae94 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/discoveryengine/v1/user_event_service.proto #include "google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.h" -#include +#include "google/cloud/discoveryengine/v1/user_event_service.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.h b/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.h index 3185c3a5f8944..5b8f1418c0790 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/user_event_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_connection_impl.h b/google/cloud/discoveryengine/v1/internal/user_event_connection_impl.h index aaf515f2b790e..14351c26c603f 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_connection_impl.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.cc b/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.cc index 23e57604203bc..bd1c0292f1179 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/discoveryengine/v1/user_event_service.proto #include "google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.h" +#include "google/cloud/discoveryengine/v1/user_event_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.h b/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.h index 0c5b0349fe465..e9cad81c7fa65 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/user_event_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.cc b/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.cc index 7f1102d644e8b..fdb5b0cdb9243 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/discoveryengine/v1/user_event_service.proto #include "google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.h" +#include "google/cloud/discoveryengine/v1/user_event_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 #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.h b/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.h index c2eae82a9a33d..033fb768212db 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/discoveryengine/v1/internal/user_event_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_stub.cc b/google/cloud/discoveryengine/v1/internal/user_event_stub.cc index f9394dd5cdaf7..87274a32166dd 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/discoveryengine/v1/user_event_service.proto #include "google/cloud/discoveryengine/v1/internal/user_event_stub.h" +#include "google/cloud/discoveryengine/v1/user_event_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_stub.h b/google/cloud/discoveryengine/v1/internal/user_event_stub.h index b086feb43de1e..251636b39a0fb 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_stub.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_USER_EVENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_INTERNAL_USER_EVENT_STUB_H +#include "google/cloud/discoveryengine/v1/user_event_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc index 664c38fc50bff..16d690112cbb3 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/discoveryengine/v1/internal/user_event_metadata_decorator.h" #include "google/cloud/discoveryengine/v1/internal/user_event_stub.h" #include "google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.h" +#include "google/cloud/discoveryengine/v1/user_event_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc index 9edadeb70eeeb..dd5fc466c5eb4 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UserEventServiceTracingConnection::UserEventServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -141,16 +139,12 @@ Status UserEventServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUserEventServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.h b/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.h index da12e973a21f1..cefdb6b810432 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UserEventServiceTracingConnection : public discoveryengine_v1::UserEventServiceConnection { public: @@ -87,8 +85,6 @@ class UserEventServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc index a2550ab6825d5..9efae21cad96a 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UserEventServiceTracingStub::UserEventServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -175,15 +173,9 @@ future UserEventServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUserEventServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.h b/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.h index 598ad60a35b3f..da58e31dbd425 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace discoveryengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UserEventServiceTracingStub : public UserEventServiceStub { public: ~UserEventServiceTracingStub() override = default; @@ -103,8 +101,6 @@ class UserEventServiceTracingStub : public UserEventServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/discoveryengine/v1/project_client.h b/google/cloud/discoveryengine/v1/project_client.h index ef677619e4789..adf178f9f0434 100644 --- a/google/cloud/discoveryengine/v1/project_client.h +++ b/google/cloud/discoveryengine/v1/project_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/project_connection.h b/google/cloud/discoveryengine/v1/project_connection.h index a28f8b7e1a7b7..061a466a9c615 100644 --- a/google/cloud/discoveryengine/v1/project_connection.h +++ b/google/cloud/discoveryengine/v1/project_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/discoveryengine/v1/internal/project_retry_traits.h" #include "google/cloud/discoveryengine/v1/project_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/project_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/project_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/project_connection_idempotency_policy.h index f23a997ef84f0..e5a4b851f8cc0 100644 --- a/google/cloud/discoveryengine/v1/project_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/project_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_PROJECT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_PROJECT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/project_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/rank_connection.h b/google/cloud/discoveryengine/v1/rank_connection.h index bc33559841400..735177ee4fd2d 100644 --- a/google/cloud/discoveryengine/v1/rank_connection.h +++ b/google/cloud/discoveryengine/v1/rank_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/discoveryengine/v1/internal/rank_retry_traits.h" #include "google/cloud/discoveryengine/v1/rank_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/rank_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/discoveryengine/v1/rank_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/rank_connection_idempotency_policy.h index e7dee987bb412..8182ecd3f2f90 100644 --- a/google/cloud/discoveryengine/v1/rank_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/rank_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_RANK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_RANK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/rank_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/recommendation_connection.h b/google/cloud/discoveryengine/v1/recommendation_connection.h index 21b04ff237ae5..c1a7e8b4491e2 100644 --- a/google/cloud/discoveryengine/v1/recommendation_connection.h +++ b/google/cloud/discoveryengine/v1/recommendation_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/discoveryengine/v1/internal/recommendation_retry_traits.h" #include "google/cloud/discoveryengine/v1/recommendation_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/recommendation_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/discoveryengine/v1/recommendation_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/recommendation_connection_idempotency_policy.h index e09ce0d7ecc3a..e7de9607d6f7a 100644 --- a/google/cloud/discoveryengine/v1/recommendation_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/recommendation_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_RECOMMENDATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_RECOMMENDATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/recommendation_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/schema_client.h b/google/cloud/discoveryengine/v1/schema_client.h index c1a285d3b36c3..5bdc265147c54 100644 --- a/google/cloud/discoveryengine/v1/schema_client.h +++ b/google/cloud/discoveryengine/v1/schema_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/schema_connection.h b/google/cloud/discoveryengine/v1/schema_connection.h index 0c2f1d9fae0bf..8c6ea3285708f 100644 --- a/google/cloud/discoveryengine/v1/schema_connection.h +++ b/google/cloud/discoveryengine/v1/schema_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/discoveryengine/v1/internal/schema_retry_traits.h" #include "google/cloud/discoveryengine/v1/schema_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/schema_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/schema_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/schema_connection_idempotency_policy.h index 6ed0d0d34c6a2..561a07c5bfdbf 100644 --- a/google/cloud/discoveryengine/v1/schema_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/schema_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_SCHEMA_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_SCHEMA_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/schema_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/search_connection.h b/google/cloud/discoveryengine/v1/search_connection.h index 2b5fea462f6d1..d955474d0c4a6 100644 --- a/google/cloud/discoveryengine/v1/search_connection.h +++ b/google/cloud/discoveryengine/v1/search_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/discoveryengine/v1/internal/search_retry_traits.h" #include "google/cloud/discoveryengine/v1/search_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/search_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/discoveryengine/v1/search_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/search_connection_idempotency_policy.h index 01643cee194eb..83513e3361c99 100644 --- a/google/cloud/discoveryengine/v1/search_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/search_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/search_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/site_search_engine_client.h b/google/cloud/discoveryengine/v1/site_search_engine_client.h index 7f0b47dfdaafc..3c786dd352d5f 100644 --- a/google/cloud/discoveryengine/v1/site_search_engine_client.h +++ b/google/cloud/discoveryengine/v1/site_search_engine_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/discoveryengine/v1/site_search_engine_connection.h b/google/cloud/discoveryengine/v1/site_search_engine_connection.h index 4d374e2bddad2..8e8b7ec3ea6fb 100644 --- a/google/cloud/discoveryengine/v1/site_search_engine_connection.h +++ b/google/cloud/discoveryengine/v1/site_search_engine_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/discoveryengine/v1/internal/site_search_engine_retry_traits.h" #include "google/cloud/discoveryengine/v1/site_search_engine_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/site_search_engine_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/site_search_engine_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/site_search_engine_connection_idempotency_policy.h index 9cb7beadc17e1..e79f43930f49b 100644 --- a/google/cloud/discoveryengine/v1/site_search_engine_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/site_search_engine_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_SITE_SEARCH_ENGINE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_SITE_SEARCH_ENGINE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/site_search_engine_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/user_event_client.h b/google/cloud/discoveryengine/v1/user_event_client.h index 38170801c8ad1..524b6036bc47d 100644 --- a/google/cloud/discoveryengine/v1/user_event_client.h +++ b/google/cloud/discoveryengine/v1/user_event_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/discoveryengine/v1/user_event_connection.h b/google/cloud/discoveryengine/v1/user_event_connection.h index 84aeb7aa59f33..c7d999e09a79b 100644 --- a/google/cloud/discoveryengine/v1/user_event_connection.h +++ b/google/cloud/discoveryengine/v1/user_event_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/discoveryengine/v1/internal/user_event_retry_traits.h" #include "google/cloud/discoveryengine/v1/user_event_connection_idempotency_policy.h" +#include "google/cloud/discoveryengine/v1/user_event_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/discoveryengine/v1/user_event_connection_idempotency_policy.h b/google/cloud/discoveryengine/v1/user_event_connection_idempotency_policy.h index 990b3b5b9f151..458dff949ec1d 100644 --- a/google/cloud/discoveryengine/v1/user_event_connection_idempotency_policy.h +++ b/google/cloud/discoveryengine/v1/user_event_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DISCOVERYENGINE_V1_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/discoveryengine/v1/user_event_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dlp/BUILD.bazel b/google/cloud/dlp/BUILD.bazel index b1826b24b1f30..54d83d4a53fc0 100644 --- a/google/cloud/dlp/BUILD.bazel +++ b/google/cloud/dlp/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/privacy/dlp/v2:dlp_cc_grpc", + "@googleapis//google/privacy/dlp/v2:dlp_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/dlp/quickstart/.bazelrc b/google/cloud/dlp/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/dlp/quickstart/.bazelrc +++ b/google/cloud/dlp/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/dlp/v2/dlp_connection.h b/google/cloud/dlp/v2/dlp_connection.h index 09a2b450bc241..9b5e8cd58c853 100644 --- a/google/cloud/dlp/v2/dlp_connection.h +++ b/google/cloud/dlp/v2/dlp_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/privacy/dlp/v2/dlp.pb.h" #include namespace google { diff --git a/google/cloud/dlp/v2/dlp_connection_idempotency_policy.h b/google/cloud/dlp/v2/dlp_connection_idempotency_policy.h index a5604c4f0867e..2d4d544e19839 100644 --- a/google/cloud/dlp/v2/dlp_connection_idempotency_policy.h +++ b/google/cloud/dlp/v2/dlp_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include namespace google { diff --git a/google/cloud/dlp/v2/internal/dlp_auth_decorator.cc b/google/cloud/dlp/v2/internal/dlp_auth_decorator.cc index ea054408d0d19..89153b2ca55e5 100644 --- a/google/cloud/dlp/v2/internal/dlp_auth_decorator.cc +++ b/google/cloud/dlp/v2/internal/dlp_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/privacy/dlp/v2/dlp.proto #include "google/cloud/dlp/v2/internal/dlp_auth_decorator.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include #include diff --git a/google/cloud/dlp/v2/internal/dlp_logging_decorator.cc b/google/cloud/dlp/v2/internal/dlp_logging_decorator.cc index 383768bd9ccdb..1de744a420113 100644 --- a/google/cloud/dlp/v2/internal/dlp_logging_decorator.cc +++ b/google/cloud/dlp/v2/internal/dlp_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/dlp/v2/internal/dlp_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include #include #include diff --git a/google/cloud/dlp/v2/internal/dlp_metadata_decorator.cc b/google/cloud/dlp/v2/internal/dlp_metadata_decorator.cc index 6de5caba1bc03..4803acb031d99 100644 --- a/google/cloud/dlp/v2/internal/dlp_metadata_decorator.cc +++ b/google/cloud/dlp/v2/internal/dlp_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include #include #include diff --git a/google/cloud/dlp/v2/internal/dlp_stub.cc b/google/cloud/dlp/v2/internal/dlp_stub.cc index 4a305fa973459..4b373ddff7ec5 100644 --- a/google/cloud/dlp/v2/internal/dlp_stub.cc +++ b/google/cloud/dlp/v2/internal/dlp_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/dlp/v2/internal/dlp_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include #include diff --git a/google/cloud/dlp/v2/internal/dlp_stub.h b/google/cloud/dlp/v2/internal/dlp_stub.h index 360fbe7f6a7eb..390a9d9d49235 100644 --- a/google/cloud/dlp/v2/internal/dlp_stub.h +++ b/google/cloud/dlp/v2/internal/dlp_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include #include diff --git a/google/cloud/dlp/v2/internal/dlp_stub_factory.cc b/google/cloud/dlp/v2/internal/dlp_stub_factory.cc index a393929f1aabb..be64a7d22619b 100644 --- a/google/cloud/dlp/v2/internal/dlp_stub_factory.cc +++ b/google/cloud/dlp/v2/internal/dlp_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/privacy/dlp/v2/dlp.grpc.pb.h" #include #include diff --git a/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc b/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc index 748eaf3957d37..3f1ce169cff35 100644 --- a/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc +++ b/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace dlp_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DlpServiceTracingConnection::DlpServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -539,15 +537,11 @@ DlpServiceTracingConnection::UpdateConnection( return internal::EndSpan(*span, child_->UpdateConnection(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDlpServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/dlp/v2/internal/dlp_tracing_connection.h b/google/cloud/dlp/v2/internal/dlp_tracing_connection.h index 70f88970265c6..a6885502808c8 100644 --- a/google/cloud/dlp/v2/internal/dlp_tracing_connection.h +++ b/google/cloud/dlp/v2/internal/dlp_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace dlp_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DlpServiceTracingConnection : public dlp_v2::DlpServiceConnection { public: ~DlpServiceTracingConnection() override = default; @@ -252,8 +250,6 @@ class DlpServiceTracingConnection : public dlp_v2::DlpServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/dlp/v2/internal/dlp_tracing_stub.cc b/google/cloud/dlp/v2/internal/dlp_tracing_stub.cc index 82dad418e03a9..dea67e9984cdc 100644 --- a/google/cloud/dlp/v2/internal/dlp_tracing_stub.cc +++ b/google/cloud/dlp/v2/internal/dlp_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace dlp_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DlpServiceTracingStub::DlpServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -691,15 +689,9 @@ DlpServiceTracingStub::UpdateConnection( child_->UpdateConnection(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDlpServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dlp/v2/internal/dlp_tracing_stub.h b/google/cloud/dlp/v2/internal/dlp_tracing_stub.h index 063f21dc7b086..08dd9be699c5c 100644 --- a/google/cloud/dlp/v2/internal/dlp_tracing_stub.h +++ b/google/cloud/dlp/v2/internal/dlp_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace dlp_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DlpServiceTracingStub : public DlpServiceStub { public: ~DlpServiceTracingStub() override = default; @@ -318,8 +316,6 @@ class DlpServiceTracingStub : public DlpServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/documentai/BUILD.bazel b/google/cloud/documentai/BUILD.bazel index cbc64b17a5a32..83abd73c05599 100644 --- a/google/cloud/documentai/BUILD.bazel +++ b/google/cloud/documentai/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/documentai/v1:documentai_cc_grpc", + "@googleapis//google/cloud/documentai/v1:documentai_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/documentai/quickstart/.bazelrc b/google/cloud/documentai/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/documentai/quickstart/.bazelrc +++ b/google/cloud/documentai/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/documentai/v1/document_processor_client.h b/google/cloud/documentai/v1/document_processor_client.h index 9ef93233f72a2..210012c145a14 100644 --- a/google/cloud/documentai/v1/document_processor_client.h +++ b/google/cloud/documentai/v1/document_processor_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/documentai/v1/document_processor_connection.h b/google/cloud/documentai/v1/document_processor_connection.h index 18cddb7c9cdf4..b50ebfd3d8f83 100644 --- a/google/cloud/documentai/v1/document_processor_connection.h +++ b/google/cloud/documentai/v1/document_processor_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_V1_DOCUMENT_PROCESSOR_CONNECTION_H #include "google/cloud/documentai/v1/document_processor_connection_idempotency_policy.h" +#include "google/cloud/documentai/v1/document_processor_service.pb.h" #include "google/cloud/documentai/v1/internal/document_processor_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/documentai/v1/document_processor_connection_idempotency_policy.h b/google/cloud/documentai/v1/document_processor_connection_idempotency_policy.h index f310f188407d4..a236f8cacbbb1 100644 --- a/google/cloud/documentai/v1/document_processor_connection_idempotency_policy.h +++ b/google/cloud/documentai/v1/document_processor_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_V1_DOCUMENT_PROCESSOR_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_V1_DOCUMENT_PROCESSOR_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/documentai/v1/document_processor_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/documentai/v1/internal/document_processor_auth_decorator.cc b/google/cloud/documentai/v1/internal/document_processor_auth_decorator.cc index 327811b08d911..e6b9a1d8716af 100644 --- a/google/cloud/documentai/v1/internal/document_processor_auth_decorator.cc +++ b/google/cloud/documentai/v1/internal/document_processor_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/documentai/v1/document_processor_service.proto #include "google/cloud/documentai/v1/internal/document_processor_auth_decorator.h" -#include +#include "google/cloud/documentai/v1/document_processor_service.grpc.pb.h" #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_auth_decorator.h b/google/cloud/documentai/v1/internal/document_processor_auth_decorator.h index 53a5552813526..9575d3e053255 100644 --- a/google/cloud/documentai/v1/internal/document_processor_auth_decorator.h +++ b/google/cloud/documentai/v1/internal/document_processor_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/documentai/v1/internal/document_processor_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_connection_impl.h b/google/cloud/documentai/v1/internal/document_processor_connection_impl.h index 419bfcb8ad486..79ea030025654 100644 --- a/google/cloud/documentai/v1/internal/document_processor_connection_impl.h +++ b/google/cloud/documentai/v1/internal/document_processor_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/documentai/v1/internal/document_processor_logging_decorator.cc b/google/cloud/documentai/v1/internal/document_processor_logging_decorator.cc index 497019b4cbdb3..7d1270d1de465 100644 --- a/google/cloud/documentai/v1/internal/document_processor_logging_decorator.cc +++ b/google/cloud/documentai/v1/internal/document_processor_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/documentai/v1/document_processor_service.proto #include "google/cloud/documentai/v1/internal/document_processor_logging_decorator.h" +#include "google/cloud/documentai/v1/document_processor_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_logging_decorator.h b/google/cloud/documentai/v1/internal/document_processor_logging_decorator.h index c8f99ebbb5bf6..12b9e2b280c2b 100644 --- a/google/cloud/documentai/v1/internal/document_processor_logging_decorator.h +++ b/google/cloud/documentai/v1/internal/document_processor_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/documentai/v1/internal/document_processor_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.cc b/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.cc index 656a05dc841f3..7f8627df1187b 100644 --- a/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.cc +++ b/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/documentai/v1/document_processor_service.proto #include "google/cloud/documentai/v1/internal/document_processor_metadata_decorator.h" +#include "google/cloud/documentai/v1/document_processor_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 #include #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.h b/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.h index 3c593e945a903..c29e6b686a32b 100644 --- a/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.h +++ b/google/cloud/documentai/v1/internal/document_processor_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/documentai/v1/internal/document_processor_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_stub.cc b/google/cloud/documentai/v1/internal/document_processor_stub.cc index 59d0ded16abc4..be9c205abaaac 100644 --- a/google/cloud/documentai/v1/internal/document_processor_stub.cc +++ b/google/cloud/documentai/v1/internal/document_processor_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/documentai/v1/document_processor_service.proto #include "google/cloud/documentai/v1/internal/document_processor_stub.h" +#include "google/cloud/documentai/v1/document_processor_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_stub.h b/google/cloud/documentai/v1/internal/document_processor_stub.h index cbb68f71430e7..580a92cad6164 100644 --- a/google/cloud/documentai/v1/internal/document_processor_stub.h +++ b/google/cloud/documentai/v1/internal/document_processor_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_V1_INTERNAL_DOCUMENT_PROCESSOR_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_V1_INTERNAL_DOCUMENT_PROCESSOR_STUB_H +#include "google/cloud/documentai/v1/document_processor_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc b/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc index c035d14a16940..e0d08be58d91e 100644 --- a/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc +++ b/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/documentai/v1/document_processor_service.proto #include "google/cloud/documentai/v1/internal/document_processor_stub_factory.h" +#include "google/cloud/documentai/v1/document_processor_service.grpc.pb.h" #include "google/cloud/documentai/v1/internal/document_processor_auth_decorator.h" #include "google/cloud/documentai/v1/internal/document_processor_logging_decorator.h" #include "google/cloud/documentai/v1/internal/document_processor_metadata_decorator.h" #include "google/cloud/documentai/v1/internal/document_processor_stub.h" #include "google/cloud/documentai/v1/internal/document_processor_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc b/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc index 1717db82317ea..83d3c7b03a8ac 100644 --- a/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc +++ b/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace documentai_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentProcessorServiceTracingConnection:: DocumentProcessorServiceTracingConnection( std::shared_ptr @@ -567,17 +565,13 @@ Status DocumentProcessorServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentProcessorServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/documentai/v1/internal/document_processor_tracing_connection.h b/google/cloud/documentai/v1/internal/document_processor_tracing_connection.h index 272063c2d51e3..ec5c7c92c6ae2 100644 --- a/google/cloud/documentai/v1/internal/document_processor_tracing_connection.h +++ b/google/cloud/documentai/v1/internal/document_processor_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace documentai_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentProcessorServiceTracingConnection : public documentai_v1::DocumentProcessorServiceConnection { public: @@ -258,8 +256,6 @@ class DocumentProcessorServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc b/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc index b70041e041f91..ff3f2782fc25b 100644 --- a/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc +++ b/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace documentai_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DocumentProcessorServiceTracingStub::DocumentProcessorServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -587,16 +585,10 @@ future DocumentProcessorServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDocumentProcessorServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/documentai/v1/internal/document_processor_tracing_stub.h b/google/cloud/documentai/v1/internal/document_processor_tracing_stub.h index dde6da384237f..912cc741f78dc 100644 --- a/google/cloud/documentai/v1/internal/document_processor_tracing_stub.h +++ b/google/cloud/documentai/v1/internal/document_processor_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace documentai_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DocumentProcessorServiceTracingStub : public DocumentProcessorServiceStub { public: @@ -270,8 +268,6 @@ class DocumentProcessorServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/domains/BUILD.bazel b/google/cloud/domains/BUILD.bazel index 652bd9f403d81..42424ef8cbcd2 100644 --- a/google/cloud/domains/BUILD.bazel +++ b/google/cloud/domains/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/domains/v1:domains_cc_grpc", + "@googleapis//google/cloud/domains/v1:domains_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/domains/quickstart/.bazelrc b/google/cloud/domains/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/domains/quickstart/.bazelrc +++ b/google/cloud/domains/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/domains/v1/domains_client.h b/google/cloud/domains/v1/domains_client.h index 170f0d6b83b33..0eaf865ae0566 100644 --- a/google/cloud/domains/v1/domains_client.h +++ b/google/cloud/domains/v1/domains_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/domains/v1/domains_connection.h b/google/cloud/domains/v1/domains_connection.h index 7aa4aefb45a06..b237168c0f105 100644 --- a/google/cloud/domains/v1/domains_connection.h +++ b/google/cloud/domains/v1/domains_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOMAINS_V1_DOMAINS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOMAINS_V1_DOMAINS_CONNECTION_H +#include "google/cloud/domains/v1/domains.pb.h" #include "google/cloud/domains/v1/domains_connection_idempotency_policy.h" #include "google/cloud/domains/v1/internal/domains_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/domains/v1/domains_connection_idempotency_policy.h b/google/cloud/domains/v1/domains_connection_idempotency_policy.h index 1c8581d0bd484..e076694c646cb 100644 --- a/google/cloud/domains/v1/domains_connection_idempotency_policy.h +++ b/google/cloud/domains/v1/domains_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOMAINS_V1_DOMAINS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOMAINS_V1_DOMAINS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/domains/v1/domains.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/domains/v1/internal/domains_auth_decorator.cc b/google/cloud/domains/v1/internal/domains_auth_decorator.cc index d077f08296ddf..01a46e45dbf1d 100644 --- a/google/cloud/domains/v1/internal/domains_auth_decorator.cc +++ b/google/cloud/domains/v1/internal/domains_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/domains/v1/domains.proto #include "google/cloud/domains/v1/internal/domains_auth_decorator.h" -#include +#include "google/cloud/domains/v1/domains.grpc.pb.h" #include #include diff --git a/google/cloud/domains/v1/internal/domains_auth_decorator.h b/google/cloud/domains/v1/internal/domains_auth_decorator.h index d7e0a9ac95225..afaba0ddf184b 100644 --- a/google/cloud/domains/v1/internal/domains_auth_decorator.h +++ b/google/cloud/domains/v1/internal/domains_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/domains/v1/internal/domains_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/domains/v1/internal/domains_connection_impl.h b/google/cloud/domains/v1/internal/domains_connection_impl.h index 3f0b728475e50..068d7d0493c57 100644 --- a/google/cloud/domains/v1/internal/domains_connection_impl.h +++ b/google/cloud/domains/v1/internal/domains_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/domains/v1/internal/domains_logging_decorator.cc b/google/cloud/domains/v1/internal/domains_logging_decorator.cc index c3c6e770bd489..61597a2514fb0 100644 --- a/google/cloud/domains/v1/internal/domains_logging_decorator.cc +++ b/google/cloud/domains/v1/internal/domains_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/domains/v1/domains.proto #include "google/cloud/domains/v1/internal/domains_logging_decorator.h" +#include "google/cloud/domains/v1/domains.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/domains/v1/internal/domains_logging_decorator.h b/google/cloud/domains/v1/internal/domains_logging_decorator.h index 0a9d97b73877a..43ddeda487799 100644 --- a/google/cloud/domains/v1/internal/domains_logging_decorator.h +++ b/google/cloud/domains/v1/internal/domains_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/domains/v1/internal/domains_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/domains/v1/internal/domains_metadata_decorator.cc b/google/cloud/domains/v1/internal/domains_metadata_decorator.cc index 7123eb0148ee1..ec46616438cdc 100644 --- a/google/cloud/domains/v1/internal/domains_metadata_decorator.cc +++ b/google/cloud/domains/v1/internal/domains_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/domains/v1/domains.proto #include "google/cloud/domains/v1/internal/domains_metadata_decorator.h" +#include "google/cloud/domains/v1/domains.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 #include #include #include diff --git a/google/cloud/domains/v1/internal/domains_metadata_decorator.h b/google/cloud/domains/v1/internal/domains_metadata_decorator.h index f7e92e8b03358..7a99c680bfcb3 100644 --- a/google/cloud/domains/v1/internal/domains_metadata_decorator.h +++ b/google/cloud/domains/v1/internal/domains_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/domains/v1/internal/domains_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/domains/v1/internal/domains_stub.cc b/google/cloud/domains/v1/internal/domains_stub.cc index a8cf6bdf465c4..79080bce66fd3 100644 --- a/google/cloud/domains/v1/internal/domains_stub.cc +++ b/google/cloud/domains/v1/internal/domains_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/domains/v1/domains.proto #include "google/cloud/domains/v1/internal/domains_stub.h" +#include "google/cloud/domains/v1/domains.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/domains/v1/internal/domains_stub.h b/google/cloud/domains/v1/internal/domains_stub.h index 4e1eb80ec975d..4fe62ed318914 100644 --- a/google/cloud/domains/v1/internal/domains_stub.h +++ b/google/cloud/domains/v1/internal/domains_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOMAINS_V1_INTERNAL_DOMAINS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOMAINS_V1_INTERNAL_DOMAINS_STUB_H +#include "google/cloud/domains/v1/domains.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/domains/v1/internal/domains_stub_factory.cc b/google/cloud/domains/v1/internal/domains_stub_factory.cc index a6ac4a4fc6909..f3862e289212b 100644 --- a/google/cloud/domains/v1/internal/domains_stub_factory.cc +++ b/google/cloud/domains/v1/internal/domains_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/domains/v1/domains.proto #include "google/cloud/domains/v1/internal/domains_stub_factory.h" +#include "google/cloud/domains/v1/domains.grpc.pb.h" #include "google/cloud/domains/v1/internal/domains_auth_decorator.h" #include "google/cloud/domains/v1/internal/domains_logging_decorator.h" #include "google/cloud/domains/v1/internal/domains_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/domains/v1/internal/domains_tracing_connection.cc b/google/cloud/domains/v1/internal/domains_tracing_connection.cc index cfd7403a3271c..157e7af74ab24 100644 --- a/google/cloud/domains/v1/internal/domains_tracing_connection.cc +++ b/google/cloud/domains/v1/internal/domains_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace domains_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DomainsTracingConnection::DomainsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -349,15 +347,11 @@ DomainsTracingConnection::ResetAuthorizationCode( return internal::EndSpan(*span, child_->ResetAuthorizationCode(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDomainsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/domains/v1/internal/domains_tracing_connection.h b/google/cloud/domains/v1/internal/domains_tracing_connection.h index 1266d85827aea..e1d62354f9dc5 100644 --- a/google/cloud/domains/v1/internal/domains_tracing_connection.h +++ b/google/cloud/domains/v1/internal/domains_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace domains_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DomainsTracingConnection : public domains_v1::DomainsConnection { public: ~DomainsTracingConnection() override = default; @@ -176,8 +174,6 @@ class DomainsTracingConnection : public domains_v1::DomainsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/domains/v1/internal/domains_tracing_stub.cc b/google/cloud/domains/v1/internal/domains_tracing_stub.cc index 57b175a48f6a7..7fb9b33b7a2ea 100644 --- a/google/cloud/domains/v1/internal/domains_tracing_stub.cc +++ b/google/cloud/domains/v1/internal/domains_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace domains_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DomainsTracingStub::DomainsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -367,15 +365,9 @@ future DomainsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDomainsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/domains/v1/internal/domains_tracing_stub.h b/google/cloud/domains/v1/internal/domains_tracing_stub.h index 4a0eb2cecacb4..8a6cf978e1017 100644 --- a/google/cloud/domains/v1/internal/domains_tracing_stub.h +++ b/google/cloud/domains/v1/internal/domains_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace domains_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DomainsTracingStub : public DomainsStub { public: ~DomainsTracingStub() override = default; @@ -192,8 +190,6 @@ class DomainsTracingStub : public DomainsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/edgecontainer/BUILD.bazel b/google/cloud/edgecontainer/BUILD.bazel index e6a738d6d2f8b..a6bfde8530c4d 100644 --- a/google/cloud/edgecontainer/BUILD.bazel +++ b/google/cloud/edgecontainer/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/edgecontainer/v1:edgecontainer_cc_grpc", + "@googleapis//google/cloud/edgecontainer/v1:edgecontainer_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/edgecontainer/quickstart/.bazelrc b/google/cloud/edgecontainer/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/edgecontainer/quickstart/.bazelrc +++ b/google/cloud/edgecontainer/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/edgecontainer/v1/edge_container_client.h b/google/cloud/edgecontainer/v1/edge_container_client.h index 289715a35f619..1f52aec4a1d3d 100644 --- a/google/cloud/edgecontainer/v1/edge_container_client.h +++ b/google/cloud/edgecontainer/v1/edge_container_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgecontainer/v1/edge_container_connection.h b/google/cloud/edgecontainer/v1/edge_container_connection.h index 89d819babd56f..ba743a0301338 100644 --- a/google/cloud/edgecontainer/v1/edge_container_connection.h +++ b/google/cloud/edgecontainer/v1/edge_container_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/edgecontainer/v1/edge_container_connection_idempotency_policy.h" #include "google/cloud/edgecontainer/v1/internal/edge_container_retry_traits.h" +#include "google/cloud/edgecontainer/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/edgecontainer/v1/edge_container_connection_idempotency_policy.h b/google/cloud/edgecontainer/v1/edge_container_connection_idempotency_policy.h index 30a678ab26f40..36d23eff181fd 100644 --- a/google/cloud/edgecontainer/v1/edge_container_connection_idempotency_policy.h +++ b/google/cloud/edgecontainer/v1/edge_container_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_V1_EDGE_CONTAINER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_V1_EDGE_CONTAINER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/edgecontainer/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.cc b/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.cc index 0bca6312d2faa..8e4978a0ece86 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/edgecontainer/v1/service.proto #include "google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.h" -#include +#include "google/cloud/edgecontainer/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.h b/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.h index 227eb71b20a9a..9bb6c27b0e1d6 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/edgecontainer/v1/internal/edge_container_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_connection_impl.h b/google/cloud/edgecontainer/v1/internal/edge_container_connection_impl.h index 90f49aa80a4fc..e1bc102ca78c0 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_connection_impl.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.cc b/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.cc index f94252a304109..2fbde6574d22f 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/edgecontainer/v1/service.proto #include "google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.h" +#include "google/cloud/edgecontainer/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.h b/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.h index 47fef0d683305..c9dc86479a59f 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/edgecontainer/v1/internal/edge_container_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.cc b/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.cc index 5bfa0a28422f3..a54ad1e5018ad 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/edgecontainer/v1/service.proto #include "google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.h" +#include "google/cloud/edgecontainer/v1/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 #include #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.h b/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.h index af21b19661149..d326d09d8e2d3 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/edgecontainer/v1/internal/edge_container_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc b/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc index 8baddf499d022..336fee030a21a 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/edgecontainer/v1/service.proto #include "google/cloud/edgecontainer/v1/internal/edge_container_stub.h" +#include "google/cloud/edgecontainer/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_stub.h b/google/cloud/edgecontainer/v1/internal/edge_container_stub.h index 65d2470933710..5d6f838c6ee3d 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_stub.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_V1_INTERNAL_EDGE_CONTAINER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_V1_INTERNAL_EDGE_CONTAINER_STUB_H +#include "google/cloud/edgecontainer/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc b/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc index a00a8a42569cf..e01cf5f4e1a29 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/edgecontainer/v1/internal/edge_container_metadata_decorator.h" #include "google/cloud/edgecontainer/v1/internal/edge_container_stub.h" #include "google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.h" +#include "google/cloud/edgecontainer/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc index 0ae731a45bae8..1418f62515d23 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace edgecontainer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EdgeContainerTracingConnection::EdgeContainerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -468,16 +466,12 @@ Status EdgeContainerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEdgeContainerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.h b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.h index 8d930e3fe39a3..94e13b50a26c4 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace edgecontainer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EdgeContainerTracingConnection : public edgecontainer_v1::EdgeContainerConnection { public: @@ -215,8 +213,6 @@ class EdgeContainerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc index c6ea7b0d88da8..7ff627936a051 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace edgecontainer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EdgeContainerTracingStub::EdgeContainerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -510,15 +508,9 @@ future EdgeContainerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEdgeContainerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.h b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.h index aca685e333d6d..60de3b008ab22 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace edgecontainer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EdgeContainerTracingStub : public EdgeContainerStub { public: ~EdgeContainerTracingStub() override = default; @@ -246,8 +244,6 @@ class EdgeContainerTracingStub : public EdgeContainerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/edgenetwork/BUILD.bazel b/google/cloud/edgenetwork/BUILD.bazel index b0640f61a0395..b3b66dafba138 100644 --- a/google/cloud/edgenetwork/BUILD.bazel +++ b/google/cloud/edgenetwork/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/edgenetwork/v1:edgenetwork_cc_grpc", + "@googleapis//google/cloud/edgenetwork/v1:edgenetwork_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/edgenetwork/quickstart/.bazelrc b/google/cloud/edgenetwork/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/edgenetwork/quickstart/.bazelrc +++ b/google/cloud/edgenetwork/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/edgenetwork/v1/edge_network_client.h b/google/cloud/edgenetwork/v1/edge_network_client.h index 6dd59ab3d995e..50e8fff1e52d5 100644 --- a/google/cloud/edgenetwork/v1/edge_network_client.h +++ b/google/cloud/edgenetwork/v1/edge_network_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgenetwork/v1/edge_network_connection.h b/google/cloud/edgenetwork/v1/edge_network_connection.h index aad99778e57f1..a54f6ed04151d 100644 --- a/google/cloud/edgenetwork/v1/edge_network_connection.h +++ b/google/cloud/edgenetwork/v1/edge_network_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h" #include "google/cloud/edgenetwork/v1/internal/edge_network_retry_traits.h" +#include "google/cloud/edgenetwork/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h b/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h index 6b03944054395..84470cba1af3f 100644 --- a/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h +++ b/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/edgenetwork/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc index cca71df9bf2b5..57b0720f5c222 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/edgenetwork/v1/service.proto #include "google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h" -#include +#include "google/cloud/edgenetwork/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h index 6edf1f3b57c17..01f498afeff2e 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h b/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h index 98aa413619412..1c8fe1b0c404a 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc index b455d1c5fb61e..14419f8f006aa 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/edgenetwork/v1/service.proto #include "google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h" +#include "google/cloud/edgenetwork/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h index d6ba5b8f9eb63..209b390d5c476 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc index cae664591acba..2c4515052d39a 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/edgenetwork/v1/service.proto #include "google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h" +#include "google/cloud/edgenetwork/v1/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 #include #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h index 99b598b7df4ac..38442ebd833d8 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc b/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc index 7e9a87379c071..0aee7c1b7e2b2 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/edgenetwork/v1/service.proto #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h" +#include "google/cloud/edgenetwork/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub.h b/google/cloud/edgenetwork/v1/internal/edge_network_stub.h index 13169918cde90..b09ecf9f6a769 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_stub.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_H +#include "google/cloud/edgenetwork/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc index 8a15568c1b9e8..2e3ad1337ae70 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h" #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h" #include "google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h" +#include "google/cloud/edgenetwork/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc index 68bdb47f84190..c0f112a14f7b2 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace edgenetwork_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EdgeNetworkTracingConnection::EdgeNetworkTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -540,16 +538,12 @@ Status EdgeNetworkTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEdgeNetworkTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h index ba6913930e6b8..f2ce6fa373f7f 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace edgenetwork_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EdgeNetworkTracingConnection : public edgenetwork_v1::EdgeNetworkConnection { public: @@ -246,8 +244,6 @@ class EdgeNetworkTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc index 17d120363ac11..c051a17cf32c4 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace edgenetwork_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EdgeNetworkTracingStub::EdgeNetworkTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -584,15 +582,9 @@ future EdgeNetworkTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEdgeNetworkTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h index 3cfe7c3c3e3a5..34633ef915de3 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace edgenetwork_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EdgeNetworkTracingStub : public EdgeNetworkStub { public: ~EdgeNetworkTracingStub() override = default; @@ -282,8 +280,6 @@ class EdgeNetworkTracingStub : public EdgeNetworkStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/essentialcontacts/BUILD.bazel b/google/cloud/essentialcontacts/BUILD.bazel index 6c9c69eb07c18..12173833dcb15 100644 --- a/google/cloud/essentialcontacts/BUILD.bazel +++ b/google/cloud/essentialcontacts/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/essentialcontacts/v1:essentialcontacts_cc_grpc", + "@googleapis//google/cloud/essentialcontacts/v1:essentialcontacts_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/essentialcontacts/quickstart/.bazelrc b/google/cloud/essentialcontacts/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/essentialcontacts/quickstart/.bazelrc +++ b/google/cloud/essentialcontacts/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/essentialcontacts/v1/essential_contacts_connection.h b/google/cloud/essentialcontacts/v1/essential_contacts_connection.h index 3ee8524a52e4a..e46e8f76d352d 100644 --- a/google/cloud/essentialcontacts/v1/essential_contacts_connection.h +++ b/google/cloud/essentialcontacts/v1/essential_contacts_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/essentialcontacts/v1/essential_contacts_connection_idempotency_policy.h" #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_retry_traits.h" +#include "google/cloud/essentialcontacts/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/essentialcontacts/v1/essential_contacts_connection_idempotency_policy.h b/google/cloud/essentialcontacts/v1/essential_contacts_connection_idempotency_policy.h index 5a60688aebbdb..d8a9f7b184ad4 100644 --- a/google/cloud/essentialcontacts/v1/essential_contacts_connection_idempotency_policy.h +++ b/google/cloud/essentialcontacts/v1/essential_contacts_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ESSENTIALCONTACTS_V1_ESSENTIAL_CONTACTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ESSENTIALCONTACTS_V1_ESSENTIAL_CONTACTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/essentialcontacts/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_auth_decorator.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_auth_decorator.cc index b9b69ca3806ff..2bed0edc4ad57 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_auth_decorator.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/essentialcontacts/v1/service.proto #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_auth_decorator.h" -#include +#include "google/cloud/essentialcontacts/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_logging_decorator.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_logging_decorator.cc index 46478b81cf283..f3963bf5880be 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_logging_decorator.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/essentialcontacts/v1/service.proto #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_logging_decorator.h" +#include "google/cloud/essentialcontacts/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_metadata_decorator.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_metadata_decorator.cc index efaa8c1ccc24b..b3c30e87fd565 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_metadata_decorator.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/essentialcontacts/v1/service.proto #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_metadata_decorator.h" +#include "google/cloud/essentialcontacts/v1/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 #include #include #include diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.cc index fd181ad1d24cb..d0dd5b4d80d0c 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/essentialcontacts/v1/service.proto #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.h" +#include "google/cloud/essentialcontacts/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.h b/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.h index 6defc538cab0b..a5b50b9a3eb35 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.h +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ESSENTIALCONTACTS_V1_INTERNAL_ESSENTIAL_CONTACTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ESSENTIALCONTACTS_V1_INTERNAL_ESSENTIAL_CONTACTS_STUB_H +#include "google/cloud/essentialcontacts/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub_factory.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub_factory.cc index 1317f891f8905..12c31ae93e389 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub_factory.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_metadata_decorator.h" #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_stub.h" #include "google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.h" +#include "google/cloud/essentialcontacts/v1/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 #include #include diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc index c4520653e0294..e78a919dd1271 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace essentialcontacts_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EssentialContactsServiceTracingConnection:: EssentialContactsServiceTracingConnection( std::shared_ptr< @@ -109,18 +107,14 @@ Status EssentialContactsServiceTracingConnection::SendTestMessage( return internal::EndSpan(*span, child_->SendTestMessage(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEssentialContactsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.h b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.h index d9314b153b8c6..ca9f0d1cc5109 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.h +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace essentialcontacts_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EssentialContactsServiceTracingConnection : public essentialcontacts_v1::EssentialContactsServiceConnection { public: @@ -74,8 +72,6 @@ class EssentialContactsServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.cc index 193170b30a107..9ce7366b8babd 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace essentialcontacts_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EssentialContactsServiceTracingStub::EssentialContactsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -123,16 +121,10 @@ Status EssentialContactsServiceTracingStub::SendTestMessage( child_->SendTestMessage(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEssentialContactsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.h b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.h index 9005bd66de998..47859ce520aee 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.h +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace essentialcontacts_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EssentialContactsServiceTracingStub : public EssentialContactsServiceStub { public: @@ -82,8 +80,6 @@ class EssentialContactsServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/eventarc/BUILD.bazel b/google/cloud/eventarc/BUILD.bazel index 9ce87af2e1f78..78036769bf2e8 100644 --- a/google/cloud/eventarc/BUILD.bazel +++ b/google/cloud/eventarc/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/eventarc/publishing/v1:publishing_cc_grpc", - "@com_google_googleapis//google/cloud/eventarc/v1:eventarc_cc_grpc", + "@googleapis//google/cloud/eventarc/publishing/v1:publishing_cc_grpc", + "@googleapis//google/cloud/eventarc/v1:eventarc_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_auth_decorator.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_auth_decorator.cc index 83e6398a21a2f..e51ed8622c682 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_auth_decorator.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/eventarc/publishing/v1/publisher.proto #include "google/cloud/eventarc/publishing/v1/internal/publisher_auth_decorator.h" -#include +#include "google/cloud/eventarc/publishing/v1/publisher.grpc.pb.h" #include #include diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_logging_decorator.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_logging_decorator.cc index 5faa6117e62df..6db14d0e69196 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_logging_decorator.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/eventarc/publishing/v1/publisher.proto #include "google/cloud/eventarc/publishing/v1/internal/publisher_logging_decorator.h" +#include "google/cloud/eventarc/publishing/v1/publisher.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_metadata_decorator.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_metadata_decorator.cc index 99a5e03cef57d..d852c1ea8f5d7 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_metadata_decorator.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/eventarc/publishing/v1/publisher.proto #include "google/cloud/eventarc/publishing/v1/internal/publisher_metadata_decorator.h" +#include "google/cloud/eventarc/publishing/v1/publisher.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 #include #include #include diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_stub.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_stub.cc index 9dd65e39bcb6f..f41a95d1c390f 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_stub.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/eventarc/publishing/v1/publisher.proto #include "google/cloud/eventarc/publishing/v1/internal/publisher_stub.h" +#include "google/cloud/eventarc/publishing/v1/publisher.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_stub.h b/google/cloud/eventarc/publishing/v1/internal/publisher_stub.h index 8656329f30d4a..3d5dfd9d81db6 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_stub.h +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHING_V1_INTERNAL_PUBLISHER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHING_V1_INTERNAL_PUBLISHER_STUB_H +#include "google/cloud/eventarc/publishing/v1/publisher.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_stub_factory.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_stub_factory.cc index 52ec12775bcab..6182e702a4f87 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_stub_factory.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/eventarc/publishing/v1/internal/publisher_metadata_decorator.h" #include "google/cloud/eventarc/publishing/v1/internal/publisher_stub.h" #include "google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.h" +#include "google/cloud/eventarc/publishing/v1/publisher.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 #include #include diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.cc index f84756caeba7d..a2df5c54e45ef 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace eventarc_publishing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublisherTracingConnection::PublisherTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -64,16 +62,12 @@ PublisherTracingConnection::Publish( return internal::EndSpan(*span, child_->Publish(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePublisherTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.h b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.h index 373de26ec0924..e8f56076f36da 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.h +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace eventarc_publishing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublisherTracingConnection : public eventarc_publishing_v1::PublisherConnection { public: @@ -59,8 +57,6 @@ class PublisherTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.cc b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.cc index 640f69dc965c4..86deb1ed29a03 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.cc +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace eventarc_publishing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublisherTracingStub::PublisherTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -72,15 +70,9 @@ PublisherTracingStub::Publish( child_->Publish(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePublisherTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.h b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.h index d9d81e3b4b101..af347ccb998e3 100644 --- a/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.h +++ b/google/cloud/eventarc/publishing/v1/internal/publisher_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace eventarc_publishing_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublisherTracingStub : public PublisherStub { public: ~PublisherTracingStub() override = default; @@ -62,8 +60,6 @@ class PublisherTracingStub : public PublisherStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/eventarc/publishing/v1/publisher_connection.h b/google/cloud/eventarc/publishing/v1/publisher_connection.h index fb8e45d8f0049..d244cc64c66d7 100644 --- a/google/cloud/eventarc/publishing/v1/publisher_connection.h +++ b/google/cloud/eventarc/publishing/v1/publisher_connection.h @@ -20,13 +20,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHING_V1_PUBLISHER_CONNECTION_H #include "google/cloud/eventarc/publishing/v1/internal/publisher_retry_traits.h" +#include "google/cloud/eventarc/publishing/v1/publisher.pb.h" #include "google/cloud/eventarc/publishing/v1/publisher_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/eventarc/publishing/v1/publisher_connection_idempotency_policy.h b/google/cloud/eventarc/publishing/v1/publisher_connection_idempotency_policy.h index 434139b972be4..90ac3a790c80c 100644 --- a/google/cloud/eventarc/publishing/v1/publisher_connection_idempotency_policy.h +++ b/google/cloud/eventarc/publishing/v1/publisher_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHING_V1_PUBLISHER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHING_V1_PUBLISHER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/eventarc/publishing/v1/publisher.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/eventarc/quickstart/.bazelrc b/google/cloud/eventarc/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/eventarc/quickstart/.bazelrc +++ b/google/cloud/eventarc/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/eventarc/v1/eventarc_client.h b/google/cloud/eventarc/v1/eventarc_client.h index 64b3bbf3217af..4203dafcc29d8 100644 --- a/google/cloud/eventarc/v1/eventarc_client.h +++ b/google/cloud/eventarc/v1/eventarc_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/eventarc/v1/eventarc_connection.h b/google/cloud/eventarc/v1/eventarc_connection.h index 9dabae034cb3e..edbfa2593217b 100644 --- a/google/cloud/eventarc/v1/eventarc_connection.h +++ b/google/cloud/eventarc/v1/eventarc_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_V1_EVENTARC_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_V1_EVENTARC_CONNECTION_H +#include "google/cloud/eventarc/v1/eventarc.pb.h" #include "google/cloud/eventarc/v1/eventarc_connection_idempotency_policy.h" #include "google/cloud/eventarc/v1/internal/eventarc_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/eventarc/v1/eventarc_connection_idempotency_policy.h b/google/cloud/eventarc/v1/eventarc_connection_idempotency_policy.h index b7cdcc7cdf041..8e14bdec7792e 100644 --- a/google/cloud/eventarc/v1/eventarc_connection_idempotency_policy.h +++ b/google/cloud/eventarc/v1/eventarc_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_V1_EVENTARC_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_V1_EVENTARC_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/eventarc/v1/eventarc.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.cc b/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.cc index a93180cfcaab4..6dd620cf527e4 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/eventarc/v1/eventarc.proto #include "google/cloud/eventarc/v1/internal/eventarc_auth_decorator.h" -#include +#include "google/cloud/eventarc/v1/eventarc.grpc.pb.h" #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.h b/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.h index 99a3b4ce81e32..cb10edb5658c8 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.h +++ b/google/cloud/eventarc/v1/internal/eventarc_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/eventarc/v1/internal/eventarc_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_connection_impl.h b/google/cloud/eventarc/v1/internal/eventarc_connection_impl.h index faff91f54fa5e..0a4d42cb2b34f 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_connection_impl.h +++ b/google/cloud/eventarc/v1/internal/eventarc_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.cc b/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.cc index 01d8be8d0a083..7c6d60e05238f 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/eventarc/v1/eventarc.proto #include "google/cloud/eventarc/v1/internal/eventarc_logging_decorator.h" +#include "google/cloud/eventarc/v1/eventarc.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.h b/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.h index 76c00c32a365a..f58aea0e41f2e 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.h +++ b/google/cloud/eventarc/v1/internal/eventarc_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/eventarc/v1/internal/eventarc_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.cc b/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.cc index 904ee344da28f..61fe16d140d84 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/eventarc/v1/eventarc.proto #include "google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.h" +#include "google/cloud/eventarc/v1/eventarc.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 #include #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.h b/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.h index ff0dd43f13aa6..d08072c90f386 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.h +++ b/google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/eventarc/v1/internal/eventarc_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_stub.cc b/google/cloud/eventarc/v1/internal/eventarc_stub.cc index 620a8e0d06f47..3e27dda8f4340 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_stub.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/eventarc/v1/eventarc.proto #include "google/cloud/eventarc/v1/internal/eventarc_stub.h" +#include "google/cloud/eventarc/v1/eventarc.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_stub.h b/google/cloud/eventarc/v1/internal/eventarc_stub.h index e1749f688a997..cbba127b5d593 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_stub.h +++ b/google/cloud/eventarc/v1/internal/eventarc_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_V1_INTERNAL_EVENTARC_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_V1_INTERNAL_EVENTARC_STUB_H +#include "google/cloud/eventarc/v1/eventarc.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc b/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc index 65a39d991e077..90a3dcfe58867 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/eventarc/v1/eventarc.proto #include "google/cloud/eventarc/v1/internal/eventarc_stub_factory.h" +#include "google/cloud/eventarc/v1/eventarc.grpc.pb.h" #include "google/cloud/eventarc/v1/internal/eventarc_auth_decorator.h" #include "google/cloud/eventarc/v1/internal/eventarc_logging_decorator.h" #include "google/cloud/eventarc/v1/internal/eventarc_metadata_decorator.h" #include "google/cloud/eventarc/v1/internal/eventarc_stub.h" #include "google/cloud/eventarc/v1/internal/eventarc_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc b/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc index 3f6d30d082780..7c3e157bb3de5 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace eventarc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EventarcTracingConnection::EventarcTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -897,15 +895,11 @@ Status EventarcTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEventarcTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.h b/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.h index 64fffcb127045..22776eb2b7b05 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.h +++ b/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace eventarc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EventarcTracingConnection : public eventarc_v1::EventarcConnection { public: ~EventarcTracingConnection() override = default; @@ -390,8 +388,6 @@ class EventarcTracingConnection : public eventarc_v1::EventarcConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc b/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc index 59628619797f5..421731a41e0c1 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace eventarc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EventarcTracingStub::EventarcTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -918,15 +916,9 @@ future EventarcTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEventarcTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.h b/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.h index 17a97fa70d08b..482715d8baadf 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.h +++ b/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace eventarc_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EventarcTracingStub : public EventarcStub { public: ~EventarcTracingStub() override = default; @@ -426,8 +424,6 @@ class EventarcTracingStub : public EventarcStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/filestore/BUILD.bazel b/google/cloud/filestore/BUILD.bazel index d90f41dfd7641..ff9759b80166b 100644 --- a/google/cloud/filestore/BUILD.bazel +++ b/google/cloud/filestore/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/filestore/v1:filestore_cc_grpc", + "@googleapis//google/cloud/filestore/v1:filestore_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/filestore/quickstart/.bazelrc b/google/cloud/filestore/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/filestore/quickstart/.bazelrc +++ b/google/cloud/filestore/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/filestore/v1/cloud_filestore_manager_client.h b/google/cloud/filestore/v1/cloud_filestore_manager_client.h index b04f15a7d5a22..c21a9053e7e2c 100644 --- a/google/cloud/filestore/v1/cloud_filestore_manager_client.h +++ b/google/cloud/filestore/v1/cloud_filestore_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/filestore/v1/cloud_filestore_manager_connection.h b/google/cloud/filestore/v1/cloud_filestore_manager_connection.h index 3c5b5228abfd5..b4bd8c9e66460 100644 --- a/google/cloud/filestore/v1/cloud_filestore_manager_connection.h +++ b/google/cloud/filestore/v1/cloud_filestore_manager_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_V1_CLOUD_FILESTORE_MANAGER_CONNECTION_H #include "google/cloud/filestore/v1/cloud_filestore_manager_connection_idempotency_policy.h" +#include "google/cloud/filestore/v1/cloud_filestore_service.pb.h" #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/filestore/v1/cloud_filestore_manager_connection_idempotency_policy.h b/google/cloud/filestore/v1/cloud_filestore_manager_connection_idempotency_policy.h index e7fef04ec55ca..7f6bec8b7df55 100644 --- a/google/cloud/filestore/v1/cloud_filestore_manager_connection_idempotency_policy.h +++ b/google/cloud/filestore/v1/cloud_filestore_manager_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_V1_CLOUD_FILESTORE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_V1_CLOUD_FILESTORE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/filestore/v1/cloud_filestore_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.cc index b26f6682fe086..577840cc13722 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/filestore/v1/cloud_filestore_service.proto #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.h" -#include +#include "google/cloud/filestore/v1/cloud_filestore_service.grpc.pb.h" #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.h index 58e5fc25a1ada..3f4f2c810db8c 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_connection_impl.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_connection_impl.h index d266b169bf9f8..0ded94a964573 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_connection_impl.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.cc index a2811504a8f20..ed6a6c8501e25 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/filestore/v1/cloud_filestore_service.proto #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.h" +#include "google/cloud/filestore/v1/cloud_filestore_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.h index 011d3001fa3fe..bc33518fb80e8 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.cc index 64b3ed52f76a2..73ecc7a0bec2d 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/filestore/v1/cloud_filestore_service.proto #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.h" +#include "google/cloud/filestore/v1/cloud_filestore_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 #include #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.h index fbae8b82ac89c..7460dbd169a60 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc index 3fe80ad5e9b3d..b23ff343d413b 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/filestore/v1/cloud_filestore_service.proto #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h" +#include "google/cloud/filestore/v1/cloud_filestore_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h index 506032533d3b8..69e1dbe2acedc 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_V1_INTERNAL_CLOUD_FILESTORE_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_V1_INTERNAL_CLOUD_FILESTORE_MANAGER_STUB_H +#include "google/cloud/filestore/v1/cloud_filestore_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc index aa34d6f270200..9ac6a86c9717d 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/filestore/v1/cloud_filestore_service.proto #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.h" +#include "google/cloud/filestore/v1/cloud_filestore_service.grpc.pb.h" #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_auth_decorator.h" #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_logging_decorator.h" #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_metadata_decorator.h" #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h" #include "google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc index 7bfe7fbaa1083..d67b09651f8e1 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace filestore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudFilestoreManagerTracingConnection::CloudFilestoreManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -494,17 +492,13 @@ Status CloudFilestoreManagerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudFilestoreManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.h index 263132117c35d..e22a0b5a311f7 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace filestore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudFilestoreManagerTracingConnection : public filestore_v1::CloudFilestoreManagerConnection { public: @@ -224,8 +222,6 @@ class CloudFilestoreManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc index da7c583aca451..13225388d5a0e 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace filestore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudFilestoreManagerTracingStub::CloudFilestoreManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -523,15 +521,9 @@ future CloudFilestoreManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudFilestoreManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.h index dbecfe6c64135..01a18b4c545a0 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace filestore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudFilestoreManagerTracingStub : public CloudFilestoreManagerStub { public: ~CloudFilestoreManagerTracingStub() override = default; @@ -251,8 +249,6 @@ class CloudFilestoreManagerTracingStub : public CloudFilestoreManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/financialservices/BUILD.bazel b/google/cloud/financialservices/BUILD.bazel index 48abe87cc2b9e..b3923fbc2ec5f 100644 --- a/google/cloud/financialservices/BUILD.bazel +++ b/google/cloud/financialservices/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/financialservices/v1:financialservices_cc_grpc", + "@googleapis//google/cloud/financialservices/v1:financialservices_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/financialservices/v1/aml_client.h b/google/cloud/financialservices/v1/aml_client.h index f5f75eafb5cb5..c0f1dcbe8f893 100644 --- a/google/cloud/financialservices/v1/aml_client.h +++ b/google/cloud/financialservices/v1/aml_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/financialservices/v1/aml_connection.h b/google/cloud/financialservices/v1/aml_connection.h index 80f2d830419f6..8ceb19974231b 100644 --- a/google/cloud/financialservices/v1/aml_connection.h +++ b/google/cloud/financialservices/v1/aml_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/financialservices/v1/aml_connection_idempotency_policy.h" #include "google/cloud/financialservices/v1/internal/aml_retry_traits.h" +#include "google/cloud/financialservices/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/financialservices/v1/aml_connection_idempotency_policy.h b/google/cloud/financialservices/v1/aml_connection_idempotency_policy.h index 3eea78edc8fcf..df420eb654d4e 100644 --- a/google/cloud/financialservices/v1/aml_connection_idempotency_policy.h +++ b/google/cloud/financialservices/v1/aml_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FINANCIALSERVICES_V1_AML_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FINANCIALSERVICES_V1_AML_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/financialservices/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/financialservices/v1/internal/aml_auth_decorator.cc b/google/cloud/financialservices/v1/internal/aml_auth_decorator.cc index 384ac2c136f35..d59ee81a204c0 100644 --- a/google/cloud/financialservices/v1/internal/aml_auth_decorator.cc +++ b/google/cloud/financialservices/v1/internal/aml_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/financialservices/v1/service.proto #include "google/cloud/financialservices/v1/internal/aml_auth_decorator.h" -#include +#include "google/cloud/financialservices/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_auth_decorator.h b/google/cloud/financialservices/v1/internal/aml_auth_decorator.h index 24309fc6a0bd9..31441412dc0f7 100644 --- a/google/cloud/financialservices/v1/internal/aml_auth_decorator.h +++ b/google/cloud/financialservices/v1/internal/aml_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/financialservices/v1/internal/aml_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_connection_impl.h b/google/cloud/financialservices/v1/internal/aml_connection_impl.h index 287594ed47c77..2b0fd0a6e88a6 100644 --- a/google/cloud/financialservices/v1/internal/aml_connection_impl.h +++ b/google/cloud/financialservices/v1/internal/aml_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/financialservices/v1/internal/aml_logging_decorator.cc b/google/cloud/financialservices/v1/internal/aml_logging_decorator.cc index 3e82b5bf591cf..7945aa20da28a 100644 --- a/google/cloud/financialservices/v1/internal/aml_logging_decorator.cc +++ b/google/cloud/financialservices/v1/internal/aml_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/financialservices/v1/service.proto #include "google/cloud/financialservices/v1/internal/aml_logging_decorator.h" +#include "google/cloud/financialservices/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_logging_decorator.h b/google/cloud/financialservices/v1/internal/aml_logging_decorator.h index c9fe5e3ac72a1..df5843dd2d860 100644 --- a/google/cloud/financialservices/v1/internal/aml_logging_decorator.h +++ b/google/cloud/financialservices/v1/internal/aml_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/financialservices/v1/internal/aml_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_metadata_decorator.cc b/google/cloud/financialservices/v1/internal/aml_metadata_decorator.cc index 8fe9c2a109d5d..01e98d0d90775 100644 --- a/google/cloud/financialservices/v1/internal/aml_metadata_decorator.cc +++ b/google/cloud/financialservices/v1/internal/aml_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/financialservices/v1/service.proto #include "google/cloud/financialservices/v1/internal/aml_metadata_decorator.h" +#include "google/cloud/financialservices/v1/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 #include #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_metadata_decorator.h b/google/cloud/financialservices/v1/internal/aml_metadata_decorator.h index 55f09f85019ff..55409fdcb1e75 100644 --- a/google/cloud/financialservices/v1/internal/aml_metadata_decorator.h +++ b/google/cloud/financialservices/v1/internal/aml_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/financialservices/v1/internal/aml_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_stub.cc b/google/cloud/financialservices/v1/internal/aml_stub.cc index 6e1cfed90b4e0..d49e759461ac7 100644 --- a/google/cloud/financialservices/v1/internal/aml_stub.cc +++ b/google/cloud/financialservices/v1/internal/aml_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/financialservices/v1/service.proto #include "google/cloud/financialservices/v1/internal/aml_stub.h" +#include "google/cloud/financialservices/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_stub.h b/google/cloud/financialservices/v1/internal/aml_stub.h index 5af27c9421f2c..f110bdfb5929b 100644 --- a/google/cloud/financialservices/v1/internal/aml_stub.h +++ b/google/cloud/financialservices/v1/internal/aml_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FINANCIALSERVICES_V1_INTERNAL_AML_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FINANCIALSERVICES_V1_INTERNAL_AML_STUB_H +#include "google/cloud/financialservices/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_stub_factory.cc b/google/cloud/financialservices/v1/internal/aml_stub_factory.cc index 961859ed78580..d5256df7793a6 100644 --- a/google/cloud/financialservices/v1/internal/aml_stub_factory.cc +++ b/google/cloud/financialservices/v1/internal/aml_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/financialservices/v1/internal/aml_metadata_decorator.h" #include "google/cloud/financialservices/v1/internal/aml_stub.h" #include "google/cloud/financialservices/v1/internal/aml_tracing_stub.h" +#include "google/cloud/financialservices/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/financialservices/v1/internal/aml_tracing_connection.cc b/google/cloud/financialservices/v1/internal/aml_tracing_connection.cc index 572faf72bce34..3888ef9edcc61 100644 --- a/google/cloud/financialservices/v1/internal/aml_tracing_connection.cc +++ b/google/cloud/financialservices/v1/internal/aml_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace financialservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AMLTracingConnection::AMLTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -995,15 +993,11 @@ Status AMLTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAMLTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/financialservices/v1/internal/aml_tracing_connection.h b/google/cloud/financialservices/v1/internal/aml_tracing_connection.h index a9c678ff98acb..9d3fa9ae9c402 100644 --- a/google/cloud/financialservices/v1/internal/aml_tracing_connection.h +++ b/google/cloud/financialservices/v1/internal/aml_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace financialservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AMLTracingConnection : public financialservices_v1::AMLConnection { public: ~AMLTracingConnection() override = default; @@ -451,8 +449,6 @@ class AMLTracingConnection : public financialservices_v1::AMLConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/financialservices/v1/internal/aml_tracing_stub.cc b/google/cloud/financialservices/v1/internal/aml_tracing_stub.cc index a26d273f122fe..558ff3ec73e5c 100644 --- a/google/cloud/financialservices/v1/internal/aml_tracing_stub.cc +++ b/google/cloud/financialservices/v1/internal/aml_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace financialservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AMLTracingStub::AMLTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -969,14 +967,8 @@ future AMLTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAMLTracingStub(std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/financialservices/v1/internal/aml_tracing_stub.h b/google/cloud/financialservices/v1/internal/aml_tracing_stub.h index b50169d3069b1..56465b0c0c7d1 100644 --- a/google/cloud/financialservices/v1/internal/aml_tracing_stub.h +++ b/google/cloud/financialservices/v1/internal/aml_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace financialservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AMLTracingStub : public AMLStub { public: ~AMLTracingStub() override = default; @@ -449,8 +447,6 @@ class AMLTracingStub : public AMLStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/functions/BUILD.bazel b/google/cloud/functions/BUILD.bazel index 6cc8a2816c353..8053f5d4fffcc 100644 --- a/google/cloud/functions/BUILD.bazel +++ b/google/cloud/functions/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/functions/v1:functions_cc_grpc", - "@com_google_googleapis//google/cloud/functions/v2:functions_cc_grpc", + "@googleapis//google/cloud/functions/v1:functions_cc_grpc", + "@googleapis//google/cloud/functions/v2:functions_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/functions/quickstart/.bazelrc b/google/cloud/functions/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/functions/quickstart/.bazelrc +++ b/google/cloud/functions/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/functions/v1/cloud_functions_client.h b/google/cloud/functions/v1/cloud_functions_client.h index e116b3013d810..9df9587855a81 100644 --- a/google/cloud/functions/v1/cloud_functions_client.h +++ b/google/cloud/functions/v1/cloud_functions_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v1/cloud_functions_connection.h b/google/cloud/functions/v1/cloud_functions_connection.h index 5148126e8e3c7..e137fef704cef 100644 --- a/google/cloud/functions/v1/cloud_functions_connection.h +++ b/google/cloud/functions/v1/cloud_functions_connection.h @@ -20,7 +20,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V1_CLOUD_FUNCTIONS_CONNECTION_H #include "google/cloud/functions/v1/cloud_functions_connection_idempotency_policy.h" +#include "google/cloud/functions/v1/functions.pb.h" #include "google/cloud/functions/v1/internal/cloud_functions_retry_traits.h" +#include "google/cloud/functions/v1/operations.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/functions/v1/cloud_functions_connection_idempotency_policy.h b/google/cloud/functions/v1/cloud_functions_connection_idempotency_policy.h index dbf704d99ea47..d009d41cff41b 100644 --- a/google/cloud/functions/v1/cloud_functions_connection_idempotency_policy.h +++ b/google/cloud/functions/v1/cloud_functions_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V1_CLOUD_FUNCTIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V1_CLOUD_FUNCTIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/functions/v1/functions.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.cc b/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.cc index 8f9395bc74818..2fc41928692bf 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/functions/v1/functions.proto #include "google/cloud/functions/v1/internal/cloud_functions_auth_decorator.h" -#include +#include "google/cloud/functions/v1/functions.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.h b/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.h index 46314a2382d5c..29dc1e400ef9d 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.h +++ b/google/cloud/functions/v1/internal/cloud_functions_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/functions/v1/internal/cloud_functions_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_connection_impl.h b/google/cloud/functions/v1/internal/cloud_functions_connection_impl.h index 92772b028fd0b..253cae4fe10d7 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_connection_impl.h +++ b/google/cloud/functions/v1/internal/cloud_functions_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.cc b/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.cc index de8615cf4ff1d..8b92bdab9bedf 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/functions/v1/functions.proto #include "google/cloud/functions/v1/internal/cloud_functions_logging_decorator.h" +#include "google/cloud/functions/v1/functions.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.h b/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.h index aecc062de652d..b8d51e2ea8c53 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.h +++ b/google/cloud/functions/v1/internal/cloud_functions_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/functions/v1/internal/cloud_functions_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.cc b/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.cc index 7d817465da42d..846da634eeb9d 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/functions/v1/functions.proto #include "google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.h" +#include "google/cloud/functions/v1/functions.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 #include #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.h b/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.h index 57b57419a0eeb..169cf1fda8ad9 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.h +++ b/google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/functions/v1/internal/cloud_functions_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_stub.cc b/google/cloud/functions/v1/internal/cloud_functions_stub.cc index 7651b9abc0cfa..a2a310e025e4f 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_stub.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/functions/v1/functions.proto #include "google/cloud/functions/v1/internal/cloud_functions_stub.h" +#include "google/cloud/functions/v1/functions.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_stub.h b/google/cloud/functions/v1/internal/cloud_functions_stub.h index 76f6e3c0917cb..5768a86828c91 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_stub.h +++ b/google/cloud/functions/v1/internal/cloud_functions_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V1_INTERNAL_CLOUD_FUNCTIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V1_INTERNAL_CLOUD_FUNCTIONS_STUB_H +#include "google/cloud/functions/v1/functions.grpc.pb.h" +#include "google/cloud/functions/v1/operations.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc b/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc index 325ff130ddb14..bbd3faaa7f285 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/functions/v1/functions.proto #include "google/cloud/functions/v1/internal/cloud_functions_stub_factory.h" +#include "google/cloud/functions/v1/functions.grpc.pb.h" #include "google/cloud/functions/v1/internal/cloud_functions_auth_decorator.h" #include "google/cloud/functions/v1/internal/cloud_functions_logging_decorator.h" #include "google/cloud/functions/v1/internal/cloud_functions_metadata_decorator.h" #include "google/cloud/functions/v1/internal/cloud_functions_stub.h" #include "google/cloud/functions/v1/internal/cloud_functions_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc b/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc index 89898fae8b7c1..912466a80482c 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace functions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudFunctionsServiceTracingConnection::CloudFunctionsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -226,17 +224,13 @@ CloudFunctionsServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudFunctionsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.h b/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.h index 800874f7b74d1..aaa7ab4e437af 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.h +++ b/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace functions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudFunctionsServiceTracingConnection : public functions_v1::CloudFunctionsServiceConnection { public: @@ -118,8 +116,6 @@ class CloudFunctionsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc b/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc index ab6dd00a64f65..d0e71eb597917 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace functions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudFunctionsServiceTracingStub::CloudFunctionsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -273,15 +271,9 @@ future CloudFunctionsServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudFunctionsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.h b/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.h index 561bc57abe08a..ca655160e8e5e 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.h +++ b/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace functions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudFunctionsServiceTracingStub : public CloudFunctionsServiceStub { public: ~CloudFunctionsServiceTracingStub() override = default; @@ -143,8 +141,6 @@ class CloudFunctionsServiceTracingStub : public CloudFunctionsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/functions/v2/function_client.h b/google/cloud/functions/v2/function_client.h index fac880133abfe..dc37c21ad77a9 100644 --- a/google/cloud/functions/v2/function_client.h +++ b/google/cloud/functions/v2/function_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v2/function_connection.h b/google/cloud/functions/v2/function_connection.h index 659f016d80800..c0bef604e9e50 100644 --- a/google/cloud/functions/v2/function_connection.h +++ b/google/cloud/functions/v2/function_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V2_FUNCTION_CONNECTION_H #include "google/cloud/functions/v2/function_connection_idempotency_policy.h" +#include "google/cloud/functions/v2/functions.pb.h" #include "google/cloud/functions/v2/internal/function_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/functions/v2/function_connection_idempotency_policy.h b/google/cloud/functions/v2/function_connection_idempotency_policy.h index c4de7695a2295..dcec773ffb722 100644 --- a/google/cloud/functions/v2/function_connection_idempotency_policy.h +++ b/google/cloud/functions/v2/function_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V2_FUNCTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V2_FUNCTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/functions/v2/functions.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/functions/v2/internal/function_auth_decorator.cc b/google/cloud/functions/v2/internal/function_auth_decorator.cc index 24a6647e9085e..00e6e349c0500 100644 --- a/google/cloud/functions/v2/internal/function_auth_decorator.cc +++ b/google/cloud/functions/v2/internal/function_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/functions/v2/functions.proto #include "google/cloud/functions/v2/internal/function_auth_decorator.h" -#include +#include "google/cloud/functions/v2/functions.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v2/internal/function_auth_decorator.h b/google/cloud/functions/v2/internal/function_auth_decorator.h index 618439e61377e..156ae7de4f409 100644 --- a/google/cloud/functions/v2/internal/function_auth_decorator.h +++ b/google/cloud/functions/v2/internal/function_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/functions/v2/internal/function_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v2/internal/function_connection_impl.h b/google/cloud/functions/v2/internal/function_connection_impl.h index 8cac7d09ef637..e577e4e73e350 100644 --- a/google/cloud/functions/v2/internal/function_connection_impl.h +++ b/google/cloud/functions/v2/internal/function_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/functions/v2/internal/function_logging_decorator.cc b/google/cloud/functions/v2/internal/function_logging_decorator.cc index 0cb12ff8e9a3b..a4f6d08c23775 100644 --- a/google/cloud/functions/v2/internal/function_logging_decorator.cc +++ b/google/cloud/functions/v2/internal/function_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/functions/v2/functions.proto #include "google/cloud/functions/v2/internal/function_logging_decorator.h" +#include "google/cloud/functions/v2/functions.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/functions/v2/internal/function_logging_decorator.h b/google/cloud/functions/v2/internal/function_logging_decorator.h index 47ab7ad1eb567..501aa5b29065b 100644 --- a/google/cloud/functions/v2/internal/function_logging_decorator.h +++ b/google/cloud/functions/v2/internal/function_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/functions/v2/internal/function_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v2/internal/function_metadata_decorator.cc b/google/cloud/functions/v2/internal/function_metadata_decorator.cc index 9caa21fe31ef9..d45856f872845 100644 --- a/google/cloud/functions/v2/internal/function_metadata_decorator.cc +++ b/google/cloud/functions/v2/internal/function_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/functions/v2/functions.proto #include "google/cloud/functions/v2/internal/function_metadata_decorator.h" +#include "google/cloud/functions/v2/functions.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 #include #include #include diff --git a/google/cloud/functions/v2/internal/function_metadata_decorator.h b/google/cloud/functions/v2/internal/function_metadata_decorator.h index fa804a69afc4e..f7e06a106f952 100644 --- a/google/cloud/functions/v2/internal/function_metadata_decorator.h +++ b/google/cloud/functions/v2/internal/function_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/functions/v2/internal/function_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/functions/v2/internal/function_stub.cc b/google/cloud/functions/v2/internal/function_stub.cc index c8f6e47f536ec..dcb6834042c98 100644 --- a/google/cloud/functions/v2/internal/function_stub.cc +++ b/google/cloud/functions/v2/internal/function_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/functions/v2/functions.proto #include "google/cloud/functions/v2/internal/function_stub.h" +#include "google/cloud/functions/v2/functions.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v2/internal/function_stub.h b/google/cloud/functions/v2/internal/function_stub.h index ec66b556d7fb2..f4d33dc0e2221 100644 --- a/google/cloud/functions/v2/internal/function_stub.h +++ b/google/cloud/functions/v2/internal/function_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V2_INTERNAL_FUNCTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_V2_INTERNAL_FUNCTION_STUB_H +#include "google/cloud/functions/v2/functions.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v2/internal/function_stub_factory.cc b/google/cloud/functions/v2/internal/function_stub_factory.cc index 46308b77b82ae..aa157952169a0 100644 --- a/google/cloud/functions/v2/internal/function_stub_factory.cc +++ b/google/cloud/functions/v2/internal/function_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/functions/v2/functions.proto #include "google/cloud/functions/v2/internal/function_stub_factory.h" +#include "google/cloud/functions/v2/functions.grpc.pb.h" #include "google/cloud/functions/v2/internal/function_auth_decorator.h" #include "google/cloud/functions/v2/internal/function_logging_decorator.h" #include "google/cloud/functions/v2/internal/function_metadata_decorator.h" #include "google/cloud/functions/v2/internal/function_stub.h" #include "google/cloud/functions/v2/internal/function_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/functions/v2/internal/function_tracing_connection.cc b/google/cloud/functions/v2/internal/function_tracing_connection.cc index 903893bf801d8..364270b72b18c 100644 --- a/google/cloud/functions/v2/internal/function_tracing_connection.cc +++ b/google/cloud/functions/v2/internal/function_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace functions_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FunctionServiceTracingConnection::FunctionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -225,16 +223,12 @@ FunctionServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFunctionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/functions/v2/internal/function_tracing_connection.h b/google/cloud/functions/v2/internal/function_tracing_connection.h index eff24648fa6cd..f9d8295ef2c01 100644 --- a/google/cloud/functions/v2/internal/function_tracing_connection.h +++ b/google/cloud/functions/v2/internal/function_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace functions_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FunctionServiceTracingConnection : public functions_v2::FunctionServiceConnection { public: @@ -118,8 +116,6 @@ class FunctionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/functions/v2/internal/function_tracing_stub.cc b/google/cloud/functions/v2/internal/function_tracing_stub.cc index 549b3e3113481..89736d421d354 100644 --- a/google/cloud/functions/v2/internal/function_tracing_stub.cc +++ b/google/cloud/functions/v2/internal/function_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace functions_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FunctionServiceTracingStub::FunctionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -271,15 +269,9 @@ future FunctionServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFunctionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/functions/v2/internal/function_tracing_stub.h b/google/cloud/functions/v2/internal/function_tracing_stub.h index aec1e7f0f8ed2..3f49b9c59df0d 100644 --- a/google/cloud/functions/v2/internal/function_tracing_stub.h +++ b/google/cloud/functions/v2/internal/function_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace functions_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FunctionServiceTracingStub : public FunctionServiceStub { public: ~FunctionServiceTracingStub() override = default; @@ -143,8 +141,6 @@ class FunctionServiceTracingStub : public FunctionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/gkebackup/BUILD.bazel b/google/cloud/gkebackup/BUILD.bazel index 8a288759bd8e3..b8f01aa36d207 100644 --- a/google/cloud/gkebackup/BUILD.bazel +++ b/google/cloud/gkebackup/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/gkebackup/v1:gkebackup_cc_grpc", + "@googleapis//google/cloud/gkebackup/v1:gkebackup_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/gkebackup/quickstart/.bazelrc b/google/cloud/gkebackup/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/gkebackup/quickstart/.bazelrc +++ b/google/cloud/gkebackup/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/gkebackup/v1/backup_for_gke_client.h b/google/cloud/gkebackup/v1/backup_for_gke_client.h index 4d1d11dece224..0111576cc8442 100644 --- a/google/cloud/gkebackup/v1/backup_for_gke_client.h +++ b/google/cloud/gkebackup/v1/backup_for_gke_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkebackup/v1/backup_for_gke_connection.h b/google/cloud/gkebackup/v1/backup_for_gke_connection.h index 9468b0a0370e4..fbf18ca108fe3 100644 --- a/google/cloud/gkebackup/v1/backup_for_gke_connection.h +++ b/google/cloud/gkebackup/v1/backup_for_gke_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEBACKUP_V1_BACKUP_FOR_GKE_CONNECTION_H #include "google/cloud/gkebackup/v1/backup_for_gke_connection_idempotency_policy.h" +#include "google/cloud/gkebackup/v1/gkebackup.pb.h" #include "google/cloud/gkebackup/v1/internal/backup_for_gke_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkebackup/v1/backup_for_gke_connection_idempotency_policy.h b/google/cloud/gkebackup/v1/backup_for_gke_connection_idempotency_policy.h index 2533656d8c920..c9daaba1393c9 100644 --- a/google/cloud/gkebackup/v1/backup_for_gke_connection_idempotency_policy.h +++ b/google/cloud/gkebackup/v1/backup_for_gke_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEBACKUP_V1_BACKUP_FOR_GKE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEBACKUP_V1_BACKUP_FOR_GKE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/gkebackup/v1/gkebackup.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.cc index 946f09430517d..0093a45c8980e 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/gkebackup/v1/gkebackup.proto #include "google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.h" -#include +#include "google/cloud/gkebackup/v1/gkebackup.grpc.pb.h" #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.h index 699de79cef6ea..64c9f0e64a36b 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_connection_impl.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_connection_impl.h index eedc5b4518933..b43f6c805c33c 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_connection_impl.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.cc index 4209c8643539a..6ddca53fad318 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/gkebackup/v1/gkebackup.proto #include "google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.h" +#include "google/cloud/gkebackup/v1/gkebackup.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.h index 9f13314f97a7a..2e7c3c1b037ae 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.cc index 0442a0953e3a2..fe593518e7231 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/gkebackup/v1/gkebackup.proto #include "google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.h" +#include "google/cloud/gkebackup/v1/gkebackup.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 #include #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.h index 3141a0834afec..7e770a7c24b0b 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc index 7ba2224adc835..d30d97d351c14 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/gkebackup/v1/gkebackup.proto #include "google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h" +#include "google/cloud/gkebackup/v1/gkebackup.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h index 84c5aec8daa1e..b9138d3c2195d 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEBACKUP_V1_INTERNAL_BACKUP_FOR_GKE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEBACKUP_V1_INTERNAL_BACKUP_FOR_GKE_STUB_H +#include "google/cloud/gkebackup/v1/gkebackup.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc index 8301ee879d929..6bf65a763f491 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/gkebackup/v1/gkebackup.proto #include "google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.h" +#include "google/cloud/gkebackup/v1/gkebackup.grpc.pb.h" #include "google/cloud/gkebackup/v1/internal/backup_for_gke_auth_decorator.h" #include "google/cloud/gkebackup/v1/internal/backup_for_gke_logging_decorator.h" #include "google/cloud/gkebackup/v1/internal/backup_for_gke_metadata_decorator.h" #include "google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h" #include "google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc index 5eb1a272a1e37..d39bf76bf57f2 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace gkebackup_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BackupForGKETracingConnection::BackupForGKETracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -865,16 +863,12 @@ Status BackupForGKETracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBackupForGKETracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.h index dd7ac1ab4bb0e..ff51dc211ac2b 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace gkebackup_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BackupForGKETracingConnection : public gkebackup_v1::BackupForGKEConnection { public: @@ -377,8 +375,6 @@ class BackupForGKETracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc index 68143e42fb58a..54629aaf8474b 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace gkebackup_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - BackupForGKETracingStub::BackupForGKETracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -895,15 +893,9 @@ future BackupForGKETracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeBackupForGKETracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.h index c5d0a0ef2d631..997ad3025f669 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace gkebackup_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class BackupForGKETracingStub : public BackupForGKEStub { public: ~BackupForGKETracingStub() override = default; @@ -419,8 +417,6 @@ class BackupForGKETracingStub : public BackupForGKEStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/gkeconnect/BUILD.bazel b/google/cloud/gkeconnect/BUILD.bazel index 261e6fe5d10db..f4b07554bd4a8 100644 --- a/google/cloud/gkeconnect/BUILD.bazel +++ b/google/cloud/gkeconnect/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["gateway/v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/gkeconnect/gateway/v1:gateway_cc_proto", + "@googleapis//google/cloud/gkeconnect/gateway/v1:gateway_cc_proto", ] cc_gapic_library( diff --git a/google/cloud/gkeconnect/gateway/v1/gateway_control_connection.h b/google/cloud/gkeconnect/gateway/v1/gateway_control_connection.h index 8a89cc3b1b49b..d89ea71250698 100644 --- a/google/cloud/gkeconnect/gateway/v1/gateway_control_connection.h +++ b/google/cloud/gkeconnect/gateway/v1/gateway_control_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_GATEWAY_CONTROL_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_GATEWAY_CONTROL_CONNECTION_H +#include "google/cloud/gkeconnect/gateway/v1/control.pb.h" #include "google/cloud/gkeconnect/gateway/v1/gateway_control_connection_idempotency_policy.h" #include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/gkeconnect/gateway/v1/gateway_control_connection_idempotency_policy.h b/google/cloud/gkeconnect/gateway/v1/gateway_control_connection_idempotency_policy.h index cfb48ccdff9a6..9c4a9e0ece5bb 100644 --- a/google/cloud/gkeconnect/gateway/v1/gateway_control_connection_idempotency_policy.h +++ b/google/cloud/gkeconnect/gateway/v1/gateway_control_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_GATEWAY_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_GATEWAY_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/gkeconnect/gateway/v1/control.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_logging_decorator.h b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_logging_decorator.h index ab0a20fa4a9ce..93efbb5bcdd2d 100644 --- a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_logging_decorator.h +++ b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_INTERNAL_GATEWAY_CONTROL_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_INTERNAL_GATEWAY_CONTROL_REST_LOGGING_DECORATOR_H +#include "google/cloud/gkeconnect/gateway/v1/control.pb.h" #include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_metadata_decorator.h b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_metadata_decorator.h index 8f329c6df9183..dc9a6afe1b536 100644 --- a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_metadata_decorator.h +++ b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_INTERNAL_GATEWAY_CONTROL_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_INTERNAL_GATEWAY_CONTROL_REST_METADATA_DECORATOR_H +#include "google/cloud/gkeconnect/gateway/v1/control.pb.h" #include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.cc b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.cc index a1e2d2c97c7c2..e5c38dd88d45a 100644 --- a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.cc +++ b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/gkeconnect/gateway/v1/control.proto #include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h" +#include "google/cloud/gkeconnect/gateway/v1/control.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h index 07ca3b054ae73..e21908d93893a 100644 --- a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h +++ b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_INTERNAL_GATEWAY_CONTROL_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_INTERNAL_GATEWAY_CONTROL_REST_STUB_H +#include "google/cloud/gkeconnect/gateway/v1/control.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.cc b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.cc index ff35f16b8fc39..5f2d0fc2e004b 100644 --- a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.cc +++ b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace gkeconnect_gateway_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GatewayControlTracingConnection::GatewayControlTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -42,16 +40,12 @@ GatewayControlTracingConnection::GenerateCredentials( return internal::EndSpan(*span, child_->GenerateCredentials(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGatewayControlTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.h b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.h index 96a153f93c7ee..bebbca68cf8f7 100644 --- a/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.h +++ b/google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace gkeconnect_gateway_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GatewayControlTracingConnection : public gkeconnect_gateway_v1::GatewayControlConnection { public: @@ -49,8 +47,6 @@ class GatewayControlTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/gkeconnect/quickstart/.bazelrc b/google/cloud/gkeconnect/quickstart/.bazelrc index e676fbffccb52..d313ebed860ce 100644 --- a/google/cloud/gkeconnect/quickstart/.bazelrc +++ b/google/cloud/gkeconnect/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds diff --git a/google/cloud/gkehub/BUILD.bazel b/google/cloud/gkehub/BUILD.bazel index 45d1e842363c2..f7436851376fa 100644 --- a/google/cloud/gkehub/BUILD.bazel +++ b/google/cloud/gkehub/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/gkehub/v1:gkehub_cc_grpc", + "@googleapis//google/cloud/gkehub/v1:gkehub_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/gkehub/quickstart/.bazelrc b/google/cloud/gkehub/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/gkehub/quickstart/.bazelrc +++ b/google/cloud/gkehub/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/gkehub/v1/gke_hub_client.h b/google/cloud/gkehub/v1/gke_hub_client.h index 64fc34e31f235..78d2bf0504773 100644 --- a/google/cloud/gkehub/v1/gke_hub_client.h +++ b/google/cloud/gkehub/v1/gke_hub_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkehub/v1/gke_hub_connection.h b/google/cloud/gkehub/v1/gke_hub_connection.h index ea7eaca78469b..c5f5cf4e9373c 100644 --- a/google/cloud/gkehub/v1/gke_hub_connection.h +++ b/google/cloud/gkehub/v1/gke_hub_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/gkehub/v1/gke_hub_connection_idempotency_policy.h" #include "google/cloud/gkehub/v1/internal/gke_hub_retry_traits.h" +#include "google/cloud/gkehub/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkehub/v1/gke_hub_connection_idempotency_policy.h b/google/cloud/gkehub/v1/gke_hub_connection_idempotency_policy.h index 52ca8fd282b8b..ed3b048ad6e35 100644 --- a/google/cloud/gkehub/v1/gke_hub_connection_idempotency_policy.h +++ b/google/cloud/gkehub/v1/gke_hub_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_V1_GKE_HUB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_V1_GKE_HUB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/gkehub/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.cc b/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.cc index 30151da6d361c..2e7219655312d 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/gkehub/v1/service.proto #include "google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.h" -#include +#include "google/cloud/gkehub/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.h b/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.h index d8c6cee5ed743..0cf2a0833ca79 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkehub/v1/internal/gke_hub_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_connection_impl.h b/google/cloud/gkehub/v1/internal/gke_hub_connection_impl.h index bcb6f9314c17c..a72fa5c93dd9e 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_connection_impl.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.cc b/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.cc index a5ebda98ce7e4..7bc8d6806b58e 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/gkehub/v1/service.proto #include "google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.h" +#include "google/cloud/gkehub/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.h b/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.h index a15a9df983385..08023fd927ef9 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkehub/v1/internal/gke_hub_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.cc b/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.cc index e29fda5f0d754..902bcd7355893 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/gkehub/v1/service.proto #include "google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.h" +#include "google/cloud/gkehub/v1/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 #include #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.h b/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.h index 89304ca5e359c..fc2fcad3b8742 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkehub/v1/internal/gke_hub_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_stub.cc b/google/cloud/gkehub/v1/internal/gke_hub_stub.cc index ba6daca946c4c..44fd95b74e387 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_stub.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/gkehub/v1/service.proto #include "google/cloud/gkehub/v1/internal/gke_hub_stub.h" +#include "google/cloud/gkehub/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_stub.h b/google/cloud/gkehub/v1/internal/gke_hub_stub.h index 99e9e570b8986..856238661817a 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_stub.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_V1_INTERNAL_GKE_HUB_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_V1_INTERNAL_GKE_HUB_STUB_H +#include "google/cloud/gkehub/v1/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_stub_factory.cc b/google/cloud/gkehub/v1/internal/gke_hub_stub_factory.cc index 7b771eccde711..e84e05ce50e0c 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_stub_factory.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/gkehub/v1/internal/gke_hub_metadata_decorator.h" #include "google/cloud/gkehub/v1/internal/gke_hub_stub.h" #include "google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.h" +#include "google/cloud/gkehub/v1/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 #include #include diff --git a/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc b/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc index 3bc02d3fb30ee..2d55094264f77 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace gkehub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GkeHubTracingConnection::GkeHubTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -241,15 +239,11 @@ GkeHubTracingConnection::GenerateConnectManifest( return internal::EndSpan(*span, child_->GenerateConnectManifest(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGkeHubTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.h b/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.h index f468068931d04..2c0283d111e1b 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace gkehub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GkeHubTracingConnection : public gkehub_v1::GkeHubConnection { public: ~GkeHubTracingConnection() override = default; @@ -126,8 +124,6 @@ class GkeHubTracingConnection : public gkehub_v1::GkeHubConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc b/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc index d146f4ba204b2..f968c22847327 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace gkehub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GkeHubTracingStub::GkeHubTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -272,15 +270,9 @@ future GkeHubTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGkeHubTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.h b/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.h index 3fd23539413a5..2ecfd935c5f5c 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace gkehub_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GkeHubTracingStub : public GkeHubStub { public: ~GkeHubTracingStub() override = default; @@ -145,8 +143,6 @@ class GkeHubTracingStub : public GkeHubStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/gkemulticloud/BUILD.bazel b/google/cloud/gkemulticloud/BUILD.bazel index 99f253e0c7805..5a571bc693826 100644 --- a/google/cloud/gkemulticloud/BUILD.bazel +++ b/google/cloud/gkemulticloud/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/gkemulticloud/v1:gkemulticloud_cc_grpc", + "@googleapis//google/cloud/gkemulticloud/v1:gkemulticloud_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/gkemulticloud/quickstart/.bazelrc b/google/cloud/gkemulticloud/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/gkemulticloud/quickstart/.bazelrc +++ b/google/cloud/gkemulticloud/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/gkemulticloud/v1/attached_clusters_client.h b/google/cloud/gkemulticloud/v1/attached_clusters_client.h index afc169b49b55b..4cc9017252d00 100644 --- a/google/cloud/gkemulticloud/v1/attached_clusters_client.h +++ b/google/cloud/gkemulticloud/v1/attached_clusters_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/attached_clusters_connection.h b/google/cloud/gkemulticloud/v1/attached_clusters_connection.h index ca17124d77b07..d788925f48c91 100644 --- a/google/cloud/gkemulticloud/v1/attached_clusters_connection.h +++ b/google/cloud/gkemulticloud/v1/attached_clusters_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_ATTACHED_CLUSTERS_CONNECTION_H #include "google/cloud/gkemulticloud/v1/attached_clusters_connection_idempotency_policy.h" +#include "google/cloud/gkemulticloud/v1/attached_service.pb.h" #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/attached_clusters_connection_idempotency_policy.h b/google/cloud/gkemulticloud/v1/attached_clusters_connection_idempotency_policy.h index 560d371e2aeef..ee1e5a593e04c 100644 --- a/google/cloud/gkemulticloud/v1/attached_clusters_connection_idempotency_policy.h +++ b/google/cloud/gkemulticloud/v1/attached_clusters_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_ATTACHED_CLUSTERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_ATTACHED_CLUSTERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/gkemulticloud/v1/attached_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkemulticloud/v1/aws_clusters_client.h b/google/cloud/gkemulticloud/v1/aws_clusters_client.h index 53c66cbadd83c..dfd792afbf77a 100644 --- a/google/cloud/gkemulticloud/v1/aws_clusters_client.h +++ b/google/cloud/gkemulticloud/v1/aws_clusters_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/aws_clusters_connection.h b/google/cloud/gkemulticloud/v1/aws_clusters_connection.h index 8aa2f8ef2a2ba..065801f466420 100644 --- a/google/cloud/gkemulticloud/v1/aws_clusters_connection.h +++ b/google/cloud/gkemulticloud/v1/aws_clusters_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_AWS_CLUSTERS_CONNECTION_H #include "google/cloud/gkemulticloud/v1/aws_clusters_connection_idempotency_policy.h" +#include "google/cloud/gkemulticloud/v1/aws_service.pb.h" #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/aws_clusters_connection_idempotency_policy.h b/google/cloud/gkemulticloud/v1/aws_clusters_connection_idempotency_policy.h index 078a5c4c5b1f0..1d58d13cc9a3d 100644 --- a/google/cloud/gkemulticloud/v1/aws_clusters_connection_idempotency_policy.h +++ b/google/cloud/gkemulticloud/v1/aws_clusters_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_AWS_CLUSTERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_AWS_CLUSTERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/gkemulticloud/v1/aws_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkemulticloud/v1/azure_clusters_client.h b/google/cloud/gkemulticloud/v1/azure_clusters_client.h index 8e5852b19683c..da8e04ba88dbf 100644 --- a/google/cloud/gkemulticloud/v1/azure_clusters_client.h +++ b/google/cloud/gkemulticloud/v1/azure_clusters_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/azure_clusters_connection.h b/google/cloud/gkemulticloud/v1/azure_clusters_connection.h index dd0cdb8975a5d..cba4e00dbc475 100644 --- a/google/cloud/gkemulticloud/v1/azure_clusters_connection.h +++ b/google/cloud/gkemulticloud/v1/azure_clusters_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_AZURE_CLUSTERS_CONNECTION_H #include "google/cloud/gkemulticloud/v1/azure_clusters_connection_idempotency_policy.h" +#include "google/cloud/gkemulticloud/v1/azure_service.pb.h" #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/azure_clusters_connection_idempotency_policy.h b/google/cloud/gkemulticloud/v1/azure_clusters_connection_idempotency_policy.h index 1e2fd0d1371cf..802b407a87053 100644 --- a/google/cloud/gkemulticloud/v1/azure_clusters_connection_idempotency_policy.h +++ b/google/cloud/gkemulticloud/v1/azure_clusters_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_AZURE_CLUSTERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_AZURE_CLUSTERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/gkemulticloud/v1/azure_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.cc index 357e70bbeb82f..41eb18fa279c6 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/gkemulticloud/v1/attached_service.proto #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.h" -#include +#include "google/cloud/gkemulticloud/v1/attached_service.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.h index 5c4a108b325ee..fa354d36cbbb9 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_connection_impl.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_connection_impl.h index 48e5b4e0400d5..e9768d97506dc 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_connection_impl.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.cc index f036ace8760f4..d6d83745eca76 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/gkemulticloud/v1/attached_service.proto #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.h" +#include "google/cloud/gkemulticloud/v1/attached_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.h index 41601b292649b..ebebcda6ba6f7 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.cc index 86feb109333cd..7f828deb261cc 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/gkemulticloud/v1/attached_service.proto #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.h" +#include "google/cloud/gkemulticloud/v1/attached_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 #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.h index 4fd89d2e92e84..6316007e3ad70 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc index feb606bddf18e..668f507a5f2bd 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/gkemulticloud/v1/attached_service.proto #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h" +#include "google/cloud/gkemulticloud/v1/attached_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h index 6e6315dcf91d9..a5997b6d92cdf 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_INTERNAL_ATTACHED_CLUSTERS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_INTERNAL_ATTACHED_CLUSTERS_STUB_H +#include "google/cloud/gkemulticloud/v1/attached_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc index 9c45b6608d7de..1e8fd175e5ac4 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/gkemulticloud/v1/attached_service.proto #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.h" +#include "google/cloud/gkemulticloud/v1/attached_service.grpc.pb.h" #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_auth_decorator.h" #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_logging_decorator.h" #include "google/cloud/gkemulticloud/v1/internal/attached_clusters_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc index c66551b2fa4c4..cfcadc58044f1 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AttachedClustersTracingConnection::AttachedClustersTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -259,16 +257,12 @@ Status AttachedClustersTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAttachedClustersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.h index 520e14e599ded..0491b3d771286 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AttachedClustersTracingConnection : public gkemulticloud_v1::AttachedClustersConnection { public: @@ -140,8 +138,6 @@ class AttachedClustersTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc index eab7411ae8f87..18a21145cda45 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AttachedClustersTracingStub::AttachedClustersTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -303,15 +301,9 @@ future AttachedClustersTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAttachedClustersTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.h index 6f3167213db9e..dc6fbf11b424d 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AttachedClustersTracingStub : public AttachedClustersStub { public: ~AttachedClustersTracingStub() override = default; @@ -154,8 +152,6 @@ class AttachedClustersTracingStub : public AttachedClustersStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.cc index a0a593e64c6c2..1518720ab02f3 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/gkemulticloud/v1/aws_service.proto #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.h" -#include +#include "google/cloud/gkemulticloud/v1/aws_service.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.h index 701d6b13de85d..2441cd92be021 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_connection_impl.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_connection_impl.h index e7af3fa9bec0b..0fb3140f85690 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_connection_impl.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.cc index 179a782c9998f..9067bdc83cd73 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/gkemulticloud/v1/aws_service.proto #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.h" +#include "google/cloud/gkemulticloud/v1/aws_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.h index bbe9600c70b0a..f6c49e15a6d5b 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.cc index 659a7e9088046..48ba3d4a6477e 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/gkemulticloud/v1/aws_service.proto #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.h" +#include "google/cloud/gkemulticloud/v1/aws_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 #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.h index 843c075fc3485..cabfdb1ce562a 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc index 4ec0aa0de4e4d..ba59dc464f7c2 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/gkemulticloud/v1/aws_service.proto #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h" +#include "google/cloud/gkemulticloud/v1/aws_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h index b4ab4c5e7fea6..a01fbf2f141d2 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_INTERNAL_AWS_CLUSTERS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_INTERNAL_AWS_CLUSTERS_STUB_H +#include "google/cloud/gkemulticloud/v1/aws_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc index 4bdd085079315..eff0206ec77fe 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/gkemulticloud/v1/aws_service.proto #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.h" +#include "google/cloud/gkemulticloud/v1/aws_service.grpc.pb.h" #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_auth_decorator.h" #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_logging_decorator.h" #include "google/cloud/gkemulticloud/v1/internal/aws_clusters_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc index 28db0f1acfa31..f4c81f693d045 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AwsClustersTracingConnection::AwsClustersTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -374,16 +372,12 @@ Status AwsClustersTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAwsClustersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.h index 3088dd3fdb166..092a587e5bf98 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AwsClustersTracingConnection : public gkemulticloud_v1::AwsClustersConnection { public: @@ -189,8 +187,6 @@ class AwsClustersTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc index e64946ef4bae2..02e2ef9b2d970 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AwsClustersTracingStub::AwsClustersTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -412,15 +410,9 @@ future AwsClustersTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAwsClustersTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.h index 47543c32eccd9..6315be7a0eecc 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AwsClustersTracingStub : public AwsClustersStub { public: ~AwsClustersTracingStub() override = default; @@ -209,8 +207,6 @@ class AwsClustersTracingStub : public AwsClustersStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.cc index 6513c1bf3a639..195e2f59873e3 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/gkemulticloud/v1/azure_service.proto #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.h" -#include +#include "google/cloud/gkemulticloud/v1/azure_service.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.h index 40e523e49b80f..852f909490003 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_connection_impl.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_connection_impl.h index 54059df5b4e00..8e48200227a28 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_connection_impl.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.cc index 38021f53bd782..61b9ebfb37275 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/gkemulticloud/v1/azure_service.proto #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.h" +#include "google/cloud/gkemulticloud/v1/azure_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.h index c2fa1cedeb190..7a2aa63d2ea5f 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.cc index f1770609da468..e5751a7802061 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/gkemulticloud/v1/azure_service.proto #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.h" +#include "google/cloud/gkemulticloud/v1/azure_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 #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.h index 15e846d3299df..98404b25c5d50 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc index b822947551440..5308b4fa22623 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/gkemulticloud/v1/azure_service.proto #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h" +#include "google/cloud/gkemulticloud/v1/azure_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h index dcff4271e4239..78d85125b9ed9 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_INTERNAL_AZURE_CLUSTERS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEMULTICLOUD_V1_INTERNAL_AZURE_CLUSTERS_STUB_H +#include "google/cloud/gkemulticloud/v1/azure_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc index 4986128276710..dd94624eb9ab1 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/gkemulticloud/v1/azure_service.proto #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.h" +#include "google/cloud/gkemulticloud/v1/azure_service.grpc.pb.h" #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_auth_decorator.h" #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_logging_decorator.h" #include "google/cloud/gkemulticloud/v1/internal/azure_clusters_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc index 6a238f10a9e51..d010b49d6f929 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AzureClustersTracingConnection::AzureClustersTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -443,16 +441,12 @@ Status AzureClustersTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAzureClustersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.h index cd07b735fa9fd..13e9b4815d941 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AzureClustersTracingConnection : public gkemulticloud_v1::AzureClustersConnection { public: @@ -210,8 +208,6 @@ class AzureClustersTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc index f438bddcfeba5..46c329bf95ba1 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AzureClustersTracingStub::AzureClustersTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -476,15 +474,9 @@ future AzureClustersTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAzureClustersTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.h index 7dfd868eef17a..713d0eb0ad56a 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace gkemulticloud_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AzureClustersTracingStub : public AzureClustersStub { public: ~AzureClustersTracingStub() override = default; @@ -232,8 +230,6 @@ class AzureClustersTracingStub : public AzureClustersStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/google_cloud_cpp_common.cmake b/google/cloud/google_cloud_cpp_common.cmake index 773857ef720d1..8e067558e8fb5 100644 --- a/google/cloud/google_cloud_cpp_common.cmake +++ b/google/cloud/google_cloud_cpp_common.cmake @@ -202,10 +202,6 @@ if (opentelemetry IN_LIST GOOGLE_CLOUD_CPP_ENABLE) if (opentelemetry-cpp_FOUND) target_link_libraries(google_cloud_cpp_common PUBLIC opentelemetry-cpp::api) - target_compile_definitions( - google_cloud_cpp_common - PUBLIC # Enable OpenTelemetry features in google-cloud-cpp - GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY) set(GOOGLE_CLOUD_CPP_FIND_OPTIONAL_DEPENDENCIES "find_dependency(opentelemetry-cpp)") set(GOOGLE_CLOUD_CPP_OPENTELEMETRY_API "opentelemetry_api") diff --git a/google/cloud/google_cloud_cpp_rest_internal.cmake b/google/cloud/google_cloud_cpp_rest_internal.cmake index fd8187f4f44ec..3d38991523870 100644 --- a/google/cloud/google_cloud_cpp_rest_internal.cmake +++ b/google/cloud/google_cloud_cpp_rest_internal.cmake @@ -14,7 +14,7 @@ # limitations under the License. # ~~~ -include(IncludeNlohmannJson) +find_package(nlohmann_json CONFIG REQUIRED) find_package(CURL REQUIRED) if (NOT WIN32) find_package(OpenSSL REQUIRED) diff --git a/google/cloud/grpc_error_delegate.cc b/google/cloud/grpc_error_delegate.cc index 27816aa7a9f4b..fcda02086e17c 100644 --- a/google/cloud/grpc_error_delegate.cc +++ b/google/cloud/grpc_error_delegate.cc @@ -15,9 +15,9 @@ #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/status_payload_keys.h" #include "absl/types/optional.h" -#include +#include "google/protobuf/any.pb.h" +#include "google/rpc/error_details.pb.h" #include -#include namespace google { namespace cloud { diff --git a/google/cloud/grpc_error_delegate.h b/google/cloud/grpc_error_delegate.h index a2c91ceb2ec87..f1b7151f5c8a9 100644 --- a/google/cloud/grpc_error_delegate.h +++ b/google/cloud/grpc_error_delegate.h @@ -17,7 +17,7 @@ #include "google/cloud/status.h" #include "google/cloud/version.h" -#include +#include "google/rpc/status.pb.h" #include #include diff --git a/google/cloud/grpc_error_delegate_test.cc b/google/cloud/grpc_error_delegate_test.cc index 2a9ac50374800..3c8c80991fa20 100644 --- a/google/cloud/grpc_error_delegate_test.cc +++ b/google/cloud/grpc_error_delegate_test.cc @@ -15,7 +15,7 @@ #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/status_payload_keys.h" #include "google/cloud/internal/time_utils.h" -#include +#include "google/rpc/error_details.pb.h" #include namespace google { diff --git a/google/cloud/iam/BUILD.bazel b/google/cloud/iam/BUILD.bazel index 48bd99fa12405..97458a4d5c5a6 100644 --- a/google/cloud/iam/BUILD.bazel +++ b/google/cloud/iam/BUILD.bazel @@ -28,11 +28,11 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/iam/admin/v1:admin_cc_grpc", - "@com_google_googleapis//google/iam/credentials/v1:credentials_cc_grpc", - "@com_google_googleapis//google/iam/v1:iam_cc_grpc", - "@com_google_googleapis//google/iam/v2:iam_cc_grpc", - "@com_google_googleapis//google/iam/v3:iam_cc_grpc", + "@googleapis//google/iam/admin/v1:admin_cc_grpc", + "@googleapis//google/iam/credentials/v1:credentials_cc_grpc", + "@googleapis//google/iam/v1:iam_cc_grpc", + "@googleapis//google/iam/v2:iam_cc_grpc", + "@googleapis//google/iam/v3:iam_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/iam/admin/v1/iam_connection.h b/google/cloud/iam/admin/v1/iam_connection.h index 3873617ccde5a..1f7680a56a913 100644 --- a/google/cloud/iam/admin/v1/iam_connection.h +++ b/google/cloud/iam/admin/v1/iam_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/iam/admin/v1/iam.pb.h" #include namespace google { diff --git a/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h b/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h index 1d6b9246208b7..c4bf5332e5dc7 100644 --- a/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h +++ b/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc b/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc index 7b690d41410c8..12a12458a8fdf 100644 --- a/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc +++ b/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/iam/admin/v1/iam.proto #include "google/cloud/iam/admin/v1/internal/iam_auth_decorator.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include #include diff --git a/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc b/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc index 49e6fdae1fbc2..13e30bc4be510 100644 --- a/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc +++ b/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/admin/v1/internal/iam_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc b/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc index f7ab740582eb0..1a1e5ef25dd52 100644 --- a/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc +++ b/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/admin/v1/internal/iam_stub.cc b/google/cloud/iam/admin/v1/internal/iam_stub.cc index 5105f16d92efd..7e2754744a239 100644 --- a/google/cloud/iam/admin/v1/internal/iam_stub.cc +++ b/google/cloud/iam/admin/v1/internal/iam_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/admin/v1/internal/iam_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include #include diff --git a/google/cloud/iam/admin/v1/internal/iam_stub.h b/google/cloud/iam/admin/v1/internal/iam_stub.h index 24b97c5f0c9d2..1d0ee94e02d78 100644 --- a/google/cloud/iam/admin/v1/internal/iam_stub.h +++ b/google/cloud/iam/admin/v1/internal/iam_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include #include diff --git a/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc b/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc index cff409db68694..0f1687ffaf6c7 100644 --- a/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc +++ b/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/iam/admin/v1/iam.grpc.pb.h" #include #include diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc index e165d4236e924..81dee2ed7151a 100644 --- a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc +++ b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace iam_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IAMTracingConnection::IAMTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -270,15 +268,11 @@ IAMTracingConnection::LintPolicy( return internal::EndSpan(*span, child_->LintPolicy(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIAMTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h index 1874a9182e543..6464457ef7b66 100644 --- a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h +++ b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iam_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IAMTracingConnection : public iam_admin_v1::IAMConnection { public: ~IAMTracingConnection() override = default; @@ -144,8 +142,6 @@ class IAMTracingConnection : public iam_admin_v1::IAMConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc index 58d2edf267da8..8dd16e9b36700 100644 --- a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc +++ b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IAMTracingStub::IAMTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -352,14 +350,8 @@ StatusOr IAMTracingStub::LintPolicy( child_->LintPolicy(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIAMTracingStub(std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h index 4139678a37786..1f836d77d812e 100644 --- a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h +++ b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iam_admin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IAMTracingStub : public IAMStub { public: ~IAMTracingStub() override = default; @@ -177,8 +175,6 @@ class IAMTracingStub : public IAMStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iam/credentials/v1/iam_credentials_client.h b/google/cloud/iam/credentials/v1/iam_credentials_client.h index 30faa73be5c64..d15325feef70e 100644 --- a/google/cloud/iam/credentials/v1/iam_credentials_client.h +++ b/google/cloud/iam/credentials/v1/iam_credentials_client.h @@ -25,7 +25,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/protobuf/duration.pb.h" #include #include diff --git a/google/cloud/iam/credentials/v1/iam_credentials_connection.h b/google/cloud/iam/credentials/v1/iam_credentials_connection.h index 130c86a4ba7eb..1f8153baa5bbe 100644 --- a/google/cloud/iam/credentials/v1/iam_credentials_connection.h +++ b/google/cloud/iam/credentials/v1/iam_credentials_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/iam/credentials/v1/iamcredentials.pb.h" #include namespace google { diff --git a/google/cloud/iam/credentials/v1/iam_credentials_connection_idempotency_policy.h b/google/cloud/iam/credentials/v1/iam_credentials_connection_idempotency_policy.h index 0c49f3392aece..38625eb587208 100644 --- a/google/cloud/iam/credentials/v1/iam_credentials_connection_idempotency_policy.h +++ b/google/cloud/iam/credentials/v1/iam_credentials_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_auth_decorator.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_auth_decorator.cc index ae89b3945566f..d551af8e97afc 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_auth_decorator.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/iam/credentials/v1/iamcredentials.proto #include "google/cloud/iam/credentials/v1/internal/iam_credentials_auth_decorator.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include #include diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_logging_decorator.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_logging_decorator.cc index 69a0f3bae9abf..d301087d01d63 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_logging_decorator.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/credentials/v1/internal/iam_credentials_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_metadata_decorator.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_metadata_decorator.cc index 76ca7e292da99..d79d95f75873a 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_metadata_decorator.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.cc index 4a11d60880502..3e5433b4bdd59 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/credentials/v1/internal/iam_credentials_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include #include diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.h b/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.h index 9635c77561a23..4b8f9881eb648 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.h +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include #include diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_stub_factory.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_stub_factory.cc index 8e739a536c58a..2e058ba2c9887 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_stub_factory.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include #include diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.cc index 893fc849e1dc4..07738af9cf7bd 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_credentials_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IAMCredentialsTracingConnection::IAMCredentialsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -68,16 +66,12 @@ IAMCredentialsTracingConnection::SignJwt( return internal::EndSpan(*span, child_->SignJwt(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIAMCredentialsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.h b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.h index 43a8128ef65ea..4e9e6ee1d64c2 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.h +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iam_credentials_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IAMCredentialsTracingConnection : public iam_credentials_v1::IAMCredentialsConnection { public: @@ -59,8 +57,6 @@ class IAMCredentialsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.cc b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.cc index 58bf22013b352..fdfe2c50c5f80 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.cc +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_credentials_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IAMCredentialsTracingStub::IAMCredentialsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -80,15 +78,9 @@ IAMCredentialsTracingStub::SignJwt( child_->SignJwt(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIAMCredentialsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.h b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.h index 407510bda9ad9..63b94b81ab063 100644 --- a/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.h +++ b/google/cloud/iam/credentials/v1/internal/iam_credentials_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iam_credentials_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IAMCredentialsTracingStub : public IAMCredentialsStub { public: ~IAMCredentialsTracingStub() override = default; @@ -63,8 +61,6 @@ class IAMCredentialsTracingStub : public IAMCredentialsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iam/quickstart/.bazelrc b/google/cloud/iam/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/iam/quickstart/.bazelrc +++ b/google/cloud/iam/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/iam/retry_traits.h b/google/cloud/iam/retry_traits.h deleted file mode 100644 index 963f4491785b5..0000000000000 --- a/google/cloud/iam/retry_traits.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_RETRY_TRAITS_H - -#include "google/cloud/iam/admin/v1/internal/iam_retry_traits.h" -#include "google/cloud/iam/credentials/v1/internal/iam_credentials_retry_traits.h" -#warning "This header is deprecated, it only provided internal symbols" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_RETRY_TRAITS_H diff --git a/google/cloud/iam/v1/iam_policy_connection.h b/google/cloud/iam/v1/iam_policy_connection.h index 80a1fca3574c4..05f4cb6d5f835 100644 --- a/google/cloud/iam/v1/iam_policy_connection.h +++ b/google/cloud/iam/v1/iam_policy_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/iam/v1/iam_policy.pb.h" #include namespace google { diff --git a/google/cloud/iam/v1/iam_policy_connection_idempotency_policy.h b/google/cloud/iam/v1/iam_policy_connection_idempotency_policy.h index fb699a0001edb..e945d69feb8a8 100644 --- a/google/cloud/iam/v1/iam_policy_connection_idempotency_policy.h +++ b/google/cloud/iam/v1/iam_policy_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v1/internal/iam_policy_auth_decorator.cc b/google/cloud/iam/v1/internal/iam_policy_auth_decorator.cc index 132c820ef4348..6ae44a4cbe731 100644 --- a/google/cloud/iam/v1/internal/iam_policy_auth_decorator.cc +++ b/google/cloud/iam/v1/internal/iam_policy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/iam/v1/iam_policy.proto #include "google/cloud/iam/v1/internal/iam_policy_auth_decorator.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v1/internal/iam_policy_logging_decorator.cc b/google/cloud/iam/v1/internal/iam_policy_logging_decorator.cc index 329bb9e72bcf5..db4533179c2a0 100644 --- a/google/cloud/iam/v1/internal/iam_policy_logging_decorator.cc +++ b/google/cloud/iam/v1/internal/iam_policy_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/v1/internal/iam_policy_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v1/internal/iam_policy_metadata_decorator.cc b/google/cloud/iam/v1/internal/iam_policy_metadata_decorator.cc index 298becde94ff8..9c3b57e5b68e0 100644 --- a/google/cloud/iam/v1/internal/iam_policy_metadata_decorator.cc +++ b/google/cloud/iam/v1/internal/iam_policy_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v1/internal/iam_policy_stub.cc b/google/cloud/iam/v1/internal/iam_policy_stub.cc index c8dd08d63e973..cbb0b5f736b0c 100644 --- a/google/cloud/iam/v1/internal/iam_policy_stub.cc +++ b/google/cloud/iam/v1/internal/iam_policy_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/v1/internal/iam_policy_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v1/internal/iam_policy_stub.h b/google/cloud/iam/v1/internal/iam_policy_stub.h index 84764974b5d0b..6ba673c1445fa 100644 --- a/google/cloud/iam/v1/internal/iam_policy_stub.h +++ b/google/cloud/iam/v1/internal/iam_policy_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v1/internal/iam_policy_stub_factory.cc b/google/cloud/iam/v1/internal/iam_policy_stub_factory.cc index d8e33dfbb4861..86b3a2bc511f2 100644 --- a/google/cloud/iam/v1/internal/iam_policy_stub_factory.cc +++ b/google/cloud/iam/v1/internal/iam_policy_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v1/internal/iam_policy_tracing_connection.cc b/google/cloud/iam/v1/internal/iam_policy_tracing_connection.cc index ec90d506736e5..80444fd03ef50 100644 --- a/google/cloud/iam/v1/internal/iam_policy_tracing_connection.cc +++ b/google/cloud/iam/v1/internal/iam_policy_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IAMPolicyTracingConnection::IAMPolicyTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -55,15 +53,11 @@ IAMPolicyTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIAMPolicyTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iam/v1/internal/iam_policy_tracing_connection.h b/google/cloud/iam/v1/internal/iam_policy_tracing_connection.h index 4ee8c9154e52b..0dd3009b0f3ec 100644 --- a/google/cloud/iam/v1/internal/iam_policy_tracing_connection.h +++ b/google/cloud/iam/v1/internal/iam_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iam_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IAMPolicyTracingConnection : public iam_v1::IAMPolicyConnection { public: ~IAMPolicyTracingConnection() override = default; @@ -52,8 +50,6 @@ class IAMPolicyTracingConnection : public iam_v1::IAMPolicyConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iam/v1/internal/iam_policy_tracing_stub.cc b/google/cloud/iam/v1/internal/iam_policy_tracing_stub.cc index 6e7c73b747951..dcabd214720f9 100644 --- a/google/cloud/iam/v1/internal/iam_policy_tracing_stub.cc +++ b/google/cloud/iam/v1/internal/iam_policy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IAMPolicyTracingStub::IAMPolicyTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -63,15 +61,9 @@ IAMPolicyTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIAMPolicyTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/v1/internal/iam_policy_tracing_stub.h b/google/cloud/iam/v1/internal/iam_policy_tracing_stub.h index 5305c06757ad2..749b5587b6011 100644 --- a/google/cloud/iam/v1/internal/iam_policy_tracing_stub.h +++ b/google/cloud/iam/v1/internal/iam_policy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iam_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IAMPolicyTracingStub : public IAMPolicyStub { public: ~IAMPolicyTracingStub() override = default; @@ -56,8 +54,6 @@ class IAMPolicyTracingStub : public IAMPolicyStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iam/v2/internal/policies_auth_decorator.cc b/google/cloud/iam/v2/internal/policies_auth_decorator.cc index af9f6d2f7218c..7abe5b2f29414 100644 --- a/google/cloud/iam/v2/internal/policies_auth_decorator.cc +++ b/google/cloud/iam/v2/internal/policies_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/iam/v2/policy.proto #include "google/cloud/iam/v2/internal/policies_auth_decorator.h" -#include +#include "google/iam/v2/policy.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v2/internal/policies_auth_decorator.h b/google/cloud/iam/v2/internal/policies_auth_decorator.h index a17107127e74e..d3a2f041fd4a1 100644 --- a/google/cloud/iam/v2/internal/policies_auth_decorator.h +++ b/google/cloud/iam/v2/internal/policies_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v2/internal/policies_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v2/internal/policies_connection_impl.h b/google/cloud/iam/v2/internal/policies_connection_impl.h index e8359f1e3cf05..392ac6cb99e37 100644 --- a/google/cloud/iam/v2/internal/policies_connection_impl.h +++ b/google/cloud/iam/v2/internal/policies_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v2/internal/policies_logging_decorator.cc b/google/cloud/iam/v2/internal/policies_logging_decorator.cc index f2089d6ea058f..99fe74d7d0abd 100644 --- a/google/cloud/iam/v2/internal/policies_logging_decorator.cc +++ b/google/cloud/iam/v2/internal/policies_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/v2/internal/policies_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v2/policy.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v2/internal/policies_logging_decorator.h b/google/cloud/iam/v2/internal/policies_logging_decorator.h index 20aaaee39f299..fcbed5bc9dc54 100644 --- a/google/cloud/iam/v2/internal/policies_logging_decorator.h +++ b/google/cloud/iam/v2/internal/policies_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v2/internal/policies_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v2/internal/policies_metadata_decorator.cc b/google/cloud/iam/v2/internal/policies_metadata_decorator.cc index b2e38d4e46d44..9e721002a8e8c 100644 --- a/google/cloud/iam/v2/internal/policies_metadata_decorator.cc +++ b/google/cloud/iam/v2/internal/policies_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v2/policy.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v2/internal/policies_metadata_decorator.h b/google/cloud/iam/v2/internal/policies_metadata_decorator.h index 3144b3f5ddd6b..ba1c0d6425481 100644 --- a/google/cloud/iam/v2/internal/policies_metadata_decorator.h +++ b/google/cloud/iam/v2/internal/policies_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v2/internal/policies_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v2/internal/policies_stub.cc b/google/cloud/iam/v2/internal/policies_stub.cc index 868fefa73c4da..d8e41eabf34ad 100644 --- a/google/cloud/iam/v2/internal/policies_stub.cc +++ b/google/cloud/iam/v2/internal/policies_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/iam/v2/internal/policies_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/iam/v2/policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v2/internal/policies_stub.h b/google/cloud/iam/v2/internal/policies_stub.h index 2d472fe15ddf5..9e415149c8535 100644 --- a/google/cloud/iam/v2/internal/policies_stub.h +++ b/google/cloud/iam/v2/internal/policies_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v2/policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v2/internal/policies_stub_factory.cc b/google/cloud/iam/v2/internal/policies_stub_factory.cc index 9c17295d5b073..3e6eb82add7c4 100644 --- a/google/cloud/iam/v2/internal/policies_stub_factory.cc +++ b/google/cloud/iam/v2/internal/policies_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/iam/v2/policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v2/internal/policies_tracing_connection.cc b/google/cloud/iam/v2/internal/policies_tracing_connection.cc index 82c488c45ec00..ef87c14d40bc3 100644 --- a/google/cloud/iam/v2/internal/policies_tracing_connection.cc +++ b/google/cloud/iam/v2/internal/policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace iam_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PoliciesTracingConnection::PoliciesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -129,15 +127,11 @@ PoliciesTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iam/v2/internal/policies_tracing_connection.h b/google/cloud/iam/v2/internal/policies_tracing_connection.h index 8f7c74bd5a0c1..84adf255cdc53 100644 --- a/google/cloud/iam/v2/internal/policies_tracing_connection.h +++ b/google/cloud/iam/v2/internal/policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iam_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PoliciesTracingConnection : public iam_v2::PoliciesConnection { public: ~PoliciesTracingConnection() override = default; @@ -79,8 +77,6 @@ class PoliciesTracingConnection : public iam_v2::PoliciesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iam/v2/internal/policies_tracing_stub.cc b/google/cloud/iam/v2/internal/policies_tracing_stub.cc index bfc1c57ce57d8..ad70b371012b8 100644 --- a/google/cloud/iam/v2/internal/policies_tracing_stub.cc +++ b/google/cloud/iam/v2/internal/policies_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PoliciesTracingStub::PoliciesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -159,15 +157,9 @@ future PoliciesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePoliciesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/v2/internal/policies_tracing_stub.h b/google/cloud/iam/v2/internal/policies_tracing_stub.h index 90b49071b1f8d..b17b12fc6fb14 100644 --- a/google/cloud/iam/v2/internal/policies_tracing_stub.h +++ b/google/cloud/iam/v2/internal/policies_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iam_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PoliciesTracingStub : public PoliciesStub { public: ~PoliciesTracingStub() override = default; @@ -98,8 +96,6 @@ class PoliciesTracingStub : public PoliciesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iam/v2/policies_client.h b/google/cloud/iam/v2/policies_client.h index d536953120891..73a52a72362d9 100644 --- a/google/cloud/iam/v2/policies_client.h +++ b/google/cloud/iam/v2/policies_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v2/policies_connection.h b/google/cloud/iam/v2/policies_connection.h index fe20aec0e7c99..f01f20979d336 100644 --- a/google/cloud/iam/v2/policies_connection.h +++ b/google/cloud/iam/v2/policies_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v2/policy.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v2/policies_connection_idempotency_policy.h b/google/cloud/iam/v2/policies_connection_idempotency_policy.h index 611fc49d61c21..e033ae9445c3b 100644 --- a/google/cloud/iam/v2/policies_connection_idempotency_policy.h +++ b/google/cloud/iam/v2/policies_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v2/policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.cc b/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.cc index 21f2cf5984a01..f2e452b77e754 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/iam/v3/policy_bindings_service.proto #include "google/cloud/iam/v3/internal/policy_bindings_auth_decorator.h" -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.h b/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.h index d93b241d9d2f7..a10afe6c23083 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.h +++ b/google/cloud/iam/v3/internal/policy_bindings_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v3/internal/policy_bindings_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_connection_impl.h b/google/cloud/iam/v3/internal/policy_bindings_connection_impl.h index 6e1d75d0e0506..1dbb6004dcfe4 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_connection_impl.h +++ b/google/cloud/iam/v3/internal/policy_bindings_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.cc b/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.cc index 19e38541dba59..1d711a9246d66 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/v3/internal/policy_bindings_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.h b/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.h index f7d48ec1bd76d..110c77466a0ef 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.h +++ b/google/cloud/iam/v3/internal/policy_bindings_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v3/internal/policy_bindings_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.cc b/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.cc index ec19246c0cf40..cf9cb1c02a8b0 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.h b/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.h index 3ccd82185f4aa..d28888bbbdf39 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.h +++ b/google/cloud/iam/v3/internal/policy_bindings_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v3/internal/policy_bindings_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_stub.cc b/google/cloud/iam/v3/internal/policy_bindings_stub.cc index 625aab21a7f23..a55496b74091e 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_stub.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/iam/v3/internal/policy_bindings_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_stub.h b/google/cloud/iam/v3/internal/policy_bindings_stub.h index 8ba9339dd6f54..cc22a6be6bc03 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_stub.h +++ b/google/cloud/iam/v3/internal/policy_bindings_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_stub_factory.cc b/google/cloud/iam/v3/internal/policy_bindings_stub_factory.cc index 8a67bad0d46a4..11f4c8aeca947 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_stub_factory.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.cc b/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.cc index f587893f2dee4..d2739fd32c860 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyBindingsTracingConnection::PolicyBindingsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -163,16 +161,12 @@ PolicyBindingsTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyBindingsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.h b/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.h index 8733c0aa3fbd2..3b83b6d1f523d 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.h +++ b/google/cloud/iam/v3/internal/policy_bindings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyBindingsTracingConnection : public iam_v3::PolicyBindingsConnection { public: @@ -86,8 +84,6 @@ class PolicyBindingsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.cc b/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.cc index e0d6e3a47acf8..ec365ef1fe1f6 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.cc +++ b/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyBindingsTracingStub::PolicyBindingsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -190,15 +188,9 @@ future PolicyBindingsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyBindingsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.h b/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.h index 69d89d0bb9665..d2152d35970b5 100644 --- a/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.h +++ b/google/cloud/iam/v3/internal/policy_bindings_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyBindingsTracingStub : public PolicyBindingsStub { public: ~PolicyBindingsTracingStub() override = default; @@ -104,8 +102,6 @@ class PolicyBindingsTracingStub : public PolicyBindingsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.cc index 67a5e835c3835..9a08e1698d7ea 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/iam/v3/principal_access_boundary_policies_service.proto #include "google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.h" -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.h index 5afdb6b511a8f..d2197bd05f554 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_connection_impl.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_connection_impl.h index 10cb8c364979d..ea0a2b6b4d5c8 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_connection_impl.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.cc index a58318c46f9aa..56b8a1a29ae3c 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.h index 60b42cb6554ba..ffcd22a5d815f 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.cc index 04383197af513..30d875fcdd3ec 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.h index f59528c0aa034..edbf369f11333 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.cc index 8013ddfe32f1b..afae1095f24d3 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h index e80d4c14de174..f867636ed8dc7 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub_factory.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub_factory.cc index 05a8494d50c0d..12d0e3c6c4dd3 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub_factory.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.cc index 040a2432b9562..e351669c5b600 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PrincipalAccessBoundaryPoliciesTracingConnection:: PrincipalAccessBoundaryPoliciesTracingConnection( std::shared_ptr @@ -203,17 +201,13 @@ PrincipalAccessBoundaryPoliciesTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePrincipalAccessBoundaryPoliciesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.h index d9a17537bebeb..1f12b9164883b 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PrincipalAccessBoundaryPoliciesTracingConnection : public iam_v3::PrincipalAccessBoundaryPoliciesConnection { public: @@ -104,8 +102,6 @@ class PrincipalAccessBoundaryPoliciesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.cc b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.cc index 5f3501a7b14c1..0c790ae335931 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.cc +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PrincipalAccessBoundaryPoliciesTracingStub:: PrincipalAccessBoundaryPoliciesTracingStub( std::shared_ptr child) @@ -217,17 +215,11 @@ future PrincipalAccessBoundaryPoliciesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePrincipalAccessBoundaryPoliciesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.h b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.h index 24e3a5edfd9ea..2c53e90997a4f 100644 --- a/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.h +++ b/google/cloud/iam/v3/internal/principal_access_boundary_policies_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PrincipalAccessBoundaryPoliciesTracingStub : public PrincipalAccessBoundaryPoliciesStub { public: @@ -119,8 +117,6 @@ class PrincipalAccessBoundaryPoliciesTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iam/v3/policy_bindings_client.h b/google/cloud/iam/v3/policy_bindings_client.h index 2db14742ad3e2..a4c0866338d81 100644 --- a/google/cloud/iam/v3/policy_bindings_client.h +++ b/google/cloud/iam/v3/policy_bindings_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/policy_bindings_connection.h b/google/cloud/iam/v3/policy_bindings_connection.h index 6d453c83287bf..680f82f7c4cba 100644 --- a/google/cloud/iam/v3/policy_bindings_connection.h +++ b/google/cloud/iam/v3/policy_bindings_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v3/policy_bindings_service.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v3/policy_bindings_connection_idempotency_policy.h b/google/cloud/iam/v3/policy_bindings_connection_idempotency_policy.h index 8de979d27948d..d23d802983df7 100644 --- a/google/cloud/iam/v3/policy_bindings_connection_idempotency_policy.h +++ b/google/cloud/iam/v3/policy_bindings_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v3/policy_bindings_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v3/principal_access_boundary_policies_client.h b/google/cloud/iam/v3/principal_access_boundary_policies_client.h index 16e018934b20d..602e1514c685d 100644 --- a/google/cloud/iam/v3/principal_access_boundary_policies_client.h +++ b/google/cloud/iam/v3/principal_access_boundary_policies_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/iam/v3/principal_access_boundary_policies_connection.h b/google/cloud/iam/v3/principal_access_boundary_policies_connection.h index 035298c08ee25..49c7918fdf7be 100644 --- a/google/cloud/iam/v3/principal_access_boundary_policies_connection.h +++ b/google/cloud/iam/v3/principal_access_boundary_policies_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v3/principal_access_boundary_policies_service.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam/v3/principal_access_boundary_policies_connection_idempotency_policy.h b/google/cloud/iam/v3/principal_access_boundary_policies_connection_idempotency_policy.h index 729f61e806940..af36a8da9a7a7 100644 --- a/google/cloud/iam/v3/principal_access_boundary_policies_connection_idempotency_policy.h +++ b/google/cloud/iam/v3/principal_access_boundary_policies_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v3/principal_access_boundary_policies_service.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/iam_updater.h b/google/cloud/iam_updater.h index 193e4f43923fd..6914b6c273c8c 100644 --- a/google/cloud/iam_updater.h +++ b/google/cloud/iam_updater.h @@ -17,7 +17,7 @@ #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/iam/v1/policy.pb.h" #include namespace google { diff --git a/google/cloud/iap/BUILD.bazel b/google/cloud/iap/BUILD.bazel index ac78a2e546db1..7bf413a7c6a9a 100644 --- a/google/cloud/iap/BUILD.bazel +++ b/google/cloud/iap/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/iap/v1:iap_cc_grpc", + "@googleapis//google/cloud/iap/v1:iap_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/iap/quickstart/.bazelrc b/google/cloud/iap/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/iap/quickstart/.bazelrc +++ b/google/cloud/iap/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/iap/v1/identity_aware_proxy_admin_connection.h b/google/cloud/iap/v1/identity_aware_proxy_admin_connection.h index effc98a72f5fe..887e2a7baa370 100644 --- a/google/cloud/iap/v1/identity_aware_proxy_admin_connection.h +++ b/google/cloud/iap/v1/identity_aware_proxy_admin_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/iap/v1/identity_aware_proxy_admin_connection_idempotency_policy.h" #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_retry_traits.h" +#include "google/cloud/iap/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/iap/v1/identity_aware_proxy_admin_connection_idempotency_policy.h b/google/cloud/iap/v1/identity_aware_proxy_admin_connection_idempotency_policy.h index eefc5f435a78c..40ef30e9352be 100644 --- a/google/cloud/iap/v1/identity_aware_proxy_admin_connection_idempotency_policy.h +++ b/google/cloud/iap/v1/identity_aware_proxy_admin_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection.h b/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection.h index 740202818b9f2..fcef95f83e58f 100644 --- a/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection.h +++ b/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/iap/v1/identity_aware_proxy_o_auth_connection_idempotency_policy.h" #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_retry_traits.h" +#include "google/cloud/iap/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection_idempotency_policy.h b/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection_idempotency_policy.h index ea300eb061f5d..830c8b4f2a888 100644 --- a/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection_idempotency_policy.h +++ b/google/cloud/iap/v1/identity_aware_proxy_o_auth_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_auth_decorator.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_auth_decorator.cc index 175d58ae74818..6cf1a1c5912dd 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_auth_decorator.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_auth_decorator.h" -#include +#include "google/cloud/iap/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_logging_decorator.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_logging_decorator.cc index ebc9718f06f12..351848532510b 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_logging_decorator.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_logging_decorator.h" +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_metadata_decorator.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_metadata_decorator.cc index 43e63c023cde6..1f6f1ce6ee3da 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_metadata_decorator.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_metadata_decorator.h" +#include "google/cloud/iap/v1/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 #include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.cc index b7c1a4d5fbab5..8b048fe05091f 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.h" +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.h b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.h index bc822f47ee6ac..d43e63a6d3a0a 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.h +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_INTERNAL_IDENTITY_AWARE_PROXY_ADMIN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_INTERNAL_IDENTITY_AWARE_PROXY_ADMIN_STUB_H +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub_factory.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub_factory.cc index d67e68bb4598f..92fb71b011f1b 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub_factory.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_metadata_decorator.h" #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_stub.h" #include "google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.h" +#include "google/cloud/iap/v1/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 #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc index c945e0cb31aa5..9afa62ac24727 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IdentityAwareProxyAdminServiceTracingConnection:: IdentityAwareProxyAdminServiceTracingConnection( std::shared_ptr child) @@ -140,17 +138,13 @@ IdentityAwareProxyAdminServiceTracingConnection::UpdateTunnelDestGroup( return internal::EndSpan(*span, child_->UpdateTunnelDestGroup(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIdentityAwareProxyAdminServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.h b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.h index 972cf3064342f..ee4e3c7afad01 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.h +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IdentityAwareProxyAdminServiceTracingConnection : public iap_v1::IdentityAwareProxyAdminServiceConnection { public: @@ -83,8 +81,6 @@ class IdentityAwareProxyAdminServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.cc index fdb2998f1958a..850ee25c54819 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IdentityAwareProxyAdminServiceTracingStub:: IdentityAwareProxyAdminServiceTracingStub( std::shared_ptr child) @@ -174,17 +172,11 @@ IdentityAwareProxyAdminServiceTracingStub::UpdateTunnelDestGroup( context, *span, child_->UpdateTunnelDestGroup(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIdentityAwareProxyAdminServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.h b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.h index 062a9343b643b..a0e0f1da668b0 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.h +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IdentityAwareProxyAdminServiceTracingStub : public IdentityAwareProxyAdminServiceStub { public: @@ -98,8 +96,6 @@ class IdentityAwareProxyAdminServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_auth_decorator.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_auth_decorator.cc index 126fa9edf501c..1bc809c6ca3b4 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_auth_decorator.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_auth_decorator.h" -#include +#include "google/cloud/iap/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_logging_decorator.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_logging_decorator.cc index 8c54b9b90a8c2..ad9d5be9cff74 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_logging_decorator.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_logging_decorator.h" +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_metadata_decorator.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_metadata_decorator.cc index 699077b7a60b6..2e32ab595c086 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_metadata_decorator.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_metadata_decorator.h" +#include "google/cloud/iap/v1/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 #include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.cc index ad380b20bd646..75486faf3e58a 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/iap/v1/service.proto #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.h" +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.h b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.h index 79f15328024e7..a8245543932fd 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.h +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_INTERNAL_IDENTITY_AWARE_PROXY_O_AUTH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_V1_INTERNAL_IDENTITY_AWARE_PROXY_O_AUTH_STUB_H +#include "google/cloud/iap/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub_factory.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub_factory.cc index 101788428ad97..6ec4203f4bc15 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub_factory.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_metadata_decorator.h" #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_stub.h" #include "google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.h" +#include "google/cloud/iap/v1/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 #include #include diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc index a081bbceffd59..94d8e338d6913 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IdentityAwareProxyOAuthServiceTracingConnection:: IdentityAwareProxyOAuthServiceTracingConnection( std::shared_ptr child) @@ -121,17 +119,13 @@ IdentityAwareProxyOAuthServiceTracingConnection::DeleteIdentityAwareProxyClient( child_->DeleteIdentityAwareProxyClient(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIdentityAwareProxyOAuthServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.h b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.h index e98b9031cacd5..b710686a4acd9 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.h +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IdentityAwareProxyOAuthServiceTracingConnection : public iap_v1::IdentityAwareProxyOAuthServiceConnection { public: @@ -77,8 +75,6 @@ class IdentityAwareProxyOAuthServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.cc index 72fafa37d8896..234a6be3332f7 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IdentityAwareProxyOAuthServiceTracingStub:: IdentityAwareProxyOAuthServiceTracingStub( std::shared_ptr child) @@ -143,17 +141,11 @@ IdentityAwareProxyOAuthServiceTracingStub::DeleteIdentityAwareProxyClient( child_->DeleteIdentityAwareProxyClient(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIdentityAwareProxyOAuthServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.h b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.h index 0a326dfc7bec8..e6a4aaa6177ec 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.h +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace iap_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IdentityAwareProxyOAuthServiceTracingStub : public IdentityAwareProxyOAuthServiceStub { public: @@ -87,8 +85,6 @@ class IdentityAwareProxyOAuthServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/ids/BUILD.bazel b/google/cloud/ids/BUILD.bazel index 7efeeb7c5919f..7dde39a2eb481 100644 --- a/google/cloud/ids/BUILD.bazel +++ b/google/cloud/ids/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/ids/v1:ids_cc_grpc", + "@googleapis//google/cloud/ids/v1:ids_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/ids/quickstart/.bazelrc b/google/cloud/ids/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/ids/quickstart/.bazelrc +++ b/google/cloud/ids/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/ids/v1/ids_client.h b/google/cloud/ids/v1/ids_client.h index e2ebce0b66249..492759959b9b0 100644 --- a/google/cloud/ids/v1/ids_client.h +++ b/google/cloud/ids/v1/ids_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/ids/v1/ids_connection.h b/google/cloud/ids/v1/ids_connection.h index aa1e7bd826901..845fb739121d0 100644 --- a/google/cloud/ids/v1/ids_connection.h +++ b/google/cloud/ids/v1/ids_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_V1_IDS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_V1_IDS_CONNECTION_H +#include "google/cloud/ids/v1/ids.pb.h" #include "google/cloud/ids/v1/ids_connection_idempotency_policy.h" #include "google/cloud/ids/v1/internal/ids_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/ids/v1/ids_connection_idempotency_policy.h b/google/cloud/ids/v1/ids_connection_idempotency_policy.h index fa608add2e93d..460ee0798e4a1 100644 --- a/google/cloud/ids/v1/ids_connection_idempotency_policy.h +++ b/google/cloud/ids/v1/ids_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_V1_IDS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_V1_IDS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/ids/v1/ids.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/ids/v1/internal/ids_auth_decorator.cc b/google/cloud/ids/v1/internal/ids_auth_decorator.cc index 09be60a2d0611..62f86a89fb58f 100644 --- a/google/cloud/ids/v1/internal/ids_auth_decorator.cc +++ b/google/cloud/ids/v1/internal/ids_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/ids/v1/ids.proto #include "google/cloud/ids/v1/internal/ids_auth_decorator.h" -#include +#include "google/cloud/ids/v1/ids.grpc.pb.h" #include #include diff --git a/google/cloud/ids/v1/internal/ids_auth_decorator.h b/google/cloud/ids/v1/internal/ids_auth_decorator.h index 5f31e62baa4d3..796e5bdda1dae 100644 --- a/google/cloud/ids/v1/internal/ids_auth_decorator.h +++ b/google/cloud/ids/v1/internal/ids_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/ids/v1/internal/ids_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/ids/v1/internal/ids_connection_impl.h b/google/cloud/ids/v1/internal/ids_connection_impl.h index db0e866cc5623..70cddf4bbfe41 100644 --- a/google/cloud/ids/v1/internal/ids_connection_impl.h +++ b/google/cloud/ids/v1/internal/ids_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/ids/v1/internal/ids_logging_decorator.cc b/google/cloud/ids/v1/internal/ids_logging_decorator.cc index af4c83396f9c5..a7e9ab26e2068 100644 --- a/google/cloud/ids/v1/internal/ids_logging_decorator.cc +++ b/google/cloud/ids/v1/internal/ids_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/ids/v1/ids.proto #include "google/cloud/ids/v1/internal/ids_logging_decorator.h" +#include "google/cloud/ids/v1/ids.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/ids/v1/internal/ids_logging_decorator.h b/google/cloud/ids/v1/internal/ids_logging_decorator.h index cb16b40f81280..24a958ded0fdd 100644 --- a/google/cloud/ids/v1/internal/ids_logging_decorator.h +++ b/google/cloud/ids/v1/internal/ids_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/ids/v1/internal/ids_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/ids/v1/internal/ids_metadata_decorator.cc b/google/cloud/ids/v1/internal/ids_metadata_decorator.cc index 1ebfc98b7d7db..02410aff2d053 100644 --- a/google/cloud/ids/v1/internal/ids_metadata_decorator.cc +++ b/google/cloud/ids/v1/internal/ids_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/ids/v1/ids.proto #include "google/cloud/ids/v1/internal/ids_metadata_decorator.h" +#include "google/cloud/ids/v1/ids.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 #include #include #include diff --git a/google/cloud/ids/v1/internal/ids_metadata_decorator.h b/google/cloud/ids/v1/internal/ids_metadata_decorator.h index f5c95747d705f..c16d255b9451c 100644 --- a/google/cloud/ids/v1/internal/ids_metadata_decorator.h +++ b/google/cloud/ids/v1/internal/ids_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/ids/v1/internal/ids_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/ids/v1/internal/ids_stub.cc b/google/cloud/ids/v1/internal/ids_stub.cc index d46d5cfb5bb1d..51d86dbcde01d 100644 --- a/google/cloud/ids/v1/internal/ids_stub.cc +++ b/google/cloud/ids/v1/internal/ids_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/ids/v1/ids.proto #include "google/cloud/ids/v1/internal/ids_stub.h" +#include "google/cloud/ids/v1/ids.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/ids/v1/internal/ids_stub.h b/google/cloud/ids/v1/internal/ids_stub.h index b40f25e5a66a1..9f894656195f4 100644 --- a/google/cloud/ids/v1/internal/ids_stub.h +++ b/google/cloud/ids/v1/internal/ids_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_V1_INTERNAL_IDS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_V1_INTERNAL_IDS_STUB_H +#include "google/cloud/ids/v1/ids.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/ids/v1/internal/ids_stub_factory.cc b/google/cloud/ids/v1/internal/ids_stub_factory.cc index 20d54015e4f1a..4392203b59c51 100644 --- a/google/cloud/ids/v1/internal/ids_stub_factory.cc +++ b/google/cloud/ids/v1/internal/ids_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/ids/v1/ids.proto #include "google/cloud/ids/v1/internal/ids_stub_factory.h" +#include "google/cloud/ids/v1/ids.grpc.pb.h" #include "google/cloud/ids/v1/internal/ids_auth_decorator.h" #include "google/cloud/ids/v1/internal/ids_logging_decorator.h" #include "google/cloud/ids/v1/internal/ids_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/ids/v1/internal/ids_tracing_connection.cc b/google/cloud/ids/v1/internal/ids_tracing_connection.cc index 2bae57defe769..316aec04fded7 100644 --- a/google/cloud/ids/v1/internal/ids_tracing_connection.cc +++ b/google/cloud/ids/v1/internal/ids_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace ids_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IDSTracingConnection::IDSTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -98,15 +96,11 @@ IDSTracingConnection::DeleteEndpoint( return internal::EndSpan(std::move(span), child_->DeleteEndpoint(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIDSTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/ids/v1/internal/ids_tracing_connection.h b/google/cloud/ids/v1/internal/ids_tracing_connection.h index 9672699cd80fa..148993e004737 100644 --- a/google/cloud/ids/v1/internal/ids_tracing_connection.h +++ b/google/cloud/ids/v1/internal/ids_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace ids_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IDSTracingConnection : public ids_v1::IDSConnection { public: ~IDSTracingConnection() override = default; @@ -68,8 +66,6 @@ class IDSTracingConnection : public ids_v1::IDSConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/ids/v1/internal/ids_tracing_stub.cc b/google/cloud/ids/v1/internal/ids_tracing_stub.cc index 8f4353b02d34a..0b968c2916f2d 100644 --- a/google/cloud/ids/v1/internal/ids_tracing_stub.cc +++ b/google/cloud/ids/v1/internal/ids_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace ids_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IDSTracingStub::IDSTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -133,14 +131,8 @@ future IDSTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIDSTracingStub(std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/ids/v1/internal/ids_tracing_stub.h b/google/cloud/ids/v1/internal/ids_tracing_stub.h index 8428c029ca76f..646cd0a12269b 100644 --- a/google/cloud/ids/v1/internal/ids_tracing_stub.h +++ b/google/cloud/ids/v1/internal/ids_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace ids_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IDSTracingStub : public IDSStub { public: ~IDSTracingStub() override = default; @@ -84,8 +82,6 @@ class IDSTracingStub : public IDSStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/internal/async_connection_ready_test.cc b/google/cloud/internal/async_connection_ready_test.cc index fbf6feca8ba59..6dfe8a528bd26 100644 --- a/google/cloud/internal/async_connection_ready_test.cc +++ b/google/cloud/internal/async_connection_ready_test.cc @@ -100,8 +100,6 @@ TEST(CompletionQueueTest, SuccessfulWaitingForConnection) { cli_thread.join(); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TEST(CompletionQueueTest, PropagateCallContext) { auto span_catcher = testing_util::InstallSpanCatcher(); @@ -137,8 +135,6 @@ TEST(CompletionQueueTest, PropagateCallContext) { t.join(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/async_long_running_operation.h b/google/cloud/internal/async_long_running_operation.h index f0b493bfe2ee9..dccd184c51521 100644 --- a/google/cloud/internal/async_long_running_operation.h +++ b/google/cloud/internal/async_long_running_operation.h @@ -25,7 +25,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/functional/function_ref.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/google/cloud/internal/async_long_running_operation_test.cc b/google/cloud/internal/async_long_running_operation_test.cc index f4f87d7aaa8ec..98a689a38e44c 100644 --- a/google/cloud/internal/async_long_running_operation_test.cc +++ b/google/cloud/internal/async_long_running_operation_test.cc @@ -19,8 +19,8 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include diff --git a/google/cloud/internal/async_polling_loop.h b/google/cloud/internal/async_polling_loop.h index 69867c6ca93e2..19831cd85eaa5 100644 --- a/google/cloud/internal/async_polling_loop.h +++ b/google/cloud/internal/async_polling_loop.h @@ -21,7 +21,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/google/cloud/internal/async_polling_loop_test.cc b/google/cloud/internal/async_polling_loop_test.cc index abb8f22a3e8e9..2ca520c9efb99 100644 --- a/google/cloud/internal/async_polling_loop_test.cc +++ b/google/cloud/internal/async_polling_loop_test.cc @@ -21,7 +21,7 @@ #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/protobuf/timestamp.pb.h" #include #include @@ -642,7 +642,6 @@ TEST(AsyncPollingLoopTest, ConfigurePollContext) { HasSubstr("operation cancelled")))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::OTelAttribute; @@ -773,8 +772,6 @@ TEST(AsyncPollingLoopTest, TraceCapturesOperationName) { "gl-cpp.LRO_name", "test-op-name"))))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/async_read_write_stream_impl_test.cc b/google/cloud/internal/async_read_write_stream_impl_test.cc index f35ddf4925594..908e85294a8a5 100644 --- a/google/cloud/internal/async_read_write_stream_impl_test.cc +++ b/google/cloud/internal/async_read_write_stream_impl_test.cc @@ -215,8 +215,6 @@ TEST(AsyncReadWriteStreamingRpcTest, Error) { EXPECT_THAT(metadata.trailers, IsEmpty()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::IsActive; TEST(AsyncReadWriteStreamingRpcTest, SpanActiveAcrossAsyncGrpcOperations) { @@ -330,8 +328,6 @@ TEST(AsyncReadWriteStreamingRpcTest, SpanActiveAcrossAsyncGrpcOperations) { (void)finish.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/async_read_write_stream_logging_test.cc b/google/cloud/internal/async_read_write_stream_logging_test.cc index ded195054fa07..f481505262ef3 100644 --- a/google/cloud/internal/async_read_write_stream_logging_test.cc +++ b/google/cloud/internal/async_read_write_stream_logging_test.cc @@ -19,8 +19,8 @@ #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/async_read_write_stream_tracing.h b/google/cloud/internal/async_read_write_stream_tracing.h index 8d6be0a09541d..707daa4962fc5 100644 --- a/google/cloud/internal/async_read_write_stream_tracing.h +++ b/google/cloud/internal/async_read_write_stream_tracing.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_READ_WRITE_STREAM_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_READ_WRITE_STREAM_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/internal/grpc_opentelemetry.h" #include "google/cloud/version.h" @@ -132,6 +131,5 @@ class AsyncStreamingReadWriteRpcTracing GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_READ_WRITE_STREAM_TRACING_H diff --git a/google/cloud/internal/async_read_write_stream_tracing_test.cc b/google/cloud/internal/async_read_write_stream_tracing_test.cc index 8476e4b649fa4..3ea59eab6990d 100644 --- a/google/cloud/internal/async_read_write_stream_tracing_test.cc +++ b/google/cloud/internal/async_read_write_stream_tracing_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/async_read_write_stream_tracing.h" #include "google/cloud/mocks/mock_async_streaming_read_write_rpc.h" #include "google/cloud/internal/make_status.h" @@ -390,4 +389,3 @@ TEST(AsyncStreamingReadWriteRpcTracing, StartedStreamShouldExtractMetadata) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/async_rest_long_running_operation.h b/google/cloud/internal/async_rest_long_running_operation.h index 8f3b01f9453da..94bac4eb6119f 100644 --- a/google/cloud/internal/async_rest_long_running_operation.h +++ b/google/cloud/internal/async_rest_long_running_operation.h @@ -22,7 +22,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/google/cloud/internal/async_rest_long_running_operation_custom_test.cc b/google/cloud/internal/async_rest_long_running_operation_custom_test.cc index 3fd0e2bf3328f..a23543ef657d6 100644 --- a/google/cloud/internal/async_rest_long_running_operation_custom_test.cc +++ b/google/cloud/internal/async_rest_long_running_operation_custom_test.cc @@ -20,8 +20,8 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include diff --git a/google/cloud/internal/async_rest_long_running_operation_test.cc b/google/cloud/internal/async_rest_long_running_operation_test.cc index 6be56145b8661..1a91521dd118c 100644 --- a/google/cloud/internal/async_rest_long_running_operation_test.cc +++ b/google/cloud/internal/async_rest_long_running_operation_test.cc @@ -20,8 +20,8 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include diff --git a/google/cloud/internal/async_rest_polling_loop.cc b/google/cloud/internal/async_rest_polling_loop.cc index 0d9e76a47a928..aa6a35d403b14 100644 --- a/google/cloud/internal/async_rest_polling_loop.cc +++ b/google/cloud/internal/async_rest_polling_loop.cc @@ -19,7 +19,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include #include diff --git a/google/cloud/internal/async_rest_polling_loop.h b/google/cloud/internal/async_rest_polling_loop.h index b19d95e8aadfd..a4f7cf7377ae3 100644 --- a/google/cloud/internal/async_rest_polling_loop.h +++ b/google/cloud/internal/async_rest_polling_loop.h @@ -25,7 +25,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/google/cloud/internal/async_rest_polling_loop_custom.h b/google/cloud/internal/async_rest_polling_loop_custom.h index fca11d85f2baf..2ef337c6d5b7d 100644 --- a/google/cloud/internal/async_rest_polling_loop_custom.h +++ b/google/cloud/internal/async_rest_polling_loop_custom.h @@ -27,7 +27,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include #include #include diff --git a/google/cloud/internal/async_rest_polling_loop_custom_test.cc b/google/cloud/internal/async_rest_polling_loop_custom_test.cc index 316c4d8492b82..fdecfe0710172 100644 --- a/google/cloud/internal/async_rest_polling_loop_custom_test.cc +++ b/google/cloud/internal/async_rest_polling_loop_custom_test.cc @@ -16,8 +16,8 @@ #include "google/cloud/internal/make_status.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/async_rest_polling_loop_test.cc b/google/cloud/internal/async_rest_polling_loop_test.cc index 41b99ef54517f..b382b427bf8be 100644 --- a/google/cloud/internal/async_rest_polling_loop_test.cc +++ b/google/cloud/internal/async_rest_polling_loop_test.cc @@ -20,8 +20,8 @@ #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { @@ -588,7 +588,6 @@ TEST(AsyncRestPollingLoopTest, PollThenCancelDuringPoll) { HasSubstr("operation cancelled")))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::OTelAttribute; @@ -724,8 +723,6 @@ TEST(AsyncRestPollingLoopTest, TraceCapturesOperationName) { "gl-cpp.LRO_name", "test-op-name"))))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal diff --git a/google/cloud/internal/async_rest_retry_loop_test.cc b/google/cloud/internal/async_rest_retry_loop_test.cc index 1fa7e50cae506..092daf90b63e6 100644 --- a/google/cloud/internal/async_rest_retry_loop_test.cc +++ b/google/cloud/internal/async_rest_retry_loop_test.cc @@ -559,7 +559,6 @@ TEST_F(AsyncRestRetryLoopCancelTest, ShutdownDuringTimer) { Contains(Pair("gcloud-cpp.retry.function", "test-location"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::SpanNamed; @@ -615,8 +614,6 @@ TEST(AsyncRestRetryLoopTest, CallSpanActiveDuringCancel) { (void)actual.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal diff --git a/google/cloud/internal/async_retry_loop_test.cc b/google/cloud/internal/async_retry_loop_test.cc index 679c06f5da4e4..7e200d4eec613 100644 --- a/google/cloud/internal/async_retry_loop_test.cc +++ b/google/cloud/internal/async_retry_loop_test.cc @@ -604,7 +604,6 @@ TEST_F(AsyncRetryLoopCancelTest, ShutdownDuringTimer) { Contains(Pair("gcloud-cpp.retry.function", "test-location"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::IsActive; using ::google::cloud::testing_util::SpanNamed; @@ -658,8 +657,6 @@ TEST(AsyncRetryLoopTest, CallSpanActiveDuringCancel) { (void)actual.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/async_retry_unary_rpc.h b/google/cloud/internal/async_retry_unary_rpc.h index b9f0fa367f317..930ccf4773581 100644 --- a/google/cloud/internal/async_retry_unary_rpc.h +++ b/google/cloud/internal/async_retry_unary_rpc.h @@ -21,7 +21,7 @@ #include "google/cloud/internal/setup_context.h" #include "google/cloud/retry_policy.h" #include "google/cloud/version.h" -#include +#include "google/protobuf/empty.pb.h" #include #include diff --git a/google/cloud/internal/async_retry_unary_rpc_test.cc b/google/cloud/internal/async_retry_unary_rpc_test.cc index dcd6b43af8c66..4c1d6cf21307f 100644 --- a/google/cloud/internal/async_retry_unary_rpc_test.cc +++ b/google/cloud/internal/async_retry_unary_rpc_test.cc @@ -19,8 +19,8 @@ #include "google/cloud/testing_util/fake_completion_queue_impl.h" #include "google/cloud/testing_util/mock_async_response_reader.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include diff --git a/google/cloud/internal/async_streaming_read_rpc_impl_test.cc b/google/cloud/internal/async_streaming_read_rpc_impl_test.cc index 31ec5c6eb3309..e8a1fbfaede47 100644 --- a/google/cloud/internal/async_streaming_read_rpc_impl_test.cc +++ b/google/cloud/internal/async_streaming_read_rpc_impl_test.cc @@ -172,8 +172,6 @@ TEST(AsyncStreamingReadRpcTest, Error) { stream.Finish().get()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::IsActive; TEST(AsyncStreamingReadRpcTest, SpanActiveAcrossAsyncGrpcOperations) { @@ -262,8 +260,6 @@ TEST(AsyncStreamingReadRpcTest, SpanActiveAcrossAsyncGrpcOperations) { (void)finish.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/async_streaming_read_rpc_logging_test.cc b/google/cloud/internal/async_streaming_read_rpc_logging_test.cc index b2b7ec9825be6..55cf6fc41ca98 100644 --- a/google/cloud/internal/async_streaming_read_rpc_logging_test.cc +++ b/google/cloud/internal/async_streaming_read_rpc_logging_test.cc @@ -18,7 +18,7 @@ #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/tracing_options.h" -#include +#include "google/protobuf/duration.pb.h" #include namespace google { diff --git a/google/cloud/internal/async_streaming_read_rpc_tracing.h b/google/cloud/internal/async_streaming_read_rpc_tracing.h index 71e77f2d02732..2099531b2754d 100644 --- a/google/cloud/internal/async_streaming_read_rpc_tracing.h +++ b/google/cloud/internal/async_streaming_read_rpc_tracing.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_STREAMING_READ_RPC_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_STREAMING_READ_RPC_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/async_streaming_read_rpc.h" #include "google/cloud/internal/grpc_opentelemetry.h" #include "google/cloud/version.h" @@ -108,6 +107,5 @@ class AsyncStreamingReadRpcTracing : public AsyncStreamingReadRpc { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_STREAMING_READ_RPC_TRACING_H diff --git a/google/cloud/internal/async_streaming_read_rpc_tracing_test.cc b/google/cloud/internal/async_streaming_read_rpc_tracing_test.cc index 8879d4882af90..52113a5ccb225 100644 --- a/google/cloud/internal/async_streaming_read_rpc_tracing_test.cc +++ b/google/cloud/internal/async_streaming_read_rpc_tracing_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/async_streaming_read_rpc_tracing.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/internal/opentelemetry.h" @@ -266,4 +265,3 @@ TEST(AsyncStreamingReadRpcTracing, StartedStreamShouldExtractMetadata) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/async_streaming_write_rpc_impl_test.cc b/google/cloud/internal/async_streaming_write_rpc_impl_test.cc index 235a2939c22b9..b065dec84d8bf 100644 --- a/google/cloud/internal/async_streaming_write_rpc_impl_test.cc +++ b/google/cloud/internal/async_streaming_write_rpc_impl_test.cc @@ -184,8 +184,6 @@ TEST(AsyncStreamingWriteRpcTest, Error) { stream.Finish().get().status()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::IsActive; TEST(AsyncStreamingWriteRpcTest, SpanActiveAcrossAsyncGrpcOperations) { @@ -287,8 +285,6 @@ TEST(AsyncStreamingWriteRpcTest, SpanActiveAcrossAsyncGrpcOperations) { (void)finish.get(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/async_streaming_write_rpc_logging_test.cc b/google/cloud/internal/async_streaming_write_rpc_logging_test.cc index 2838c0ce1bbba..4097c0dd884d4 100644 --- a/google/cloud/internal/async_streaming_write_rpc_logging_test.cc +++ b/google/cloud/internal/async_streaming_write_rpc_logging_test.cc @@ -18,8 +18,8 @@ #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/async_streaming_write_rpc_tracing.h b/google/cloud/internal/async_streaming_write_rpc_tracing.h index e962f7ac95c41..de64ccc9306e0 100644 --- a/google/cloud/internal/async_streaming_write_rpc_tracing.h +++ b/google/cloud/internal/async_streaming_write_rpc_tracing.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_STREAMING_WRITE_RPC_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_STREAMING_WRITE_RPC_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/async_streaming_write_rpc.h" #include "google/cloud/internal/grpc_opentelemetry.h" #include "google/cloud/version.h" @@ -122,6 +121,5 @@ class AsyncStreamingWriteRpcTracing GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_ASYNC_STREAMING_WRITE_RPC_TRACING_H diff --git a/google/cloud/internal/async_streaming_write_rpc_tracing_test.cc b/google/cloud/internal/async_streaming_write_rpc_tracing_test.cc index f7906db2982c5..960c0affac56c 100644 --- a/google/cloud/internal/async_streaming_write_rpc_tracing_test.cc +++ b/google/cloud/internal/async_streaming_write_rpc_tracing_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/async_streaming_write_rpc_tracing.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/internal/opentelemetry.h" @@ -293,4 +292,3 @@ TEST(AsyncStreamingWriteRpcTracing, StartedStreamShouldExtractMetadata) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/call_context.h b/google/cloud/internal/call_context.h index eb6575f0aab47..0134614de518e 100644 --- a/google/cloud/internal/call_context.h +++ b/google/cloud/internal/call_context.h @@ -18,11 +18,9 @@ #include "google/cloud/internal/opentelemetry_context.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include @@ -44,9 +42,7 @@ struct CallContext { CallContext() : CallContext(SaveCurrentOptions()) {} ImmutableOptions options; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY OTelContext otel_context = CurrentOTelContext(); -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY }; /** @@ -58,13 +54,10 @@ class ScopedCallContext { public: explicit ScopedCallContext(CallContext call_context) : options_span_(std::move(call_context.options)) -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY // clang-format off , scoped_otel_context_(std::move(call_context.otel_context)) // clang-format on -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - { - } + {} // `ScopedCallContext` should not be copied/moved. ScopedCallContext(ScopedCallContext const&) = delete; @@ -78,9 +71,7 @@ class ScopedCallContext { private: OptionsSpan options_span_; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY ScopedOTelContext scoped_otel_context_; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY }; } // namespace internal diff --git a/google/cloud/internal/call_context_test.cc b/google/cloud/internal/call_context_test.cc index 79e1c2c2c74fb..d05231e8ce817 100644 --- a/google/cloud/internal/call_context_test.cc +++ b/google/cloud/internal/call_context_test.cc @@ -44,7 +44,6 @@ TEST(CallContext, Options) { EXPECT_FALSE(CallContext().options->has()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::testing::ElementsAre; using ::testing::IsEmpty; @@ -67,8 +66,6 @@ TEST(CallContext, OTel) { EXPECT_THAT(CallContext().otel_context, IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/debug_string_protobuf.cc b/google/cloud/internal/debug_string_protobuf.cc index 30e6412e6d3a3..29e48ecd22ba7 100644 --- a/google/cloud/internal/debug_string_protobuf.cc +++ b/google/cloud/internal/debug_string_protobuf.cc @@ -15,9 +15,9 @@ #include "google/cloud/internal/debug_string_protobuf.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "absl/time/time.h" -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include -#include namespace google { namespace cloud { diff --git a/google/cloud/internal/debug_string_protobuf_test.cc b/google/cloud/internal/debug_string_protobuf_test.cc index bc23db2879b78..bb6bfed365c57 100644 --- a/google/cloud/internal/debug_string_protobuf_test.cc +++ b/google/cloud/internal/debug_string_protobuf_test.cc @@ -15,10 +15,10 @@ #include "google/cloud/internal/debug_string_protobuf.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/iam/v1/policy.pb.h" +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include -#include #include namespace google { diff --git a/google/cloud/internal/debug_string_status.cc b/google/cloud/internal/debug_string_status.cc index 4f6655e2862eb..1ef72d76bffa0 100644 --- a/google/cloud/internal/debug_string_status.cc +++ b/google/cloud/internal/debug_string_status.cc @@ -15,9 +15,9 @@ #include "google/cloud/internal/debug_string_status.h" #include "google/cloud/internal/debug_string_protobuf.h" #include "google/cloud/internal/status_payload_keys.h" -#include -#include -#include +#include "google/protobuf/any.pb.h" +#include "google/rpc/error_details.pb.h" +#include "google/rpc/status.pb.h" #include namespace google { diff --git a/google/cloud/internal/debug_string_status_test.cc b/google/cloud/internal/debug_string_status_test.cc index d1f1bec903442..008605e063309 100644 --- a/google/cloud/internal/debug_string_status_test.cc +++ b/google/cloud/internal/debug_string_status_test.cc @@ -15,8 +15,8 @@ #include "google/cloud/internal/debug_string_status.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/rpc/error_details.pb.h" +#include "google/rpc/status.pb.h" #include namespace google { diff --git a/google/cloud/internal/extract_long_running_result.h b/google/cloud/internal/extract_long_running_result.h index 8ae14cfc9b5d2..15a269513aff0 100644 --- a/google/cloud/internal/extract_long_running_result.h +++ b/google/cloud/internal/extract_long_running_result.h @@ -18,8 +18,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/functional/function_ref.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/protobuf/any.pb.h" #include namespace google { diff --git a/google/cloud/internal/extract_long_running_result_test.cc b/google/cloud/internal/extract_long_running_result_test.cc index 8d99f402d261f..7eb810a85416e 100644 --- a/google/cloud/internal/extract_long_running_result_test.cc +++ b/google/cloud/internal/extract_long_running_result_test.cc @@ -16,7 +16,7 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/grpc_impersonate_service_account_integration_test.cc b/google/cloud/internal/grpc_impersonate_service_account_integration_test.cc index 684a389ea00d6..7f1518a1e1cee 100644 --- a/google/cloud/internal/grpc_impersonate_service_account_integration_test.cc +++ b/google/cloud/internal/grpc_impersonate_service_account_integration_test.cc @@ -22,7 +22,7 @@ #include "google/cloud/log.h" #include "google/cloud/testing_util/integration_test.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/internal/grpc_opentelemetry.cc b/google/cloud/internal/grpc_opentelemetry.cc index 0f9308bbab1b1..ab05520280fee 100644 --- a/google/cloud/internal/grpc_opentelemetry.cc +++ b/google/cloud/internal/grpc_opentelemetry.cc @@ -22,21 +22,18 @@ #include "google/cloud/options.h" #include "absl/strings/match.h" #include -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include -#include +#include +#include #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace internal { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { /** @@ -110,17 +107,17 @@ std::pair MakeAttribute( opentelemetry::nostd::shared_ptr MakeSpanGrpc( opentelemetry::nostd::string_view service, opentelemetry::nostd::string_view method) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kClient; return internal::MakeSpan( absl::StrCat(absl::string_view{service.data(), service.size()}, "/", absl::string_view{method.data(), method.size()}), - {{sc::kRpcSystem, sc::RpcSystemValues::kGrpc}, - {sc::kRpcService, service}, - {sc::kRpcMethod, method}, + {{sc::rpc::kRpcSystem, sc::rpc::RpcSystemValues::kGrpc}, + {sc::rpc::kRpcService, service}, + {sc::rpc::kRpcMethod, method}, {/*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp}, + sc::network::NetworkTransportValues::kTcp}, {"grpc.version", grpc::Version()}}, options); } @@ -165,7 +162,6 @@ future EndSpan( return EndSpan(*s, std::move(t)); }); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/grpc_opentelemetry.h b/google/cloud/internal/grpc_opentelemetry.h index 500e3c67c363f..9ea8bc86a80e2 100644 --- a/google/cloud/internal/grpc_opentelemetry.h +++ b/google/cloud/internal/grpc_opentelemetry.h @@ -22,10 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/version.h" #include -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include @@ -34,8 +32,6 @@ namespace cloud { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace internal { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Make a span, setting attributes related to gRPC. * @@ -112,8 +108,6 @@ future> EndSpan( }); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Returns a traced timer, if OpenTelemetry tracing is enabled. */ @@ -121,14 +115,12 @@ template future> TracedAsyncBackoff( CompletionQueue& cq, Options const& options, std::chrono::duration duration, std::string const& name) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (TracingEnabled(options)) { auto span = MakeSpan(name); OTelScope scope(span); auto timer = cq.MakeRelativeTimer(duration); return EndSpan(std::move(span), std::move(timer)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY (void)options; (void)name; return cq.MakeRelativeTimer(duration); diff --git a/google/cloud/internal/grpc_opentelemetry_test.cc b/google/cloud/internal/grpc_opentelemetry_test.cc index 135ce26dabfef..2ad4667b69d0a 100644 --- a/google/cloud/internal/grpc_opentelemetry_test.cc +++ b/google/cloud/internal/grpc_opentelemetry_test.cc @@ -22,10 +22,9 @@ #include "google/cloud/testing_util/validate_propagator.h" #include #include -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include +#include namespace google { namespace cloud { @@ -36,7 +35,6 @@ namespace { using ::testing::ByMove; using ::testing::Return; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; @@ -57,7 +55,7 @@ using ::testing::IsEmpty; using ::testing::Pair; TEST(OpenTelemetry, MakeSpanGrpc) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto span = MakeSpanGrpc("google.cloud.foo.v1.Foo", "GetBar"); @@ -70,14 +68,14 @@ TEST(OpenTelemetry, MakeSpanGrpc) { SpanHasInstrumentationScope(), SpanKindIsClient(), SpanNamed("google.cloud.foo.v1.Foo/GetBar"), SpanHasAttributes( - OTelAttribute(sc::kRpcSystem, - sc::RpcSystemValues::kGrpc), - OTelAttribute(sc::kRpcService, + OTelAttribute(sc::rpc::kRpcSystem, + sc::rpc::RpcSystemValues::kGrpc), + OTelAttribute(sc::rpc::kRpcService, "google.cloud.foo.v1.Foo"), - OTelAttribute(sc::kRpcMethod, "GetBar"), + OTelAttribute(sc::rpc::kRpcMethod, "GetBar"), OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp), + sc::network::NetworkTransportValues::kTcp), OTelAttribute("grpc.version", grpc::Version()))))); } @@ -321,22 +319,6 @@ TEST(OpenTelemetry, TracedAsyncBackoffPreservesContext) { SpanNamed("parent"))); } -#else - -TEST(NoOpenTelemetry, TracedAsyncBackoff) { - auto const duration = std::chrono::nanoseconds(100); - auto mock_cq = std::make_shared(); - EXPECT_CALL(*mock_cq, MakeRelativeTimer(duration)) - .WillOnce(Return(ByMove(make_ready_future( - make_status_or(std::chrono::system_clock::now()))))); - CompletionQueue cq(mock_cq); - - auto f = TracedAsyncBackoff(cq, Options{}, duration, "Async Backoff"); - EXPECT_STATUS_OK(f.get()); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/log_wrapper_test.cc b/google/cloud/internal/log_wrapper_test.cc index 281fe1be5be4e..da021d88f6e62 100644 --- a/google/cloud/internal/log_wrapper_test.cc +++ b/google/cloud/internal/log_wrapper_test.cc @@ -18,8 +18,8 @@ #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include #include diff --git a/google/cloud/internal/minimal_iam_credentials_stub.cc b/google/cloud/internal/minimal_iam_credentials_stub.cc index d88ca2e5582d3..265e2711eda9b 100644 --- a/google/cloud/internal/minimal_iam_credentials_stub.cc +++ b/google/cloud/internal/minimal_iam_credentials_stub.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/trace_propagator.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/internal/url_encode.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" namespace google { namespace cloud { @@ -161,7 +161,6 @@ class AsyncAccessTokenGeneratorLogging : public MinimalIamCredentialsStub { TracingOptions tracing_options_; }; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY class AsyncAccessTokenGeneratorTracing : public MinimalIamCredentialsStub { public: explicit AsyncAccessTokenGeneratorTracing( @@ -197,8 +196,6 @@ class AsyncAccessTokenGeneratorTracing : public MinimalIamCredentialsStub { std::shared_ptr propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace std::shared_ptr DecorateMinimalIamCredentialsStub( @@ -209,11 +206,9 @@ std::shared_ptr DecorateMinimalIamCredentialsStub( impl = std::make_shared( std::move(impl), options.get()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (TracingEnabled(options)) { impl = std::make_shared(std::move(impl)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return impl; } diff --git a/google/cloud/internal/minimal_iam_credentials_stub.h b/google/cloud/internal/minimal_iam_credentials_stub.h index b126995c74a75..4c92dd9a0d269 100644 --- a/google/cloud/internal/minimal_iam_credentials_stub.h +++ b/google/cloud/internal/minimal_iam_credentials_stub.h @@ -19,7 +19,7 @@ #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include namespace google { diff --git a/google/cloud/internal/minimal_iam_credentials_stub_test.cc b/google/cloud/internal/minimal_iam_credentials_stub_test.cc index 953bb03a970e9..1cd3cab0c1638 100644 --- a/google/cloud/internal/minimal_iam_credentials_stub_test.cc +++ b/google/cloud/internal/minimal_iam_credentials_stub_test.cc @@ -25,7 +25,7 @@ #include "google/cloud/testing_util/validate_metadata.h" #include "google/cloud/testing_util/validate_propagator.h" #include "google/cloud/universe_domain_options.h" -#include +#include "google/iam/credentials/v1/iamcredentials.grpc.pb.h" #include namespace google { @@ -219,7 +219,6 @@ TEST_F(MinimalIamCredentialsStubTest, LoggingComponentNames) { } } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::OTelAttribute; @@ -342,7 +341,6 @@ TEST_F(MinimalIamCredentialsStubTest, SignBlobTracing) { OTelAttribute("grpc.peer", _), OTelAttribute("gl-cpp.status_code", kErrorCode))))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY TEST(MakeMinimalIamCredentialsOptions, Default) { auto o = MakeMinimalIamCredentialsOptions( diff --git a/google/cloud/internal/opentelemetry.cc b/google/cloud/internal/opentelemetry.cc index fc21f52abae06..04b0593c1fccc 100644 --- a/google/cloud/internal/opentelemetry.cc +++ b/google/cloud/internal/opentelemetry.cc @@ -15,21 +15,17 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/opentelemetry_options.h" #include "google/cloud/options.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include #include #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace internal { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - opentelemetry::nostd::shared_ptr GetTracer( Options const&) { auto provider = opentelemetry::trace::Provider::GetTracerProvider(); @@ -147,26 +143,16 @@ std::string CurrentThreadId() { return std::move(os).str(); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY bool TracingEnabled(Options const& options) { return options.get(); } -#else -bool TracingEnabled(Options const&) { return false; } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY void AddSpanAttribute(Options const& options, std::string const& key, std::string const& value) { if (!TracingEnabled(options)) return; auto span = opentelemetry::trace::Tracer::GetCurrentSpan(); span->SetAttribute(key, value); } -#else -void AddSpanAttribute(Options const&, std::string const&, std::string const&) {} -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/opentelemetry.h b/google/cloud/internal/opentelemetry.h index 375da5125e7bd..bd4ffe84ee42f 100644 --- a/google/cloud/internal/opentelemetry.h +++ b/google/cloud/internal/opentelemetry.h @@ -21,25 +21,21 @@ #include "google/cloud/status.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include #include #include #include #include -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include +#include namespace google { namespace cloud { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace internal { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Returns a [tracer] to use for creating [spans]. * @@ -234,8 +230,6 @@ std::string ToString(opentelemetry::trace::SpanId const& span_id); /// Gets the current thread id. std::string CurrentThreadId(); -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - bool TracingEnabled(Options const& options); /// Wraps the sleeper in a span, if tracing is enabled. @@ -244,7 +238,6 @@ std::function)> MakeTracedSleeper( Options const& options, std::function)> sleeper, std::string const& name) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (TracingEnabled(options)) { return [name, sleeper = std::move(sleeper)]( std::chrono::duration d) { @@ -255,7 +248,6 @@ std::function)> MakeTracedSleeper( span->End(); }; } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY (void)options; (void)name; return sleeper; diff --git a/google/cloud/internal/opentelemetry_context.cc b/google/cloud/internal/opentelemetry_context.cc index 9afda7f15cec9..44f15067b78d1 100644 --- a/google/cloud/internal/opentelemetry_context.cc +++ b/google/cloud/internal/opentelemetry_context.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/opentelemetry_context.h" #include @@ -76,4 +75,3 @@ OTelScope::~OTelScope() { DetachOTelContext(context_); } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/opentelemetry_context.h b/google/cloud/internal/opentelemetry_context.h index 124715826ed8f..c821a63fc18a9 100644 --- a/google/cloud/internal/opentelemetry_context.h +++ b/google/cloud/internal/opentelemetry_context.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_OPENTELEMETRY_CONTEXT_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_OPENTELEMETRY_CONTEXT_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/version.h" #include #include @@ -125,6 +124,5 @@ class ScopedOTelContext { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_OPENTELEMETRY_CONTEXT_H diff --git a/google/cloud/internal/opentelemetry_context_test.cc b/google/cloud/internal/opentelemetry_context_test.cc index 06c3a206fe541..dea9890cba137 100644 --- a/google/cloud/internal/opentelemetry_context_test.cc +++ b/google/cloud/internal/opentelemetry_context_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/opentelemetry_context.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" @@ -177,4 +176,3 @@ TEST_F(OTelContextTest, ThreadLocalStorage) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/opentelemetry_test.cc b/google/cloud/internal/opentelemetry_test.cc index 0de694de1df4c..96358259d1712 100644 --- a/google/cloud/internal/opentelemetry_test.cc +++ b/google/cloud/internal/opentelemetry_test.cc @@ -18,10 +18,8 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { @@ -32,7 +30,6 @@ namespace { using ms = std::chrono::milliseconds; using ::testing::MockFunction; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; @@ -447,23 +444,6 @@ TEST(OpenTelemetry, AddSpanAttributeDisabled) { Not(SpanHasAttributes(OTelAttribute("key", "value")))))); } -#else - -TEST(NoOpenTelemetry, TracingEnabled) { - EXPECT_FALSE(TracingEnabled(Options{})); -} - -TEST(NoOpenTelemetry, MakeTracedSleeper) { - MockFunction mock_sleeper; - EXPECT_CALL(mock_sleeper, Call(ms(42))); - - auto sleeper = mock_sleeper.AsStdFunction(); - auto result = MakeTracedSleeper(Options{}, sleeper, "Backoff"); - result(ms(42)); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/rest_carrier.cc b/google/cloud/internal/rest_carrier.cc index 7b700fe20db3a..719b966c3a50f 100644 --- a/google/cloud/internal/rest_carrier.cc +++ b/google/cloud/internal/rest_carrier.cc @@ -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 "google/cloud/internal/rest_carrier.h" #include "google/cloud/internal/noexcept_action.h" #include "google/cloud/internal/rest_context.h" @@ -44,5 +42,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/rest_carrier.h b/google/cloud/internal/rest_carrier.h index f201ee35960c3..a36e721ac3e94 100644 --- a/google/cloud/internal/rest_carrier.h +++ b/google/cloud/internal/rest_carrier.h @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_REST_CARRIER_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_REST_CARRIER_H @@ -53,5 +51,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace google #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_REST_CARRIER_H - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/rest_carrier_test.cc b/google/cloud/internal/rest_carrier_test.cc index b059cbe6f7027..62661b8402e4b 100644 --- a/google/cloud/internal/rest_carrier_test.cc +++ b/google/cloud/internal/rest_carrier_test.cc @@ -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 "google/cloud/internal/rest_carrier.h" #include @@ -42,5 +40,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/rest_log_wrapper_test.cc b/google/cloud/internal/rest_log_wrapper_test.cc index 901d9de6b117d..e1e8248bbdd9c 100644 --- a/google/cloud/internal/rest_log_wrapper_test.cc +++ b/google/cloud/internal/rest_log_wrapper_test.cc @@ -16,8 +16,8 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/rest_opentelemetry.cc b/google/cloud/internal/rest_opentelemetry.cc index c59c1382466db..b06ba040589ab 100644 --- a/google/cloud/internal/rest_opentelemetry.cc +++ b/google/cloud/internal/rest_opentelemetry.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/rest_opentelemetry.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/opentelemetry.h" @@ -22,8 +21,8 @@ #include "absl/strings/match.h" #include #include +#include #include -#include #include #include @@ -71,13 +70,13 @@ void InjectTraceContext( opentelemetry::nostd::shared_ptr MakeSpanHttp( RestRequest const& request, opentelemetry::nostd::string_view method) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kClient; auto span = internal::MakeSpan( absl::StrCat("HTTP/", absl::string_view{method.data(), method.size()}), {{/*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp}, + sc::network::NetworkTransportValues::kTcp}, {/*sc::kHttpRequestMethod=*/"http.request.method", method}, {/*sc::kUrlFull=*/"url.full", request.path()}}, options); @@ -100,5 +99,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/rest_opentelemetry.h b/google/cloud/internal/rest_opentelemetry.h index 825e70b602701..16c5e74c71991 100644 --- a/google/cloud/internal/rest_opentelemetry.h +++ b/google/cloud/internal/rest_opentelemetry.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_REST_OPENTELEMETRY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_REST_OPENTELEMETRY_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/rest_request.h" #include "google/cloud/internal/trace_propagator.h" #include "google/cloud/options.h" @@ -61,6 +60,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_REST_OPENTELEMETRY_H diff --git a/google/cloud/internal/rest_opentelemetry_test.cc b/google/cloud/internal/rest_opentelemetry_test.cc index 56aef72e06be1..672e60ab86f03 100644 --- a/google/cloud/internal/rest_opentelemetry_test.cc +++ b/google/cloud/internal/rest_opentelemetry_test.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/rest_opentelemetry.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include namespace google { namespace cloud { @@ -39,7 +38,7 @@ using ::testing::Gt; using ::testing::Pair; TEST(RestOpentelemetry, MakeSpanHttp) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto constexpr kUrl = "https://storage.googleapis.com/storage/v1/b/my-bucket"; @@ -66,7 +65,7 @@ TEST(RestOpentelemetry, MakeSpanHttp) { SpanHasAttributes( OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp), + sc::network::NetworkTransportValues::kTcp), OTelAttribute( /*sc::kHttpRequestMethod=*/"http.request.method", "GET"), OTelAttribute(/*sc::kUrlFull=*/"url.full", kUrl), @@ -101,5 +100,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/rest_retry_loop_test.cc b/google/cloud/internal/rest_retry_loop_test.cc index 79e17cc8dc648..2d98af733e4ee 100644 --- a/google/cloud/internal/rest_retry_loop_test.cc +++ b/google/cloud/internal/rest_retry_loop_test.cc @@ -235,7 +235,6 @@ TEST(RestRetryLoopTest, ExhaustedOnStart) { EXPECT_THAT(metadata, Contains(Pair("gcloud-cpp.retry.function", __func__))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -272,8 +271,6 @@ TEST(RestRetryLoopTest, TracingDisabled) { EXPECT_THAT(spans, IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal diff --git a/google/cloud/internal/rest_stub_helpers_test.cc b/google/cloud/internal/rest_stub_helpers_test.cc index fcf7e5a102fab..caec4dbc1b8c9 100644 --- a/google/cloud/internal/rest_stub_helpers_test.cc +++ b/google/cloud/internal/rest_stub_helpers_test.cc @@ -17,9 +17,9 @@ #include "google/cloud/testing_util/mock_rest_client.h" #include "google/cloud/testing_util/mock_rest_response.h" #include "google/cloud/testing_util/status_matchers.h" -#include -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include #include #include diff --git a/google/cloud/internal/retry_loop_test.cc b/google/cloud/internal/retry_loop_test.cc index 2040bbd5a4fc8..e85341d4f4c1a 100644 --- a/google/cloud/internal/retry_loop_test.cc +++ b/google/cloud/internal/retry_loop_test.cc @@ -276,7 +276,6 @@ TEST(RetryLoopTest, ConfigureContext) { /*request=*/0, "error message"); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -313,8 +312,6 @@ TEST(RetryLoopTest, TracingDisabled) { EXPECT_THAT(spans, IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/internal/streaming_read_rpc_logging_test.cc b/google/cloud/internal/streaming_read_rpc_logging_test.cc index 324c599de22e3..c2593db8e855c 100644 --- a/google/cloud/internal/streaming_read_rpc_logging_test.cc +++ b/google/cloud/internal/streaming_read_rpc_logging_test.cc @@ -16,8 +16,8 @@ #include "google/cloud/status.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/tracing_options.h" -#include "absl/types/optional.h" -#include +#include "absl/types/variant.h" +#include "google/protobuf/duration.pb.h" #include namespace google { diff --git a/google/cloud/internal/streaming_read_rpc_tracing.h b/google/cloud/internal/streaming_read_rpc_tracing.h index 36125b12051c7..71c885920fd71 100644 --- a/google/cloud/internal/streaming_read_rpc_tracing.h +++ b/google/cloud/internal/streaming_read_rpc_tracing.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_STREAMING_READ_RPC_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_STREAMING_READ_RPC_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/grpc_opentelemetry.h" #include "google/cloud/internal/grpc_request_metadata.h" #include "google/cloud/internal/opentelemetry.h" @@ -77,6 +76,5 @@ class StreamingReadRpcTracing : public StreamingReadRpc { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_STREAMING_READ_RPC_TRACING_H diff --git a/google/cloud/internal/streaming_read_rpc_tracing_test.cc b/google/cloud/internal/streaming_read_rpc_tracing_test.cc index b7f276d42c48b..7f7083adef5ac 100644 --- a/google/cloud/internal/streaming_read_rpc_tracing_test.cc +++ b/google/cloud/internal/streaming_read_rpc_tracing_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/streaming_read_rpc_tracing.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" @@ -165,4 +164,3 @@ TEST(StreamingReadRpcTracingTest, SpanEndsOnDestruction) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/streaming_write_rpc_logging_test.cc b/google/cloud/internal/streaming_write_rpc_logging_test.cc index 93792ea36d335..15ac156aecfc9 100644 --- a/google/cloud/internal/streaming_write_rpc_logging_test.cc +++ b/google/cloud/internal/streaming_write_rpc_logging_test.cc @@ -17,8 +17,8 @@ #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/tracing_options.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/streaming_write_rpc_tracing.h b/google/cloud/internal/streaming_write_rpc_tracing.h index 695efa7e65620..dc0624e17f77b 100644 --- a/google/cloud/internal/streaming_write_rpc_tracing.h +++ b/google/cloud/internal/streaming_write_rpc_tracing.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_STREAMING_WRITE_RPC_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_STREAMING_WRITE_RPC_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/grpc_opentelemetry.h" #include "google/cloud/internal/grpc_request_metadata.h" #include "google/cloud/internal/opentelemetry.h" @@ -82,6 +81,5 @@ class StreamingWriteRpcTracing GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_STREAMING_WRITE_RPC_TRACING_H diff --git a/google/cloud/internal/streaming_write_rpc_tracing_test.cc b/google/cloud/internal/streaming_write_rpc_tracing_test.cc index d2d37ae363fb4..29dd467b59df7 100644 --- a/google/cloud/internal/streaming_write_rpc_tracing_test.cc +++ b/google/cloud/internal/streaming_write_rpc_tracing_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/streaming_write_rpc_tracing.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" @@ -180,4 +179,3 @@ TEST(StreamingWriteRpcTracingTest, SpanEndsOnDestruction) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/time_utils.cc b/google/cloud/internal/time_utils.cc index 82ee1637faf8b..998a3664be90d 100644 --- a/google/cloud/internal/time_utils.cc +++ b/google/cloud/internal/time_utils.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "google/cloud/internal/time_utils.h" -#include +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/time_utils.h b/google/cloud/internal/time_utils.h index 699a007c2938d..4d6b7915a01fc 100644 --- a/google/cloud/internal/time_utils.h +++ b/google/cloud/internal/time_utils.h @@ -17,8 +17,8 @@ #include "google/cloud/version.h" #include "absl/time/time.h" -#include -#include +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/internal/trace_propagator.cc b/google/cloud/internal/trace_propagator.cc index 8e46cacc2cce9..856f314330d41 100644 --- a/google/cloud/internal/trace_propagator.cc +++ b/google/cloud/internal/trace_propagator.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/trace_propagator.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "absl/strings/numbers.h" @@ -104,5 +103,3 @@ MakePropagator() { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/trace_propagator.h b/google/cloud/internal/trace_propagator.h index 7a70844e83c85..47accb5ec8820 100644 --- a/google/cloud/internal/trace_propagator.h +++ b/google/cloud/internal/trace_propagator.h @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACE_PROPAGATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACE_PROPAGATOR_H @@ -50,5 +48,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace google #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACE_PROPAGATOR_H - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/trace_propagator_test.cc b/google/cloud/internal/trace_propagator_test.cc index 66e4fba1b3c26..c6c9e17b773a5 100644 --- a/google/cloud/internal/trace_propagator_test.cc +++ b/google/cloud/internal/trace_propagator_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/trace_propagator.h" #include #include @@ -114,4 +113,3 @@ TEST(CloudTraceContextPropagator, Fields) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/traced_stream_range.h b/google/cloud/internal/traced_stream_range.h index e31106e6b6bfc..8342febf24c72 100644 --- a/google/cloud/internal/traced_stream_range.h +++ b/google/cloud/internal/traced_stream_range.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACED_STREAM_RANGE_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACED_STREAM_RANGE_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/stream_range.h" #include @@ -81,6 +80,5 @@ StreamRange MakeTracedStreamRange( GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACED_STREAM_RANGE_H diff --git a/google/cloud/internal/traced_stream_range_test.cc b/google/cloud/internal/traced_stream_range_test.cc index aef5efd6e5404..e0dafd3a66a49 100644 --- a/google/cloud/internal/traced_stream_range_test.cc +++ b/google/cloud/internal/traced_stream_range_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/traced_stream_range.h" #include "google/cloud/mocks/mock_stream_range.h" #include "google/cloud/internal/make_status.h" @@ -129,4 +128,3 @@ TEST(TracedStreamRange, SpanInactiveWhileIterating) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/tracing_http_payload.cc b/google/cloud/internal/tracing_http_payload.cc index 6f79d864c34b3..b05219f500fd6 100644 --- a/google/cloud/internal/tracing_http_payload.cc +++ b/google/cloud/internal/tracing_http_payload.cc @@ -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 "google/cloud/internal/tracing_http_payload.h" #include "google/cloud/internal/opentelemetry.h" #include @@ -66,5 +64,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/tracing_http_payload.h b/google/cloud/internal/tracing_http_payload.h index 26af6771ae58b..0b8939ff0ff6c 100644 --- a/google/cloud/internal/tracing_http_payload.h +++ b/google/cloud/internal/tracing_http_payload.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACING_HTTP_PAYLOAD_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACING_HTTP_PAYLOAD_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/internal/http_payload.h" #include #include @@ -48,6 +46,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACING_HTTP_PAYLOAD_H diff --git a/google/cloud/internal/tracing_http_payload_test.cc b/google/cloud/internal/tracing_http_payload_test.cc index d922052a779b1..24c6ad4dbc607 100644 --- a/google/cloud/internal/tracing_http_payload_test.cc +++ b/google/cloud/internal/tracing_http_payload_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/tracing_http_payload.h" #include "google/cloud/internal/rest_opentelemetry.h" #include "google/cloud/testing_util/mock_http_payload.h" @@ -20,7 +19,7 @@ #include "google/cloud/testing_util/status_matchers.h" #include #include -#include +#include namespace google { namespace cloud { @@ -66,7 +65,7 @@ auto MakeReadMatcher(std::int64_t buffer_size) { } TEST(TracingHttpPayload, Success) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto impl = MakeMockHttpPayloadSuccess(MockContents()); @@ -86,13 +85,13 @@ TEST(TracingHttpPayload, Success) { SpanKindIsClient(), SpanHasAttributes(OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp)), + sc::network::NetworkTransportValues::kTcp)), SpanHasEvents(MakeReadMatcher(16, 16), MakeReadMatcher(16, 16), MakeReadMatcher(16, 11), MakeReadMatcher(16, 0))))); } TEST(TracingHttpPayload, Failure) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); RestRequest request("https://example.com/ignored"); @@ -120,7 +119,7 @@ TEST(TracingHttpPayload, Failure) { SpanHasAttributes( OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp), + sc::network::NetworkTransportValues::kTcp), OTelAttribute("gl-cpp.status_code", "UNAVAILABLE")), SpanHasEvents(MakeReadMatcher(16, 16), MakeReadMatcher(16))))); } @@ -130,5 +129,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/tracing_rest_client.cc b/google/cloud/internal/tracing_rest_client.cc index 0badc6ffeb709..94aa7f807abfe 100644 --- a/google/cloud/internal/tracing_rest_client.cc +++ b/google/cloud/internal/tracing_rest_client.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/internal/tracing_rest_client.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/internal/rest_opentelemetry.h" @@ -231,22 +230,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#else - -namespace google { -namespace cloud { -namespace rest_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -std::unique_ptr MakeTracingRestClient( - std::unique_ptr client) { - return client; -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace rest_internal -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/tracing_rest_client_test.cc b/google/cloud/internal/tracing_rest_client_test.cc index 00ef20b9beb5c..9e5994bd4dae3 100644 --- a/google/cloud/internal/tracing_rest_client_test.cc +++ b/google/cloud/internal/tracing_rest_client_test.cc @@ -19,11 +19,9 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include +#include #include -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { @@ -48,7 +46,6 @@ std::string MockContents() { return "The quick brown fox jumps over the lazy dog"; } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EventNamed; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; @@ -66,7 +63,7 @@ using ::testing::ResultOf; using ::testing::UnorderedElementsAre; TEST(TracingRestClient, Delete) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto impl = std::make_unique(); @@ -107,7 +104,7 @@ TEST(TracingRestClient, Delete) { SpanHasAttributes( OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp), + sc::network::NetworkTransportValues::kTcp), OTelAttribute( /*sc::kHttpRequestMethod=*/"http.request.method", "DELETE"), @@ -209,7 +206,7 @@ TEST(TracingRestClient, PropagatesTraceContext) { } TEST(TracingRestClient, WithRestContextDetails) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto impl = std::make_unique(); @@ -256,7 +253,7 @@ TEST(TracingRestClient, WithRestContextDetails) { SpanHasAttributes( OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp), + sc::network::NetworkTransportValues::kTcp), OTelAttribute( /*sc::kHttpRequestMethod=*/"http.request.method", "POST"), OTelAttribute(/*sc::kUrlFull=*/"url.full", kUrl), @@ -360,39 +357,6 @@ TEST(TracingRestClient, CachedConnection) { SpanHasEvents(EventNamed("gl-cpp.curl.connected"))))); } -#else - -TEST(TracingRestClient, NoOpenTelemetry) { - auto impl = std::make_unique(); - EXPECT_CALL(*impl, Delete).WillOnce([](RestContext&, RestRequest const&) { - auto response = std::make_unique(); - EXPECT_CALL(*response, StatusCode) - .WillRepeatedly(Return(HttpStatusCode::kOk)); - EXPECT_CALL(*response, Headers).WillRepeatedly(Return(MockHeaders())); - EXPECT_CALL(std::move(*response), ExtractPayload).WillOnce([] { - return MakeMockHttpPayloadSuccess(MockContents()); - }); - return std::unique_ptr(std::move(response)); - }); - - auto constexpr kUrl = "https://storage.googleapis.com/storage/v1/b/my-bucket"; - RestRequest request(kUrl); - request.AddHeader("x-test-header-3", "value3"); - - auto client = MakeTracingRestClient(std::move(impl)); - rest_internal::RestContext context; - auto r = client->Delete(context, request); - ASSERT_STATUS_OK(r); - auto response = *std::move(r); - ASSERT_THAT(response, NotNull()); - EXPECT_THAT(response->StatusCode(), Eq(HttpStatusCode::kOk)); - EXPECT_THAT(response->Headers(), ElementsAreArray(MockHeaders())); - auto contents = ReadAll(std::move(*response).ExtractPayload()); - EXPECT_THAT(contents, IsOkAndHolds(MockContents())); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal diff --git a/google/cloud/internal/tracing_rest_response.cc b/google/cloud/internal/tracing_rest_response.cc index 9e00d853cecd5..f1d15cc326694 100644 --- a/google/cloud/internal/tracing_rest_response.cc +++ b/google/cloud/internal/tracing_rest_response.cc @@ -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 "google/cloud/internal/tracing_rest_response.h" #include "google/cloud/internal/tracing_http_payload.h" @@ -40,5 +38,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/tracing_rest_response.h b/google/cloud/internal/tracing_rest_response.h index 21f2bd7d9d5ff..177b23e8ce072 100644 --- a/google/cloud/internal/tracing_rest_response.h +++ b/google/cloud/internal/tracing_rest_response.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACING_REST_RESPONSE_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACING_REST_RESPONSE_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/internal/rest_response.h" #include #include @@ -49,6 +47,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_TRACING_REST_RESPONSE_H diff --git a/google/cloud/internal/tracing_rest_response_test.cc b/google/cloud/internal/tracing_rest_response_test.cc index 722e121ba953d..b2151ee63c732 100644 --- a/google/cloud/internal/tracing_rest_response_test.cc +++ b/google/cloud/internal/tracing_rest_response_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/tracing_rest_response.h" #include "google/cloud/internal/rest_opentelemetry.h" #include "google/cloud/testing_util/mock_http_payload.h" @@ -21,7 +20,7 @@ #include "google/cloud/testing_util/status_matchers.h" #include #include -#include +#include namespace google { namespace cloud { @@ -57,7 +56,7 @@ auto MakeReadMatcher(std::int64_t buffer_size, std::int64_t read_size) { } TEST(TracingRestResponseTest, Success) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); RestRequest request("https://example.com/ignored"); @@ -89,7 +88,7 @@ TEST(TracingRestResponseTest, Success) { SpanKindIsClient(), SpanHasAttributes(OTelAttribute( /*sc::kNetworkTransport=*/"network.transport", - sc::NetTransportValues::kIpTcp)), + sc::network::NetworkTransportValues::kTcp)), SpanHasEvents(MakeReadMatcher(kBufferSize, content_size), MakeReadMatcher(kBufferSize, 0))))); } @@ -99,5 +98,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace rest_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/internal/version_info.h b/google/cloud/internal/version_info.h index 9ff28ad258b11..f1c5637888606 100644 --- a/google/cloud/internal/version_info.h +++ b/google/cloud/internal/version_info.h @@ -16,11 +16,11 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_VERSION_INFO_H // NOLINTNEXTLINE(modernize-macro-to-enum) -#define GOOGLE_CLOUD_CPP_VERSION_MAJOR 2 +#define GOOGLE_CLOUD_CPP_VERSION_MAJOR 3 // NOLINTNEXTLINE(modernize-macro-to-enum) -#define GOOGLE_CLOUD_CPP_VERSION_MINOR 46 +#define GOOGLE_CLOUD_CPP_VERSION_MINOR 0 // NOLINTNEXTLINE(modernize-macro-to-enum) #define GOOGLE_CLOUD_CPP_VERSION_PATCH 0 -#define GOOGLE_CLOUD_CPP_VERSION_PRE_RELEASE "rc" +#define GOOGLE_CLOUD_CPP_VERSION_PRE_RELEASE "rc1" #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_VERSION_INFO_H diff --git a/google/cloud/kms/BUILD.bazel b/google/cloud/kms/BUILD.bazel index fc09b67a3c903..eca0ea6ff0b3e 100644 --- a/google/cloud/kms/BUILD.bazel +++ b/google/cloud/kms/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/kms/inventory/v1:inventory_cc_grpc", - "@com_google_googleapis//google/cloud/kms/v1:kms_cc_grpc", + "@googleapis//google/cloud/kms/inventory/v1:inventory_cc_grpc", + "@googleapis//google/cloud/kms/v1:kms_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_auth_decorator.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_auth_decorator.cc index 01935ee2913c6..514cf20187227 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_auth_decorator.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/kms/inventory/v1/key_dashboard_service.proto #include "google/cloud/kms/inventory/v1/internal/key_dashboard_auth_decorator.h" -#include +#include "google/cloud/kms/inventory/v1/key_dashboard_service.grpc.pb.h" #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_logging_decorator.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_logging_decorator.cc index f2ecc058042eb..dd3c83c475aa1 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_logging_decorator.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/inventory/v1/key_dashboard_service.proto #include "google/cloud/kms/inventory/v1/internal/key_dashboard_logging_decorator.h" +#include "google/cloud/kms/inventory/v1/key_dashboard_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_metadata_decorator.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_metadata_decorator.cc index c2f9552c79459..71b135e79c219 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_metadata_decorator.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/kms/inventory/v1/key_dashboard_service.proto #include "google/cloud/kms/inventory/v1/internal/key_dashboard_metadata_decorator.h" +#include "google/cloud/kms/inventory/v1/key_dashboard_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 #include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.cc index acafff5237712..eaf5f78a62c66 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/inventory/v1/key_dashboard_service.proto #include "google/cloud/kms/inventory/v1/internal/key_dashboard_stub.h" +#include "google/cloud/kms/inventory/v1/key_dashboard_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.h b/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.h index 481095ce65c62..bdc11db9054c2 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.h +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_INTERNAL_KEY_DASHBOARD_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_INTERNAL_KEY_DASHBOARD_STUB_H +#include "google/cloud/kms/inventory/v1/key_dashboard_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_stub_factory.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_stub_factory.cc index 59c2bc897e724..fecd1313b31a4 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_stub_factory.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/kms/inventory/v1/internal/key_dashboard_metadata_decorator.h" #include "google/cloud/kms/inventory/v1/internal/key_dashboard_stub.h" #include "google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.h" +#include "google/cloud/kms/inventory/v1/key_dashboard_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 #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc index 14c5b74e8b42b..1745e777ebc4a 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KeyDashboardServiceTracingConnection::KeyDashboardServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -44,17 +42,13 @@ KeyDashboardServiceTracingConnection::ListCryptoKeys( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKeyDashboardServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.h b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.h index 38f943c238a33..a15f777e8ac3e 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.h +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KeyDashboardServiceTracingConnection : public kms_inventory_v1::KeyDashboardServiceConnection { public: @@ -48,8 +46,6 @@ class KeyDashboardServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.cc index 1186cf762a83e..2daa861b98df3 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KeyDashboardServiceTracingStub::KeyDashboardServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ KeyDashboardServiceTracingStub::ListCryptoKeys( child_->ListCryptoKeys(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKeyDashboardServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.h b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.h index cc0796e062914..03c8441eec171 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.h +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KeyDashboardServiceTracingStub : public KeyDashboardServiceStub { public: ~KeyDashboardServiceTracingStub() override = default; @@ -50,8 +48,6 @@ class KeyDashboardServiceTracingStub : public KeyDashboardServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_auth_decorator.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_auth_decorator.cc index f1c457d99f736..54a6c0a0bc7b6 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_auth_decorator.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/kms/inventory/v1/key_tracking_service.proto #include "google/cloud/kms/inventory/v1/internal/key_tracking_auth_decorator.h" -#include +#include "google/cloud/kms/inventory/v1/key_tracking_service.grpc.pb.h" #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_logging_decorator.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_logging_decorator.cc index 6d079c9304447..c4910e45e0b55 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_logging_decorator.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/inventory/v1/key_tracking_service.proto #include "google/cloud/kms/inventory/v1/internal/key_tracking_logging_decorator.h" +#include "google/cloud/kms/inventory/v1/key_tracking_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_metadata_decorator.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_metadata_decorator.cc index 6655c7074af12..4d05c1dfe0942 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_metadata_decorator.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/kms/inventory/v1/key_tracking_service.proto #include "google/cloud/kms/inventory/v1/internal/key_tracking_metadata_decorator.h" +#include "google/cloud/kms/inventory/v1/key_tracking_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 #include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_stub.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_stub.cc index 29477a209425c..edc129def0f5c 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_stub.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/inventory/v1/key_tracking_service.proto #include "google/cloud/kms/inventory/v1/internal/key_tracking_stub.h" +#include "google/cloud/kms/inventory/v1/key_tracking_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_stub.h b/google/cloud/kms/inventory/v1/internal/key_tracking_stub.h index b643d2b4bf6c4..788b08ad81537 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_stub.h +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_INTERNAL_KEY_TRACKING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_INTERNAL_KEY_TRACKING_STUB_H +#include "google/cloud/kms/inventory/v1/key_tracking_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_stub_factory.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_stub_factory.cc index 3c984d41c880b..57f2717da1b45 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_stub_factory.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/kms/inventory/v1/internal/key_tracking_metadata_decorator.h" #include "google/cloud/kms/inventory/v1/internal/key_tracking_stub.h" #include "google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.h" +#include "google/cloud/kms/inventory/v1/key_tracking_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 #include #include diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc index 31a35e20f7402..1c2654a149ffe 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KeyTrackingServiceTracingConnection::KeyTrackingServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -59,17 +57,13 @@ KeyTrackingServiceTracingConnection::SearchProtectedResources( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKeyTrackingServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.h b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.h index cfbd2f896bd2f..10aa83f7ab2dc 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.h +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KeyTrackingServiceTracingConnection : public kms_inventory_v1::KeyTrackingServiceConnection { public: @@ -54,8 +52,6 @@ class KeyTrackingServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.cc index 687e5fab6a4c3..4c4eb2c2b7830 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KeyTrackingServiceTracingStub::KeyTrackingServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -62,15 +60,9 @@ KeyTrackingServiceTracingStub::SearchProtectedResources( child_->SearchProtectedResources(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKeyTrackingServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.h b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.h index 6e02b8144f26e..24ba8533d94e3 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.h +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace kms_inventory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KeyTrackingServiceTracingStub : public KeyTrackingServiceStub { public: ~KeyTrackingServiceTracingStub() override = default; @@ -57,8 +55,6 @@ class KeyTrackingServiceTracingStub : public KeyTrackingServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/kms/inventory/v1/key_dashboard_connection.h b/google/cloud/kms/inventory/v1/key_dashboard_connection.h index 3c7f1f238cfc9..d0316ff853704 100644 --- a/google/cloud/kms/inventory/v1/key_dashboard_connection.h +++ b/google/cloud/kms/inventory/v1/key_dashboard_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/kms/inventory/v1/internal/key_dashboard_retry_traits.h" #include "google/cloud/kms/inventory/v1/key_dashboard_connection_idempotency_policy.h" +#include "google/cloud/kms/inventory/v1/key_dashboard_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/inventory/v1/key_dashboard_connection_idempotency_policy.h b/google/cloud/kms/inventory/v1/key_dashboard_connection_idempotency_policy.h index f6d1f740b383a..96276552fbc8d 100644 --- a/google/cloud/kms/inventory/v1/key_dashboard_connection_idempotency_policy.h +++ b/google/cloud/kms/inventory/v1/key_dashboard_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_KEY_DASHBOARD_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_KEY_DASHBOARD_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/kms/inventory/v1/key_dashboard_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/inventory/v1/key_tracking_connection.h b/google/cloud/kms/inventory/v1/key_tracking_connection.h index d0664312a00c3..e636ac8428d67 100644 --- a/google/cloud/kms/inventory/v1/key_tracking_connection.h +++ b/google/cloud/kms/inventory/v1/key_tracking_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/kms/inventory/v1/internal/key_tracking_retry_traits.h" #include "google/cloud/kms/inventory/v1/key_tracking_connection_idempotency_policy.h" +#include "google/cloud/kms/inventory/v1/key_tracking_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/inventory/v1/key_tracking_connection_idempotency_policy.h b/google/cloud/kms/inventory/v1/key_tracking_connection_idempotency_policy.h index 30740a4b2aba0..96b4d1223c143 100644 --- a/google/cloud/kms/inventory/v1/key_tracking_connection_idempotency_policy.h +++ b/google/cloud/kms/inventory/v1/key_tracking_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_KEY_TRACKING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_INVENTORY_V1_KEY_TRACKING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/kms/inventory/v1/key_tracking_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/quickstart/.bazelrc b/google/cloud/kms/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/kms/quickstart/.bazelrc +++ b/google/cloud/kms/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/kms/v1/autokey_admin_connection.h b/google/cloud/kms/v1/autokey_admin_connection.h index 8e92ac0316139..eee0d5ac57026 100644 --- a/google/cloud/kms/v1/autokey_admin_connection.h +++ b/google/cloud/kms/v1/autokey_admin_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_ADMIN_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_ADMIN_CONNECTION_H +#include "google/cloud/kms/v1/autokey_admin.pb.h" #include "google/cloud/kms/v1/autokey_admin_connection_idempotency_policy.h" #include "google/cloud/kms/v1/internal/autokey_admin_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/v1/autokey_admin_connection_idempotency_policy.h b/google/cloud/kms/v1/autokey_admin_connection_idempotency_policy.h index 774d82141df41..b91e80b504aab 100644 --- a/google/cloud/kms/v1/autokey_admin_connection_idempotency_policy.h +++ b/google/cloud/kms/v1/autokey_admin_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/kms/v1/autokey_admin.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/kms/v1/autokey_client.h b/google/cloud/kms/v1/autokey_client.h index 808a68d651b09..d38333a982ece 100644 --- a/google/cloud/kms/v1/autokey_client.h +++ b/google/cloud/kms/v1/autokey_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/kms/v1/autokey_connection.h b/google/cloud/kms/v1/autokey_connection.h index e8c7cd4ec0a95..fc1492973ef4a 100644 --- a/google/cloud/kms/v1/autokey_connection.h +++ b/google/cloud/kms/v1/autokey_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_CONNECTION_H +#include "google/cloud/kms/v1/autokey.pb.h" #include "google/cloud/kms/v1/autokey_connection_idempotency_policy.h" #include "google/cloud/kms/v1/internal/autokey_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/kms/v1/autokey_connection_idempotency_policy.h b/google/cloud/kms/v1/autokey_connection_idempotency_policy.h index 108add172e4f0..ccddfc14ac069 100644 --- a/google/cloud/kms/v1/autokey_connection_idempotency_policy.h +++ b/google/cloud/kms/v1/autokey_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_AUTOKEY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/kms/v1/autokey.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/kms/v1/ekm_connection.h b/google/cloud/kms/v1/ekm_connection.h index 92535d4663749..138ed40f977b5 100644 --- a/google/cloud/kms/v1/ekm_connection.h +++ b/google/cloud/kms/v1/ekm_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_EKM_CONNECTION_H #include "google/cloud/kms/v1/ekm_connection_idempotency_policy.h" +#include "google/cloud/kms/v1/ekm_service.pb.h" #include "google/cloud/kms/v1/internal/ekm_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/v1/ekm_connection_idempotency_policy.h b/google/cloud/kms/v1/ekm_connection_idempotency_policy.h index 537cb2d02ae6a..ef9279645aae0 100644 --- a/google/cloud/kms/v1/ekm_connection_idempotency_policy.h +++ b/google/cloud/kms/v1/ekm_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_EKM_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_EKM_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/kms/v1/ekm_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/kms/v1/internal/autokey_admin_auth_decorator.cc b/google/cloud/kms/v1/internal/autokey_admin_auth_decorator.cc index e3e60c08619e9..0d73f1718308c 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_auth_decorator.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/kms/v1/autokey_admin.proto #include "google/cloud/kms/v1/internal/autokey_admin_auth_decorator.h" -#include +#include "google/cloud/kms/v1/autokey_admin.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_admin_logging_decorator.cc b/google/cloud/kms/v1/internal/autokey_admin_logging_decorator.cc index 7de8149529332..5b7c71fba1a24 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_logging_decorator.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/autokey_admin.proto #include "google/cloud/kms/v1/internal/autokey_admin_logging_decorator.h" +#include "google/cloud/kms/v1/autokey_admin.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_admin_metadata_decorator.cc b/google/cloud/kms/v1/internal/autokey_admin_metadata_decorator.cc index 7228b2bbdac5b..990d1456d85c3 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_metadata_decorator.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/kms/v1/autokey_admin.proto #include "google/cloud/kms/v1/internal/autokey_admin_metadata_decorator.h" +#include "google/cloud/kms/v1/autokey_admin.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 #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_admin_stub.cc b/google/cloud/kms/v1/internal/autokey_admin_stub.cc index 4acd378b6659c..e51ee10b904ca 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_stub.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/autokey_admin.proto #include "google/cloud/kms/v1/internal/autokey_admin_stub.h" +#include "google/cloud/kms/v1/autokey_admin.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_admin_stub.h b/google/cloud/kms/v1/internal/autokey_admin_stub.h index f66b56cc700bb..0815fd4b3486f 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_stub.h +++ b/google/cloud/kms/v1/internal/autokey_admin_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_AUTOKEY_ADMIN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_AUTOKEY_ADMIN_STUB_H +#include "google/cloud/kms/v1/autokey_admin.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_admin_stub_factory.cc b/google/cloud/kms/v1/internal/autokey_admin_stub_factory.cc index 2ff210eb74523..e75b5c76700ba 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_stub_factory.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/kms/v1/autokey_admin.proto #include "google/cloud/kms/v1/internal/autokey_admin_stub_factory.h" +#include "google/cloud/kms/v1/autokey_admin.grpc.pb.h" #include "google/cloud/kms/v1/internal/autokey_admin_auth_decorator.h" #include "google/cloud/kms/v1/internal/autokey_admin_logging_decorator.h" #include "google/cloud/kms/v1/internal/autokey_admin_metadata_decorator.h" #include "google/cloud/kms/v1/internal/autokey_admin_stub.h" #include "google/cloud/kms/v1/internal/autokey_admin_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.cc b/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.cc index 7f85c345c603c..d399c668ae2af 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutokeyAdminTracingConnection::AutokeyAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -113,16 +111,12 @@ AutokeyAdminTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutokeyAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.h b/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.h index d8e98bc777852..fee18ef0a5fc6 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.h +++ b/google/cloud/kms/v1/internal/autokey_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutokeyAdminTracingConnection : public kms_v1::AutokeyAdminConnection { public: ~AutokeyAdminTracingConnection() override = default; @@ -73,8 +71,6 @@ class AutokeyAdminTracingConnection : public kms_v1::AutokeyAdminConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.cc b/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.cc index 274dd92d29004..53e4c083385e4 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.cc +++ b/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutokeyAdminTracingStub::AutokeyAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -138,15 +136,9 @@ StatusOr AutokeyAdminTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutokeyAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.h b/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.h index 07afb0fc6b378..b8b9b32b69d10 100644 --- a/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.h +++ b/google/cloud/kms/v1/internal/autokey_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutokeyAdminTracingStub : public AutokeyAdminStub { public: ~AutokeyAdminTracingStub() override = default; @@ -83,8 +81,6 @@ class AutokeyAdminTracingStub : public AutokeyAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/kms/v1/internal/autokey_auth_decorator.cc b/google/cloud/kms/v1/internal/autokey_auth_decorator.cc index c90277179f0f2..f2e40cfa3aa06 100644 --- a/google/cloud/kms/v1/internal/autokey_auth_decorator.cc +++ b/google/cloud/kms/v1/internal/autokey_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/kms/v1/autokey.proto #include "google/cloud/kms/v1/internal/autokey_auth_decorator.h" -#include +#include "google/cloud/kms/v1/autokey.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_auth_decorator.h b/google/cloud/kms/v1/internal/autokey_auth_decorator.h index 0ef61b1b85f86..0d3aeca973356 100644 --- a/google/cloud/kms/v1/internal/autokey_auth_decorator.h +++ b/google/cloud/kms/v1/internal/autokey_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/kms/v1/internal/autokey_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_connection_impl.h b/google/cloud/kms/v1/internal/autokey_connection_impl.h index 9bba3ccd0919d..6d63f84d00e74 100644 --- a/google/cloud/kms/v1/internal/autokey_connection_impl.h +++ b/google/cloud/kms/v1/internal/autokey_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/kms/v1/internal/autokey_logging_decorator.cc b/google/cloud/kms/v1/internal/autokey_logging_decorator.cc index a5d03d0369c65..df088fadfd1fe 100644 --- a/google/cloud/kms/v1/internal/autokey_logging_decorator.cc +++ b/google/cloud/kms/v1/internal/autokey_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/autokey.proto #include "google/cloud/kms/v1/internal/autokey_logging_decorator.h" +#include "google/cloud/kms/v1/autokey.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_logging_decorator.h b/google/cloud/kms/v1/internal/autokey_logging_decorator.h index 756005fe77bde..819a6c8989147 100644 --- a/google/cloud/kms/v1/internal/autokey_logging_decorator.h +++ b/google/cloud/kms/v1/internal/autokey_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/kms/v1/internal/autokey_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_metadata_decorator.cc b/google/cloud/kms/v1/internal/autokey_metadata_decorator.cc index e57cd9ee68356..6dfd795d1ba00 100644 --- a/google/cloud/kms/v1/internal/autokey_metadata_decorator.cc +++ b/google/cloud/kms/v1/internal/autokey_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/kms/v1/autokey.proto #include "google/cloud/kms/v1/internal/autokey_metadata_decorator.h" +#include "google/cloud/kms/v1/autokey.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 #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_metadata_decorator.h b/google/cloud/kms/v1/internal/autokey_metadata_decorator.h index 0841c01f94c79..64c0281625797 100644 --- a/google/cloud/kms/v1/internal/autokey_metadata_decorator.h +++ b/google/cloud/kms/v1/internal/autokey_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/kms/v1/internal/autokey_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/kms/v1/internal/autokey_stub.cc b/google/cloud/kms/v1/internal/autokey_stub.cc index 3d56f0a7ce334..032ddd6a7427c 100644 --- a/google/cloud/kms/v1/internal/autokey_stub.cc +++ b/google/cloud/kms/v1/internal/autokey_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/kms/v1/autokey.proto #include "google/cloud/kms/v1/internal/autokey_stub.h" +#include "google/cloud/kms/v1/autokey.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_stub.h b/google/cloud/kms/v1/internal/autokey_stub.h index 1835f5888a667..521cedceeddf6 100644 --- a/google/cloud/kms/v1/internal/autokey_stub.h +++ b/google/cloud/kms/v1/internal/autokey_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_AUTOKEY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_AUTOKEY_STUB_H +#include "google/cloud/kms/v1/autokey.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_stub_factory.cc b/google/cloud/kms/v1/internal/autokey_stub_factory.cc index 910d17cc626da..3eae5eff60a2b 100644 --- a/google/cloud/kms/v1/internal/autokey_stub_factory.cc +++ b/google/cloud/kms/v1/internal/autokey_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/kms/v1/autokey.proto #include "google/cloud/kms/v1/internal/autokey_stub_factory.h" +#include "google/cloud/kms/v1/autokey.grpc.pb.h" #include "google/cloud/kms/v1/internal/autokey_auth_decorator.h" #include "google/cloud/kms/v1/internal/autokey_logging_decorator.h" #include "google/cloud/kms/v1/internal/autokey_metadata_decorator.h" #include "google/cloud/kms/v1/internal/autokey_stub.h" #include "google/cloud/kms/v1/internal/autokey_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/autokey_tracing_connection.cc b/google/cloud/kms/v1/internal/autokey_tracing_connection.cc index 3226801aa85c2..c8e800941b953 100644 --- a/google/cloud/kms/v1/internal/autokey_tracing_connection.cc +++ b/google/cloud/kms/v1/internal/autokey_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutokeyTracingConnection::AutokeyTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -124,15 +122,11 @@ StatusOr AutokeyTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutokeyTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/kms/v1/internal/autokey_tracing_connection.h b/google/cloud/kms/v1/internal/autokey_tracing_connection.h index e5b53d0e38bc0..52f838ed0cce5 100644 --- a/google/cloud/kms/v1/internal/autokey_tracing_connection.h +++ b/google/cloud/kms/v1/internal/autokey_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutokeyTracingConnection : public kms_v1::AutokeyConnection { public: ~AutokeyTracingConnection() override = default; @@ -77,8 +75,6 @@ class AutokeyTracingConnection : public kms_v1::AutokeyConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/kms/v1/internal/autokey_tracing_stub.cc b/google/cloud/kms/v1/internal/autokey_tracing_stub.cc index b06fccc5b9492..505729b023c7a 100644 --- a/google/cloud/kms/v1/internal/autokey_tracing_stub.cc +++ b/google/cloud/kms/v1/internal/autokey_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AutokeyTracingStub::AutokeyTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -176,15 +174,9 @@ future AutokeyTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAutokeyTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/v1/internal/autokey_tracing_stub.h b/google/cloud/kms/v1/internal/autokey_tracing_stub.h index 8dff65aa5e343..2e55a15a90fe3 100644 --- a/google/cloud/kms/v1/internal/autokey_tracing_stub.h +++ b/google/cloud/kms/v1/internal/autokey_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AutokeyTracingStub : public AutokeyStub { public: ~AutokeyTracingStub() override = default; @@ -98,8 +96,6 @@ class AutokeyTracingStub : public AutokeyStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/kms/v1/internal/ekm_auth_decorator.cc b/google/cloud/kms/v1/internal/ekm_auth_decorator.cc index d938658d47e21..a99fbeba4fed2 100644 --- a/google/cloud/kms/v1/internal/ekm_auth_decorator.cc +++ b/google/cloud/kms/v1/internal/ekm_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/kms/v1/ekm_service.proto #include "google/cloud/kms/v1/internal/ekm_auth_decorator.h" -#include +#include "google/cloud/kms/v1/ekm_service.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/ekm_logging_decorator.cc b/google/cloud/kms/v1/internal/ekm_logging_decorator.cc index 43b35baad20ac..3de8c23b037a5 100644 --- a/google/cloud/kms/v1/internal/ekm_logging_decorator.cc +++ b/google/cloud/kms/v1/internal/ekm_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/ekm_service.proto #include "google/cloud/kms/v1/internal/ekm_logging_decorator.h" +#include "google/cloud/kms/v1/ekm_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/kms/v1/internal/ekm_metadata_decorator.cc b/google/cloud/kms/v1/internal/ekm_metadata_decorator.cc index 1816c2a1091f2..2a7886557ecca 100644 --- a/google/cloud/kms/v1/internal/ekm_metadata_decorator.cc +++ b/google/cloud/kms/v1/internal/ekm_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/kms/v1/ekm_service.proto #include "google/cloud/kms/v1/internal/ekm_metadata_decorator.h" +#include "google/cloud/kms/v1/ekm_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 #include #include #include diff --git a/google/cloud/kms/v1/internal/ekm_stub.cc b/google/cloud/kms/v1/internal/ekm_stub.cc index 1d887b62d66a5..be0a93ba51d85 100644 --- a/google/cloud/kms/v1/internal/ekm_stub.cc +++ b/google/cloud/kms/v1/internal/ekm_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/ekm_service.proto #include "google/cloud/kms/v1/internal/ekm_stub.h" +#include "google/cloud/kms/v1/ekm_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/kms/v1/internal/ekm_stub.h b/google/cloud/kms/v1/internal/ekm_stub.h index 77a341dac70e0..d704489ef4720 100644 --- a/google/cloud/kms/v1/internal/ekm_stub.h +++ b/google/cloud/kms/v1/internal/ekm_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_EKM_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_EKM_STUB_H +#include "google/cloud/kms/v1/ekm_service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/ekm_stub_factory.cc b/google/cloud/kms/v1/internal/ekm_stub_factory.cc index 3ec23155be229..17032a90a7f80 100644 --- a/google/cloud/kms/v1/internal/ekm_stub_factory.cc +++ b/google/cloud/kms/v1/internal/ekm_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/kms/v1/ekm_service.proto #include "google/cloud/kms/v1/internal/ekm_stub_factory.h" +#include "google/cloud/kms/v1/ekm_service.grpc.pb.h" #include "google/cloud/kms/v1/internal/ekm_auth_decorator.h" #include "google/cloud/kms/v1/internal/ekm_logging_decorator.h" #include "google/cloud/kms/v1/internal/ekm_metadata_decorator.h" #include "google/cloud/kms/v1/internal/ekm_stub.h" #include "google/cloud/kms/v1/internal/ekm_tracing_stub.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/ekm_tracing_connection.cc b/google/cloud/kms/v1/internal/ekm_tracing_connection.cc index 086e949b03ce3..7e741378d017a 100644 --- a/google/cloud/kms/v1/internal/ekm_tracing_connection.cc +++ b/google/cloud/kms/v1/internal/ekm_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EkmServiceTracingConnection::EkmServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -146,15 +144,11 @@ EkmServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEkmServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/kms/v1/internal/ekm_tracing_connection.h b/google/cloud/kms/v1/internal/ekm_tracing_connection.h index 62d761d8fc37f..5c45cd0384553 100644 --- a/google/cloud/kms/v1/internal/ekm_tracing_connection.h +++ b/google/cloud/kms/v1/internal/ekm_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EkmServiceTracingConnection : public kms_v1::EkmServiceConnection { public: ~EkmServiceTracingConnection() override = default; @@ -85,8 +83,6 @@ class EkmServiceTracingConnection : public kms_v1::EkmServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/kms/v1/internal/ekm_tracing_stub.cc b/google/cloud/kms/v1/internal/ekm_tracing_stub.cc index 61421ad64ff3c..1af944312759e 100644 --- a/google/cloud/kms/v1/internal/ekm_tracing_stub.cc +++ b/google/cloud/kms/v1/internal/ekm_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EkmServiceTracingStub::EkmServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -183,15 +181,9 @@ StatusOr EkmServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEkmServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/v1/internal/ekm_tracing_stub.h b/google/cloud/kms/v1/internal/ekm_tracing_stub.h index 69ed85e476074..fd6a90704b9d7 100644 --- a/google/cloud/kms/v1/internal/ekm_tracing_stub.h +++ b/google/cloud/kms/v1/internal/ekm_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EkmServiceTracingStub : public EkmServiceStub { public: ~EkmServiceTracingStub() override = default; @@ -100,8 +98,6 @@ class EkmServiceTracingStub : public EkmServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/kms/v1/internal/key_management_auth_decorator.cc b/google/cloud/kms/v1/internal/key_management_auth_decorator.cc index cdbc5dff588fa..75cb00c903631 100644 --- a/google/cloud/kms/v1/internal/key_management_auth_decorator.cc +++ b/google/cloud/kms/v1/internal/key_management_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/kms/v1/service.proto #include "google/cloud/kms/v1/internal/key_management_auth_decorator.h" -#include +#include "google/cloud/kms/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/key_management_logging_decorator.cc b/google/cloud/kms/v1/internal/key_management_logging_decorator.cc index 6a814ab374e46..c49b5c53f22d3 100644 --- a/google/cloud/kms/v1/internal/key_management_logging_decorator.cc +++ b/google/cloud/kms/v1/internal/key_management_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/service.proto #include "google/cloud/kms/v1/internal/key_management_logging_decorator.h" +#include "google/cloud/kms/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/kms/v1/internal/key_management_metadata_decorator.cc b/google/cloud/kms/v1/internal/key_management_metadata_decorator.cc index 2e44f20f04df2..e3f6a5797a0b8 100644 --- a/google/cloud/kms/v1/internal/key_management_metadata_decorator.cc +++ b/google/cloud/kms/v1/internal/key_management_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/kms/v1/service.proto #include "google/cloud/kms/v1/internal/key_management_metadata_decorator.h" +#include "google/cloud/kms/v1/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 #include #include #include diff --git a/google/cloud/kms/v1/internal/key_management_stub.cc b/google/cloud/kms/v1/internal/key_management_stub.cc index c9db9fdbd7318..4c08a4080b3b1 100644 --- a/google/cloud/kms/v1/internal/key_management_stub.cc +++ b/google/cloud/kms/v1/internal/key_management_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/kms/v1/service.proto #include "google/cloud/kms/v1/internal/key_management_stub.h" +#include "google/cloud/kms/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/kms/v1/internal/key_management_stub.h b/google/cloud/kms/v1/internal/key_management_stub.h index 0bf8b1bb03f0b..18b878fff1c39 100644 --- a/google/cloud/kms/v1/internal/key_management_stub.h +++ b/google/cloud/kms/v1/internal/key_management_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_KEY_MANAGEMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_INTERNAL_KEY_MANAGEMENT_STUB_H +#include "google/cloud/kms/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/key_management_stub_factory.cc b/google/cloud/kms/v1/internal/key_management_stub_factory.cc index a83adfd1774de..fc883cb3740be 100644 --- a/google/cloud/kms/v1/internal/key_management_stub_factory.cc +++ b/google/cloud/kms/v1/internal/key_management_stub_factory.cc @@ -22,16 +22,16 @@ #include "google/cloud/kms/v1/internal/key_management_metadata_decorator.h" #include "google/cloud/kms/v1/internal/key_management_stub.h" #include "google/cloud/kms/v1/internal/key_management_tracing_stub.h" +#include "google/cloud/kms/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/kms/v1/internal/key_management_tracing_connection.cc b/google/cloud/kms/v1/internal/key_management_tracing_connection.cc index 6ae03e76d4868..cf22ff8b970e2 100644 --- a/google/cloud/kms/v1/internal/key_management_tracing_connection.cc +++ b/google/cloud/kms/v1/internal/key_management_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KeyManagementServiceTracingConnection::KeyManagementServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -360,17 +358,13 @@ KeyManagementServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKeyManagementServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/kms/v1/internal/key_management_tracing_connection.h b/google/cloud/kms/v1/internal/key_management_tracing_connection.h index 43ebaafa498f9..48de3735374f7 100644 --- a/google/cloud/kms/v1/internal/key_management_tracing_connection.h +++ b/google/cloud/kms/v1/internal/key_management_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KeyManagementServiceTracingConnection : public kms_v1::KeyManagementServiceConnection { public: @@ -157,8 +155,6 @@ class KeyManagementServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/kms/v1/internal/key_management_tracing_stub.cc b/google/cloud/kms/v1/internal/key_management_tracing_stub.cc index 1a76008c92ddf..75a700f22a35e 100644 --- a/google/cloud/kms/v1/internal/key_management_tracing_stub.cc +++ b/google/cloud/kms/v1/internal/key_management_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - KeyManagementServiceTracingStub::KeyManagementServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -457,15 +455,9 @@ KeyManagementServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeKeyManagementServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/v1/internal/key_management_tracing_stub.h b/google/cloud/kms/v1/internal/key_management_tracing_stub.h index 23d9df3e20855..3577ec99e4063 100644 --- a/google/cloud/kms/v1/internal/key_management_tracing_stub.h +++ b/google/cloud/kms/v1/internal/key_management_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace kms_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class KeyManagementServiceTracingStub : public KeyManagementServiceStub { public: ~KeyManagementServiceTracingStub() override = default; @@ -195,8 +193,6 @@ class KeyManagementServiceTracingStub : public KeyManagementServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/kms/v1/key_management_connection.h b/google/cloud/kms/v1/key_management_connection.h index 536ceae13ff0a..5706d32040cbe 100644 --- a/google/cloud/kms/v1/key_management_connection.h +++ b/google/cloud/kms/v1/key_management_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/kms/v1/internal/key_management_retry_traits.h" #include "google/cloud/kms/v1/key_management_connection_idempotency_policy.h" +#include "google/cloud/kms/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/kms/v1/key_management_connection_idempotency_policy.h b/google/cloud/kms/v1/key_management_connection_idempotency_policy.h index a57f3e171bb03..68cd31025907b 100644 --- a/google/cloud/kms/v1/key_management_connection_idempotency_policy.h +++ b/google/cloud/kms/v1/key_management_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_KEY_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_V1_KEY_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/kms/v1/service.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/language/BUILD.bazel b/google/cloud/language/BUILD.bazel index 659d3c44c475d..5d4e81a3dd6ae 100644 --- a/google/cloud/language/BUILD.bazel +++ b/google/cloud/language/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/language/v1:language_cc_grpc", - "@com_google_googleapis//google/cloud/language/v2:language_cc_grpc", + "@googleapis//google/cloud/language/v1:language_cc_grpc", + "@googleapis//google/cloud/language/v2:language_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/language/quickstart/.bazelrc b/google/cloud/language/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/language/quickstart/.bazelrc +++ b/google/cloud/language/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/language/v1/internal/language_auth_decorator.cc b/google/cloud/language/v1/internal/language_auth_decorator.cc index 1640d48c13d85..899d337e16eaa 100644 --- a/google/cloud/language/v1/internal/language_auth_decorator.cc +++ b/google/cloud/language/v1/internal/language_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/language/v1/language_service.proto #include "google/cloud/language/v1/internal/language_auth_decorator.h" -#include +#include "google/cloud/language/v1/language_service.grpc.pb.h" #include #include diff --git a/google/cloud/language/v1/internal/language_logging_decorator.cc b/google/cloud/language/v1/internal/language_logging_decorator.cc index ed02374013466..c753523c7f61d 100644 --- a/google/cloud/language/v1/internal/language_logging_decorator.cc +++ b/google/cloud/language/v1/internal/language_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/language/v1/language_service.proto #include "google/cloud/language/v1/internal/language_logging_decorator.h" +#include "google/cloud/language/v1/language_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/language/v1/internal/language_metadata_decorator.cc b/google/cloud/language/v1/internal/language_metadata_decorator.cc index a6479a5ff7e50..f31a3f7d9d562 100644 --- a/google/cloud/language/v1/internal/language_metadata_decorator.cc +++ b/google/cloud/language/v1/internal/language_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/language/v1/language_service.proto #include "google/cloud/language/v1/internal/language_metadata_decorator.h" +#include "google/cloud/language/v1/language_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 #include #include #include diff --git a/google/cloud/language/v1/internal/language_stub.cc b/google/cloud/language/v1/internal/language_stub.cc index 089fa92baa873..8b61782bd4be1 100644 --- a/google/cloud/language/v1/internal/language_stub.cc +++ b/google/cloud/language/v1/internal/language_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/language/v1/language_service.proto #include "google/cloud/language/v1/internal/language_stub.h" +#include "google/cloud/language/v1/language_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/language/v1/internal/language_stub.h b/google/cloud/language/v1/internal/language_stub.h index 80233571e80e6..212f9f20128d2 100644 --- a/google/cloud/language/v1/internal/language_stub.h +++ b/google/cloud/language/v1/internal/language_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V1_INTERNAL_LANGUAGE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V1_INTERNAL_LANGUAGE_STUB_H +#include "google/cloud/language/v1/language_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/language/v1/internal/language_stub_factory.cc b/google/cloud/language/v1/internal/language_stub_factory.cc index 8a042e56e72d2..4bc71d8990112 100644 --- a/google/cloud/language/v1/internal/language_stub_factory.cc +++ b/google/cloud/language/v1/internal/language_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/language/v1/internal/language_metadata_decorator.h" #include "google/cloud/language/v1/internal/language_stub.h" #include "google/cloud/language/v1/internal/language_tracing_stub.h" +#include "google/cloud/language/v1/language_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 #include #include diff --git a/google/cloud/language/v1/internal/language_tracing_connection.cc b/google/cloud/language/v1/internal/language_tracing_connection.cc index c2a5b3e41be88..db827462f081e 100644 --- a/google/cloud/language/v1/internal/language_tracing_connection.cc +++ b/google/cloud/language/v1/internal/language_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace language_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LanguageServiceTracingConnection::LanguageServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -95,16 +93,12 @@ LanguageServiceTracingConnection::AnnotateText( return internal::EndSpan(*span, child_->AnnotateText(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLanguageServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/language/v1/internal/language_tracing_connection.h b/google/cloud/language/v1/internal/language_tracing_connection.h index eb522a54fae84..690a433d6cfd1 100644 --- a/google/cloud/language/v1/internal/language_tracing_connection.h +++ b/google/cloud/language/v1/internal/language_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace language_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LanguageServiceTracingConnection : public language_v1::LanguageServiceConnection { public: @@ -70,8 +68,6 @@ class LanguageServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/language/v1/internal/language_tracing_stub.cc b/google/cloud/language/v1/internal/language_tracing_stub.cc index a0eed84c18f7a..bb7aa2b6fdd89 100644 --- a/google/cloud/language/v1/internal/language_tracing_stub.cc +++ b/google/cloud/language/v1/internal/language_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace language_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LanguageServiceTracingStub::LanguageServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -117,15 +115,9 @@ LanguageServiceTracingStub::AnnotateText( child_->AnnotateText(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLanguageServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/language/v1/internal/language_tracing_stub.h b/google/cloud/language/v1/internal/language_tracing_stub.h index 6f283c7450465..8e22e0ccbeee0 100644 --- a/google/cloud/language/v1/internal/language_tracing_stub.h +++ b/google/cloud/language/v1/internal/language_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace language_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LanguageServiceTracingStub : public LanguageServiceStub { public: ~LanguageServiceTracingStub() override = default; @@ -78,8 +76,6 @@ class LanguageServiceTracingStub : public LanguageServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/language/v1/language_connection.h b/google/cloud/language/v1/language_connection.h index 6fc6e325de570..ba815af74d3c9 100644 --- a/google/cloud/language/v1/language_connection.h +++ b/google/cloud/language/v1/language_connection.h @@ -21,12 +21,12 @@ #include "google/cloud/language/v1/internal/language_retry_traits.h" #include "google/cloud/language/v1/language_connection_idempotency_policy.h" +#include "google/cloud/language/v1/language_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/language/v1/language_connection_idempotency_policy.h b/google/cloud/language/v1/language_connection_idempotency_policy.h index bede577372ebd..f9db8b64bf98a 100644 --- a/google/cloud/language/v1/language_connection_idempotency_policy.h +++ b/google/cloud/language/v1/language_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V1_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V1_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/language/v1/language_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/language/v2/internal/language_auth_decorator.cc b/google/cloud/language/v2/internal/language_auth_decorator.cc index 5dd51ffe50e77..dda8a2a2d177e 100644 --- a/google/cloud/language/v2/internal/language_auth_decorator.cc +++ b/google/cloud/language/v2/internal/language_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/language/v2/language_service.proto #include "google/cloud/language/v2/internal/language_auth_decorator.h" -#include +#include "google/cloud/language/v2/language_service.grpc.pb.h" #include #include diff --git a/google/cloud/language/v2/internal/language_logging_decorator.cc b/google/cloud/language/v2/internal/language_logging_decorator.cc index 45560f0a6f0e9..47c19e7d6984b 100644 --- a/google/cloud/language/v2/internal/language_logging_decorator.cc +++ b/google/cloud/language/v2/internal/language_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/language/v2/language_service.proto #include "google/cloud/language/v2/internal/language_logging_decorator.h" +#include "google/cloud/language/v2/language_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/language/v2/internal/language_metadata_decorator.cc b/google/cloud/language/v2/internal/language_metadata_decorator.cc index ba4ddd223001b..56d07b28ae57c 100644 --- a/google/cloud/language/v2/internal/language_metadata_decorator.cc +++ b/google/cloud/language/v2/internal/language_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/language/v2/language_service.proto #include "google/cloud/language/v2/internal/language_metadata_decorator.h" +#include "google/cloud/language/v2/language_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 #include #include #include diff --git a/google/cloud/language/v2/internal/language_stub.cc b/google/cloud/language/v2/internal/language_stub.cc index e722cba911948..6ebbb30afdec0 100644 --- a/google/cloud/language/v2/internal/language_stub.cc +++ b/google/cloud/language/v2/internal/language_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/language/v2/language_service.proto #include "google/cloud/language/v2/internal/language_stub.h" +#include "google/cloud/language/v2/language_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/language/v2/internal/language_stub.h b/google/cloud/language/v2/internal/language_stub.h index c0654619be3d6..f956536cfa6fe 100644 --- a/google/cloud/language/v2/internal/language_stub.h +++ b/google/cloud/language/v2/internal/language_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V2_INTERNAL_LANGUAGE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V2_INTERNAL_LANGUAGE_STUB_H +#include "google/cloud/language/v2/language_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/language/v2/internal/language_stub_factory.cc b/google/cloud/language/v2/internal/language_stub_factory.cc index e9bba27e23b75..1056eea8563d3 100644 --- a/google/cloud/language/v2/internal/language_stub_factory.cc +++ b/google/cloud/language/v2/internal/language_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/language/v2/internal/language_metadata_decorator.h" #include "google/cloud/language/v2/internal/language_stub.h" #include "google/cloud/language/v2/internal/language_tracing_stub.h" +#include "google/cloud/language/v2/language_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 #include #include diff --git a/google/cloud/language/v2/internal/language_tracing_connection.cc b/google/cloud/language/v2/internal/language_tracing_connection.cc index a30c1c31cc787..1296b54f1e894 100644 --- a/google/cloud/language/v2/internal/language_tracing_connection.cc +++ b/google/cloud/language/v2/internal/language_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace language_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LanguageServiceTracingConnection::LanguageServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -77,16 +75,12 @@ LanguageServiceTracingConnection::AnnotateText( return internal::EndSpan(*span, child_->AnnotateText(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLanguageServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/language/v2/internal/language_tracing_connection.h b/google/cloud/language/v2/internal/language_tracing_connection.h index 9d79e2d43f7db..8f994b93a6864 100644 --- a/google/cloud/language/v2/internal/language_tracing_connection.h +++ b/google/cloud/language/v2/internal/language_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace language_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LanguageServiceTracingConnection : public language_v2::LanguageServiceConnection { public: @@ -61,8 +59,6 @@ class LanguageServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/language/v2/internal/language_tracing_stub.cc b/google/cloud/language/v2/internal/language_tracing_stub.cc index 8b9981b5231b5..22e4fc3345e86 100644 --- a/google/cloud/language/v2/internal/language_tracing_stub.cc +++ b/google/cloud/language/v2/internal/language_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace language_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LanguageServiceTracingStub::LanguageServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -92,15 +90,9 @@ LanguageServiceTracingStub::AnnotateText( child_->AnnotateText(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLanguageServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/language/v2/internal/language_tracing_stub.h b/google/cloud/language/v2/internal/language_tracing_stub.h index 0109a98f90df6..84d4e30c4fa60 100644 --- a/google/cloud/language/v2/internal/language_tracing_stub.h +++ b/google/cloud/language/v2/internal/language_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace language_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LanguageServiceTracingStub : public LanguageServiceStub { public: ~LanguageServiceTracingStub() override = default; @@ -67,8 +65,6 @@ class LanguageServiceTracingStub : public LanguageServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/language/v2/language_connection.h b/google/cloud/language/v2/language_connection.h index 0d3a1a236e54b..389158f80853c 100644 --- a/google/cloud/language/v2/language_connection.h +++ b/google/cloud/language/v2/language_connection.h @@ -21,12 +21,12 @@ #include "google/cloud/language/v2/internal/language_retry_traits.h" #include "google/cloud/language/v2/language_connection_idempotency_policy.h" +#include "google/cloud/language/v2/language_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/language/v2/language_connection_idempotency_policy.h b/google/cloud/language/v2/language_connection_idempotency_policy.h index 0d2ab150ed96c..15a79d094f4d0 100644 --- a/google/cloud/language/v2/language_connection_idempotency_policy.h +++ b/google/cloud/language/v2/language_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V2_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_V2_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/language/v2/language_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/licensemanager/BUILD.bazel b/google/cloud/licensemanager/BUILD.bazel index 0f37940349329..40105a46ae331 100644 --- a/google/cloud/licensemanager/BUILD.bazel +++ b/google/cloud/licensemanager/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/licensemanager/v1:licensemanager_cc_grpc", + "@googleapis//google/cloud/licensemanager/v1:licensemanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.cc b/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.cc index f71588fe3987c..a19f6925e39db 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/licensemanager/v1/licensemanager.proto #include "google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.h" -#include +#include "google/cloud/licensemanager/v1/licensemanager.grpc.pb.h" #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.h b/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.h index 7d3bc9dc392ea..76b05ff6656d6 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/licensemanager/v1/internal/license_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_connection_impl.h b/google/cloud/licensemanager/v1/internal/license_manager_connection_impl.h index d1ba9ddc81152..0ab444319e85f 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_connection_impl.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.cc b/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.cc index 733e6d27317cd..f0a657eaed10e 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/licensemanager/v1/licensemanager.proto #include "google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.h" +#include "google/cloud/licensemanager/v1/licensemanager.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.h b/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.h index 2e74aca799234..b01dd46ae39ea 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/licensemanager/v1/internal/license_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.cc b/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.cc index 43e3f444fd677..50fae951dc461 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/licensemanager/v1/licensemanager.proto #include "google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.h" +#include "google/cloud/licensemanager/v1/licensemanager.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 #include #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.h b/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.h index a1779c4eac38a..f9bfd932427b1 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/licensemanager/v1/internal/license_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_stub.cc b/google/cloud/licensemanager/v1/internal/license_manager_stub.cc index 9e5a3841c92ff..c4ed4fa51f060 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_stub.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/licensemanager/v1/licensemanager.proto #include "google/cloud/licensemanager/v1/internal/license_manager_stub.h" +#include "google/cloud/licensemanager/v1/licensemanager.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_stub.h b/google/cloud/licensemanager/v1/internal/license_manager_stub.h index a1cd8f07b3277..48b6d79034ae2 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_stub.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LICENSEMANAGER_V1_INTERNAL_LICENSE_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LICENSEMANAGER_V1_INTERNAL_LICENSE_MANAGER_STUB_H +#include "google/cloud/licensemanager/v1/licensemanager.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_stub_factory.cc b/google/cloud/licensemanager/v1/internal/license_manager_stub_factory.cc index f6bb2abff4011..a8f378324ad01 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_stub_factory.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/licensemanager/v1/internal/license_manager_metadata_decorator.h" #include "google/cloud/licensemanager/v1/internal/license_manager_stub.h" #include "google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.h" +#include "google/cloud/licensemanager/v1/licensemanager.grpc.pb.h" +#include "google/cloud/location/locations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.cc b/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.cc index 4509c8cd2df1e..9ed3ca035d799 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace licensemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LicenseManagerTracingConnection::LicenseManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -341,16 +339,12 @@ Status LicenseManagerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLicenseManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.h b/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.h index f1795d3457518..bc691bc1e4760 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace licensemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LicenseManagerTracingConnection : public licensemanager_v1::LicenseManagerConnection { public: @@ -162,8 +160,6 @@ class LicenseManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.cc b/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.cc index 949cdab31f318..fd9625ee4b545 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.cc +++ b/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace licensemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LicenseManagerTracingStub::LicenseManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -382,15 +380,9 @@ future LicenseManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLicenseManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.h b/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.h index a71808ceb4c29..6861fde67e25c 100644 --- a/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.h +++ b/google/cloud/licensemanager/v1/internal/license_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace licensemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LicenseManagerTracingStub : public LicenseManagerStub { public: ~LicenseManagerTracingStub() override = default; @@ -183,8 +181,6 @@ class LicenseManagerTracingStub : public LicenseManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/licensemanager/v1/license_manager_client.h b/google/cloud/licensemanager/v1/license_manager_client.h index c9472aeab9b4b..e6ba530eb27b6 100644 --- a/google/cloud/licensemanager/v1/license_manager_client.h +++ b/google/cloud/licensemanager/v1/license_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/licensemanager/v1/license_manager_connection.h b/google/cloud/licensemanager/v1/license_manager_connection.h index 7954f4e929e83..87ab3a971c8f1 100644 --- a/google/cloud/licensemanager/v1/license_manager_connection.h +++ b/google/cloud/licensemanager/v1/license_manager_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/licensemanager/v1/internal/license_manager_retry_traits.h" #include "google/cloud/licensemanager/v1/license_manager_connection_idempotency_policy.h" +#include "google/cloud/licensemanager/v1/licensemanager.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/licensemanager/v1/license_manager_connection_idempotency_policy.h b/google/cloud/licensemanager/v1/license_manager_connection_idempotency_policy.h index 19e8f5de55d3e..eef3d669f35f4 100644 --- a/google/cloud/licensemanager/v1/license_manager_connection_idempotency_policy.h +++ b/google/cloud/licensemanager/v1/license_manager_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LICENSEMANAGER_V1_LICENSE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LICENSEMANAGER_V1_LICENSE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/licensemanager/v1/licensemanager.grpc.pb.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/logging/BUILD.bazel b/google/cloud/logging/BUILD.bazel index 3430666e9a458..2407eff343c64 100644 --- a/google/cloud/logging/BUILD.bazel +++ b/google/cloud/logging/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/logging/v2:logging_cc_grpc", + "@googleapis//google/logging/v2:logging_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/logging/integration_tests/BUILD.bazel b/google/cloud/logging/integration_tests/BUILD.bazel index f402f2a7b4433..e2ad738fb83c3 100644 --- a/google/cloud/logging/integration_tests/BUILD.bazel +++ b/google/cloud/logging/integration_tests/BUILD.bazel @@ -30,6 +30,6 @@ licenses(["notice"]) # Apache 2.0 "//:logging", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in logging_client_integration_tests] diff --git a/google/cloud/logging/quickstart/.bazelrc b/google/cloud/logging/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/logging/quickstart/.bazelrc +++ b/google/cloud/logging/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/logging/v2/config_service_v2_client.h b/google/cloud/logging/v2/config_service_v2_client.h index ddc15f3af74c4..d83861f0f3c04 100644 --- a/google/cloud/logging/v2/config_service_v2_client.h +++ b/google/cloud/logging/v2/config_service_v2_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/config_service_v2_connection.h b/google/cloud/logging/v2/config_service_v2_connection.h index c1fe0ee900387..284cbc8638ea9 100644 --- a/google/cloud/logging/v2/config_service_v2_connection.h +++ b/google/cloud/logging/v2/config_service_v2_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging_config.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/logging/v2/config_service_v2_connection_idempotency_policy.h b/google/cloud/logging/v2/config_service_v2_connection_idempotency_policy.h index b086d4515e0e4..f1c579a41fe41 100644 --- a/google/cloud/logging/v2/config_service_v2_connection_idempotency_policy.h +++ b/google/cloud/logging/v2/config_service_v2_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging_config.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.cc b/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.cc index a41e88d6074c6..a3f53a5a64438 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/logging/v2/logging_config.proto #include "google/cloud/logging/v2/internal/config_service_v2_auth_decorator.h" -#include +#include "google/logging/v2/logging_config.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.h b/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.h index 7a85cecc1b771..19ee5358d1307 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.h +++ b/google/cloud/logging/v2/internal/config_service_v2_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/logging/v2/internal/config_service_v2_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_connection_impl.h b/google/cloud/logging/v2/internal/config_service_v2_connection_impl.h index cb37fa6f2df49..f838a8e64d104 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_connection_impl.h +++ b/google/cloud/logging/v2/internal/config_service_v2_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.cc b/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.cc index 9ba22e8c2e832..4d9df6c5b4871 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/logging/v2/internal/config_service_v2_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging_config.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.h b/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.h index fa97296a8b1f7..2620183c3c8f3 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.h +++ b/google/cloud/logging/v2/internal/config_service_v2_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/logging/v2/internal/config_service_v2_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.cc b/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.cc index d66580a221538..df0e49fedec9a 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging_config.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.h b/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.h index c059e753f9542..da3ace33abd12 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.h +++ b/google/cloud/logging/v2/internal/config_service_v2_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/logging/v2/internal/config_service_v2_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_stub.cc b/google/cloud/logging/v2/internal/config_service_v2_stub.cc index dd297b2acadf0..0d652ac73fbbc 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_stub.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/logging/v2/internal/config_service_v2_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/logging/v2/logging_config.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_stub.h b/google/cloud/logging/v2/internal/config_service_v2_stub.h index 764a24ac65353..36d2ec6d2cb81 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_stub.h +++ b/google/cloud/logging/v2/internal/config_service_v2_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging_config.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc b/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc index e7a98036aeef6..736a20c389354 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/logging/v2/logging_config.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc b/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc index 298d5c120bce2..d4799098d89af 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigServiceV2TracingConnection::ConfigServiceV2TracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -448,16 +446,12 @@ Status ConfigServiceV2TracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigServiceV2TracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.h b/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.h index c672bdfa5bf8e..5ade530f88dd1 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.h +++ b/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigServiceV2TracingConnection : public logging_v2::ConfigServiceV2Connection { public: @@ -184,8 +182,6 @@ class ConfigServiceV2TracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc b/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc index 9fc459e9e7392..07cc0b25e1936 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ConfigServiceV2TracingStub::ConfigServiceV2TracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -536,15 +534,9 @@ future ConfigServiceV2TracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeConfigServiceV2TracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.h b/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.h index 6bc90c54f9c39..c6f7ebd68d13e 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.h +++ b/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ConfigServiceV2TracingStub : public ConfigServiceV2Stub { public: ~ConfigServiceV2TracingStub() override = default; @@ -227,8 +225,6 @@ class ConfigServiceV2TracingStub : public ConfigServiceV2Stub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/logging/v2/internal/logging_service_v2_auth_decorator.cc b/google/cloud/logging/v2/internal/logging_service_v2_auth_decorator.cc index abbc49fe4ddaa..84062a8c6117e 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_auth_decorator.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_auth_decorator.cc @@ -18,7 +18,7 @@ #include "google/cloud/logging/v2/internal/logging_service_v2_auth_decorator.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include +#include "google/logging/v2/logging.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/logging_service_v2_logging_decorator.cc b/google/cloud/logging/v2/internal/logging_service_v2_logging_decorator.cc index 1f5cc12be4e5d..6f90eba27bd32 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_logging_decorator.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_logging_decorator.cc @@ -20,7 +20,7 @@ #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/logging_service_v2_metadata_decorator.cc b/google/cloud/logging/v2/internal/logging_service_v2_metadata_decorator.cc index 9ed90374b7e04..2c708016396bd 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_metadata_decorator.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/logging_service_v2_stub.cc b/google/cloud/logging/v2/internal/logging_service_v2_stub.cc index 7ea868867b99b..99f17db4a1a16 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_stub.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_stub.cc @@ -20,7 +20,7 @@ #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/logging_service_v2_stub.h b/google/cloud/logging/v2/internal/logging_service_v2_stub.h index aeed66150c347..0c19532b89f29 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_stub.h +++ b/google/cloud/logging/v2/internal/logging_service_v2_stub.h @@ -25,8 +25,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/logging_service_v2_stub_factory.cc b/google/cloud/logging/v2/internal/logging_service_v2_stub_factory.cc index 43364800dfddd..08d69feb10a5a 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_stub_factory.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/logging/v2/logging.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc b/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc index 2ac32c950c02c..3aaf90ff3a924 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LoggingServiceV2TracingConnection::LoggingServiceV2TracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -128,16 +126,12 @@ LoggingServiceV2TracingConnection::AsyncWriteLogEntries( child_->AsyncWriteLogEntries(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLoggingServiceV2TracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.h b/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.h index 158d11145d710..11f1362fcb9ed 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.h +++ b/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LoggingServiceV2TracingConnection : public logging_v2::LoggingServiceV2Connection { public: @@ -79,8 +77,6 @@ class LoggingServiceV2TracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc b/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc index 2d1dbc5fa74a7..85a1fe67d0596 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LoggingServiceV2TracingStub::LoggingServiceV2TracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -161,15 +159,9 @@ LoggingServiceV2TracingStub::AsyncWriteLogEntries( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLoggingServiceV2TracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.h b/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.h index a78f4509ccf2e..41d37f5368106 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.h +++ b/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LoggingServiceV2TracingStub : public LoggingServiceV2Stub { public: ~LoggingServiceV2TracingStub() override = default; @@ -94,8 +92,6 @@ class LoggingServiceV2TracingStub : public LoggingServiceV2Stub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_auth_decorator.cc b/google/cloud/logging/v2/internal/metrics_service_v2_auth_decorator.cc index a2285a44ba552..023654726808d 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_auth_decorator.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/logging/v2/logging_metrics.proto #include "google/cloud/logging/v2/internal/metrics_service_v2_auth_decorator.h" -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_logging_decorator.cc b/google/cloud/logging/v2/internal/metrics_service_v2_logging_decorator.cc index fb01c578b44b3..0bfb6ff675216 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_logging_decorator.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/logging/v2/internal/metrics_service_v2_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_metadata_decorator.cc b/google/cloud/logging/v2/internal/metrics_service_v2_metadata_decorator.cc index c49a2082e5c1f..007aaf34aa61b 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_metadata_decorator.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" #include #include #include diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_stub.cc b/google/cloud/logging/v2/internal/metrics_service_v2_stub.cc index 1d60a7f5e4685..b95c8e4a1a921 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_stub.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/logging/v2/internal/metrics_service_v2_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_stub.h b/google/cloud/logging/v2/internal/metrics_service_v2_stub.h index 3f7f8db3688b1..cb2434271f273 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_stub.h +++ b/google/cloud/logging/v2/internal/metrics_service_v2_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_stub_factory.cc b/google/cloud/logging/v2/internal/metrics_service_v2_stub_factory.cc index 9c366cae1ec71..7752af95d6183 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_stub_factory.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc index 824108069b52c..a17b5932d2215 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetricsServiceV2TracingConnection::MetricsServiceV2TracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -107,16 +105,12 @@ Status MetricsServiceV2TracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetricsServiceV2TracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.h b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.h index 393bd76128f6a..013d7594ae6ea 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.h +++ b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetricsServiceV2TracingConnection : public logging_v2::MetricsServiceV2Connection { public: @@ -68,8 +66,6 @@ class MetricsServiceV2TracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.cc b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.cc index 1210a27aefaf9..4c05a3fa71353 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetricsServiceV2TracingStub::MetricsServiceV2TracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -126,15 +124,9 @@ Status MetricsServiceV2TracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetricsServiceV2TracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.h b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.h index 9cc346d9a8f3f..e1370caa691fb 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.h +++ b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace logging_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetricsServiceV2TracingStub : public MetricsServiceV2Stub { public: ~MetricsServiceV2TracingStub() override = default; @@ -77,8 +75,6 @@ class MetricsServiceV2TracingStub : public MetricsServiceV2Stub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/logging/v2/logging_service_v2_connection.h b/google/cloud/logging/v2/logging_service_v2_connection.h index c87e8f144f52d..f42ce05571bb7 100644 --- a/google/cloud/logging/v2/logging_service_v2_connection.h +++ b/google/cloud/logging/v2/logging_service_v2_connection.h @@ -29,7 +29,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/logging/v2/logging.pb.h" #include namespace google { diff --git a/google/cloud/logging/v2/logging_service_v2_connection_idempotency_policy.h b/google/cloud/logging/v2/logging_service_v2_connection_idempotency_policy.h index b6ca281f9cb0f..acfb75c352876 100644 --- a/google/cloud/logging/v2/logging_service_v2_connection_idempotency_policy.h +++ b/google/cloud/logging/v2/logging_service_v2_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/logging/v2/metrics_service_v2_connection.h b/google/cloud/logging/v2/metrics_service_v2_connection.h index cf8fdeaf9104c..ccf12201265b9 100644 --- a/google/cloud/logging/v2/metrics_service_v2_connection.h +++ b/google/cloud/logging/v2/metrics_service_v2_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/logging/v2/logging_metrics.pb.h" #include namespace google { diff --git a/google/cloud/logging/v2/metrics_service_v2_connection_idempotency_policy.h b/google/cloud/logging/v2/metrics_service_v2_connection_idempotency_policy.h index fbbc39fcfcd2c..0c784182d6ee7 100644 --- a/google/cloud/logging/v2/metrics_service_v2_connection_idempotency_policy.h +++ b/google/cloud/logging/v2/metrics_service_v2_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/logging/v2/logging_metrics.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/lustre/BUILD.bazel b/google/cloud/lustre/BUILD.bazel index eaf8d50b64934..e2c66201775f8 100644 --- a/google/cloud/lustre/BUILD.bazel +++ b/google/cloud/lustre/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/lustre/v1:lustre_cc_grpc", + "@googleapis//google/cloud/lustre/v1:lustre_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/lustre/v1/internal/lustre_auth_decorator.cc b/google/cloud/lustre/v1/internal/lustre_auth_decorator.cc index 6066c6830402f..8818c2140cf5c 100644 --- a/google/cloud/lustre/v1/internal/lustre_auth_decorator.cc +++ b/google/cloud/lustre/v1/internal/lustre_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/lustre/v1/lustre.proto #include "google/cloud/lustre/v1/internal/lustre_auth_decorator.h" -#include +#include "google/cloud/lustre/v1/lustre.grpc.pb.h" #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_auth_decorator.h b/google/cloud/lustre/v1/internal/lustre_auth_decorator.h index 225546e11d252..bd0d4ac99eb80 100644 --- a/google/cloud/lustre/v1/internal/lustre_auth_decorator.h +++ b/google/cloud/lustre/v1/internal/lustre_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/lustre/v1/internal/lustre_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_connection_impl.h b/google/cloud/lustre/v1/internal/lustre_connection_impl.h index b37647d31ec30..5a13e247515b1 100644 --- a/google/cloud/lustre/v1/internal/lustre_connection_impl.h +++ b/google/cloud/lustre/v1/internal/lustre_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/lustre/v1/internal/lustre_logging_decorator.cc b/google/cloud/lustre/v1/internal/lustre_logging_decorator.cc index a2ad275095445..a2607f8282b7b 100644 --- a/google/cloud/lustre/v1/internal/lustre_logging_decorator.cc +++ b/google/cloud/lustre/v1/internal/lustre_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/lustre/v1/lustre.proto #include "google/cloud/lustre/v1/internal/lustre_logging_decorator.h" +#include "google/cloud/lustre/v1/lustre.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_logging_decorator.h b/google/cloud/lustre/v1/internal/lustre_logging_decorator.h index 36e666c4f0007..31bdce7bc2a83 100644 --- a/google/cloud/lustre/v1/internal/lustre_logging_decorator.h +++ b/google/cloud/lustre/v1/internal/lustre_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/lustre/v1/internal/lustre_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_metadata_decorator.cc b/google/cloud/lustre/v1/internal/lustre_metadata_decorator.cc index 5750105bf4e84..85f93ae0c2b50 100644 --- a/google/cloud/lustre/v1/internal/lustre_metadata_decorator.cc +++ b/google/cloud/lustre/v1/internal/lustre_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/lustre/v1/lustre.proto #include "google/cloud/lustre/v1/internal/lustre_metadata_decorator.h" +#include "google/cloud/lustre/v1/lustre.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 #include #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_metadata_decorator.h b/google/cloud/lustre/v1/internal/lustre_metadata_decorator.h index ded7c40fba5c6..fcd899f85a521 100644 --- a/google/cloud/lustre/v1/internal/lustre_metadata_decorator.h +++ b/google/cloud/lustre/v1/internal/lustre_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/lustre/v1/internal/lustre_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_stub.cc b/google/cloud/lustre/v1/internal/lustre_stub.cc index 2e8f2aa4ca993..307af76be968e 100644 --- a/google/cloud/lustre/v1/internal/lustre_stub.cc +++ b/google/cloud/lustre/v1/internal/lustre_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/lustre/v1/lustre.proto #include "google/cloud/lustre/v1/internal/lustre_stub.h" +#include "google/cloud/lustre/v1/lustre.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_stub.h b/google/cloud/lustre/v1/internal/lustre_stub.h index ca1ad14e6387c..791dfd8d8d37d 100644 --- a/google/cloud/lustre/v1/internal/lustre_stub.h +++ b/google/cloud/lustre/v1/internal/lustre_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LUSTRE_V1_INTERNAL_LUSTRE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LUSTRE_V1_INTERNAL_LUSTRE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/lustre/v1/lustre.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_stub_factory.cc b/google/cloud/lustre/v1/internal/lustre_stub_factory.cc index b4fc934c8745a..7ed0c40ed2ee1 100644 --- a/google/cloud/lustre/v1/internal/lustre_stub_factory.cc +++ b/google/cloud/lustre/v1/internal/lustre_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/lustre/v1/lustre.proto #include "google/cloud/lustre/v1/internal/lustre_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/lustre/v1/internal/lustre_auth_decorator.h" #include "google/cloud/lustre/v1/internal/lustre_logging_decorator.h" #include "google/cloud/lustre/v1/internal/lustre_metadata_decorator.h" #include "google/cloud/lustre/v1/internal/lustre_stub.h" #include "google/cloud/lustre/v1/internal/lustre_tracing_stub.h" +#include "google/cloud/lustre/v1/lustre.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/lustre/v1/internal/lustre_tracing_connection.cc b/google/cloud/lustre/v1/internal/lustre_tracing_connection.cc index 28ec107c7b880..b5189320f0b18 100644 --- a/google/cloud/lustre/v1/internal/lustre_tracing_connection.cc +++ b/google/cloud/lustre/v1/internal/lustre_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace lustre_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LustreTracingConnection::LustreTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -226,15 +224,11 @@ Status LustreTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLustreTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/lustre/v1/internal/lustre_tracing_connection.h b/google/cloud/lustre/v1/internal/lustre_tracing_connection.h index dffb73fb1c79e..c06649f88bc2b 100644 --- a/google/cloud/lustre/v1/internal/lustre_tracing_connection.h +++ b/google/cloud/lustre/v1/internal/lustre_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace lustre_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LustreTracingConnection : public lustre_v1::LustreConnection { public: ~LustreTracingConnection() override = default; @@ -117,8 +115,6 @@ class LustreTracingConnection : public lustre_v1::LustreConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/lustre/v1/internal/lustre_tracing_stub.cc b/google/cloud/lustre/v1/internal/lustre_tracing_stub.cc index 79f3fe2d5db91..db4baceabafaa 100644 --- a/google/cloud/lustre/v1/internal/lustre_tracing_stub.cc +++ b/google/cloud/lustre/v1/internal/lustre_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace lustre_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LustreTracingStub::LustreTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -278,15 +276,9 @@ future LustreTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLustreTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/lustre/v1/internal/lustre_tracing_stub.h b/google/cloud/lustre/v1/internal/lustre_tracing_stub.h index 173089ceb8f9b..cc273b6dd6374 100644 --- a/google/cloud/lustre/v1/internal/lustre_tracing_stub.h +++ b/google/cloud/lustre/v1/internal/lustre_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace lustre_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LustreTracingStub : public LustreStub { public: ~LustreTracingStub() override = default; @@ -138,8 +136,6 @@ class LustreTracingStub : public LustreStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/lustre/v1/lustre_client.h b/google/cloud/lustre/v1/lustre_client.h index f50155155ddbe..5c1f6663d926c 100644 --- a/google/cloud/lustre/v1/lustre_client.h +++ b/google/cloud/lustre/v1/lustre_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/lustre/v1/lustre_connection.h b/google/cloud/lustre/v1/lustre_connection.h index 5c88579e23196..2df5eda3b63b3 100644 --- a/google/cloud/lustre/v1/lustre_connection.h +++ b/google/cloud/lustre/v1/lustre_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LUSTRE_V1_LUSTRE_CONNECTION_H #include "google/cloud/lustre/v1/internal/lustre_retry_traits.h" +#include "google/cloud/lustre/v1/lustre.pb.h" #include "google/cloud/lustre/v1/lustre_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/lustre/v1/lustre_connection_idempotency_policy.h b/google/cloud/lustre/v1/lustre_connection_idempotency_policy.h index 004a6ee2245da..5f5cdd4033b28 100644 --- a/google/cloud/lustre/v1/lustre_connection_idempotency_policy.h +++ b/google/cloud/lustre/v1/lustre_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LUSTRE_V1_LUSTRE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LUSTRE_V1_LUSTRE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/lustre/v1/lustre.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/maintenance/BUILD.bazel b/google/cloud/maintenance/BUILD.bazel index cf5798ac153c8..ef39f3aafc06b 100644 --- a/google/cloud/maintenance/BUILD.bazel +++ b/google/cloud/maintenance/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["api/v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/maintenance/api/v1:api_cc_grpc", + "@googleapis//google/cloud/maintenance/api/v1:api_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_auth_decorator.cc b/google/cloud/maintenance/api/v1/internal/maintenance_auth_decorator.cc index 12c849222bbb8..250dbb9945eb8 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_auth_decorator.cc +++ b/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 +#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h" #include #include diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_logging_decorator.cc b/google/cloud/maintenance/api/v1/internal/maintenance_logging_decorator.cc index ba682f875d899..05231ee738687 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_logging_decorator.cc +++ b/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 #include #include #include diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_metadata_decorator.cc b/google/cloud/maintenance/api/v1/internal/maintenance_metadata_decorator.cc index ba0b8f4d8eb75..e6637f152bb62 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_metadata_decorator.cc +++ b/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 #include #include #include diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_stub.cc b/google/cloud/maintenance/api/v1/internal/maintenance_stub.cc index 6dac7ea723488..20c05515718b3 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_stub.cc +++ b/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 #include #include diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_stub.h b/google/cloud/maintenance/api/v1/internal/maintenance_stub.h index 3ba6c401bd892..48211af6d1259 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_stub.h +++ b/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 -#include #include #include diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_stub_factory.cc b/google/cloud/maintenance/api/v1/internal/maintenance_stub_factory.cc index 5ddce7b471d14..675fb40943889 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_stub_factory.cc +++ b/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 -#include #include #include diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.cc b/google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.cc index abd4fe5f63e5b..2ea2a41e6ccf0 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.cc +++ b/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 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 MakeMaintenanceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.h b/google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.h index ec06d8212fdf8..1c9a3a7a76270 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.h +++ b/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 child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.cc b/google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.cc index cd8bf45a94bd4..43adc03996303 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.cc +++ b/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 child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -97,15 +95,9 @@ StatusOr MaintenanceTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMaintenanceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.h b/google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.h index f4d9ffbe7653d..6dbbc0f59a3f2 100644 --- a/google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.h +++ b/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. * diff --git a/google/cloud/maintenance/api/v1/maintenance_connection.h b/google/cloud/maintenance/api/v1/maintenance_connection.h index 05a6787fcccd9..d0c62a79e43e8 100644 --- a/google/cloud/maintenance/api/v1/maintenance_connection.h +++ b/google/cloud/maintenance/api/v1/maintenance_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/maintenance/api/v1/internal/maintenance_retry_traits.h" #include "google/cloud/maintenance/api/v1/maintenance_connection_idempotency_policy.h" +#include "google/cloud/maintenance/api/v1/maintenance_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/maintenance/api/v1/maintenance_connection_idempotency_policy.h b/google/cloud/maintenance/api/v1/maintenance_connection_idempotency_policy.h index 64fd90f857127..190167af2f2c6 100644 --- a/google/cloud/maintenance/api/v1/maintenance_connection_idempotency_policy.h +++ b/google/cloud/maintenance/api/v1/maintenance_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MAINTENANCE_API_V1_MAINTENANCE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MAINTENANCE_API_V1_MAINTENANCE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/managedidentities/BUILD.bazel b/google/cloud/managedidentities/BUILD.bazel index f2c84e9344b89..d213734daa1ca 100644 --- a/google/cloud/managedidentities/BUILD.bazel +++ b/google/cloud/managedidentities/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/managedidentities/v1:managedidentities_cc_grpc", + "@googleapis//google/cloud/managedidentities/v1:managedidentities_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/managedidentities/quickstart/.bazelrc b/google/cloud/managedidentities/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/managedidentities/quickstart/.bazelrc +++ b/google/cloud/managedidentities/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.cc b/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.cc index 815944687727a..cd5b1bdc82624 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/managedidentities/v1/managed_identities_service.proto #include "google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.h" -#include +#include "google/cloud/managedidentities/v1/managed_identities_service.grpc.pb.h" #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.h b/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.h index a46235eefca6d..bc7eb76a40d9b 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/managedidentities/v1/internal/managed_identities_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_connection_impl.h b/google/cloud/managedidentities/v1/internal/managed_identities_connection_impl.h index f2b2e1fdf5edd..a6de2e870072d 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_connection_impl.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.cc b/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.cc index 58fee0ea35e51..bdbe1c0c4ddb8 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/managedidentities/v1/managed_identities_service.proto #include "google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.h" +#include "google/cloud/managedidentities/v1/managed_identities_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.h b/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.h index 1641678ae7bf8..65daa037d685f 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/managedidentities/v1/internal/managed_identities_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.cc b/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.cc index 238fdb013fa43..8a90a1f4e6983 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/managedidentities/v1/managed_identities_service.proto #include "google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.h" +#include "google/cloud/managedidentities/v1/managed_identities_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 #include #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.h b/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.h index ec0423f1bc0d7..235a7d8f3c9eb 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/managedidentities/v1/internal/managed_identities_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc b/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc index 5dff8f9ba2eec..5283d738ae271 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/managedidentities/v1/managed_identities_service.proto #include "google/cloud/managedidentities/v1/internal/managed_identities_stub.h" +#include "google/cloud/managedidentities/v1/managed_identities_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_stub.h b/google/cloud/managedidentities/v1/internal/managed_identities_stub.h index bc9058c5242ff..3b183a2e7a30d 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_stub.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_V1_INTERNAL_MANAGED_IDENTITIES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_V1_INTERNAL_MANAGED_IDENTITIES_STUB_H +#include "google/cloud/managedidentities/v1/managed_identities_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_stub_factory.cc b/google/cloud/managedidentities/v1/internal/managed_identities_stub_factory.cc index 2137964e2deff..4d35e2e308817 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_stub_factory.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/managedidentities/v1/internal/managed_identities_metadata_decorator.h" #include "google/cloud/managedidentities/v1/internal/managed_identities_stub.h" #include "google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.h" +#include "google/cloud/managedidentities/v1/managed_identities_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 #include #include diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc index aa7bbaeb7ced9..21e72c0b11a0b 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace managedidentities_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedIdentitiesServiceTracingConnection:: ManagedIdentitiesServiceTracingConnection( std::shared_ptr< @@ -282,18 +280,14 @@ ManagedIdentitiesServiceTracingConnection::ValidateTrust( return internal::EndSpan(std::move(span), child_->ValidateTrust(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedIdentitiesServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.h b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.h index 1b6143ae2ca09..53fc68353a504 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace managedidentities_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedIdentitiesServiceTracingConnection : public managedidentities_v1::ManagedIdentitiesServiceConnection { public: @@ -145,8 +143,6 @@ class ManagedIdentitiesServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc index ca5c27dada3ac..a1362b5408201 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace managedidentities_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedIdentitiesServiceTracingStub::ManagedIdentitiesServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -303,16 +301,10 @@ future ManagedIdentitiesServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedIdentitiesServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.h b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.h index cc6b5a471095e..226fe9d55ac34 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace managedidentities_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedIdentitiesServiceTracingStub : public ManagedIdentitiesServiceStub { public: @@ -158,8 +156,6 @@ class ManagedIdentitiesServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/managedidentities/v1/managed_identities_client.h b/google/cloud/managedidentities/v1/managed_identities_client.h index 61b3075222917..38545ebca34c2 100644 --- a/google/cloud/managedidentities/v1/managed_identities_client.h +++ b/google/cloud/managedidentities/v1/managed_identities_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedidentities/v1/managed_identities_connection.h b/google/cloud/managedidentities/v1/managed_identities_connection.h index 5ea208286f079..eac36f1f034a0 100644 --- a/google/cloud/managedidentities/v1/managed_identities_connection.h +++ b/google/cloud/managedidentities/v1/managed_identities_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/managedidentities/v1/internal/managed_identities_retry_traits.h" #include "google/cloud/managedidentities/v1/managed_identities_connection_idempotency_policy.h" +#include "google/cloud/managedidentities/v1/managed_identities_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/managedidentities/v1/managed_identities_connection_idempotency_policy.h b/google/cloud/managedidentities/v1/managed_identities_connection_idempotency_policy.h index c1d45ab9302f9..69bafdd660b39 100644 --- a/google/cloud/managedidentities/v1/managed_identities_connection_idempotency_policy.h +++ b/google/cloud/managedidentities/v1/managed_identities_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_V1_MANAGED_IDENTITIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_V1_MANAGED_IDENTITIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/managedidentities/v1/managed_identities_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/managedkafka/BUILD.bazel b/google/cloud/managedkafka/BUILD.bazel index eceb9c4cbc999..80b1c6487c0d4 100644 --- a/google/cloud/managedkafka/BUILD.bazel +++ b/google/cloud/managedkafka/BUILD.bazel @@ -24,8 +24,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/managedkafka/v1:managedkafka_cc_grpc", - "@com_google_googleapis//google/cloud/managedkafka/schemaregistry/v1:schemaregistry_cc_grpc", + "@googleapis//google/cloud/managedkafka/v1:managedkafka_cc_grpc", + "@googleapis//google/cloud/managedkafka/schemaregistry/v1:schemaregistry_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/managedkafka/quickstart/.bazelrc b/google/cloud/managedkafka/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/managedkafka/quickstart/.bazelrc +++ b/google/cloud/managedkafka/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_auth_decorator.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_auth_decorator.cc index 991ed02ec53c6..2814eaa162a78 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_auth_decorator.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/managedkafka/schemaregistry/v1/schema_registry.proto #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_auth_decorator.h" -#include +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_logging_decorator.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_logging_decorator.cc index 179463e086ebd..62f76c393389c 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_logging_decorator.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/managedkafka/schemaregistry/v1/schema_registry.proto #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_logging_decorator.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_metadata_decorator.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_metadata_decorator.cc index 2ac281045db61..0699407c01fb3 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_metadata_decorator.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/managedkafka/schemaregistry/v1/schema_registry.proto #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_metadata_decorator.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.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 #include #include #include diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.cc index 99e827643e772..1bf9018466516 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/managedkafka/schemaregistry/v1/schema_registry.proto #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.h b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.h index 5bad438a7c9f6..b41c7ad7c7fbe 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.h +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_SCHEMAREGISTRY_V1_INTERNAL_MANAGED_SCHEMA_REGISTRY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_SCHEMAREGISTRY_V1_INTERNAL_MANAGED_SCHEMA_REGISTRY_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub_factory.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub_factory.cc index 4550c34774fbf..3b7df6eacbb6b 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub_factory.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/managedkafka/schemaregistry/v1/schema_registry.proto #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_auth_decorator.h" #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_logging_decorator.h" #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_metadata_decorator.h" #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_stub.h" #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.cc index 3b12bc8f308b2..48ce5e8cc5ac7 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace managedkafka_schemaregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedSchemaRegistryTracingConnection::ManagedSchemaRegistryTracingConnection( std::shared_ptr< managedkafka_schemaregistry_v1::ManagedSchemaRegistryConnection> @@ -395,19 +393,15 @@ Status ManagedSchemaRegistryTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedSchemaRegistryTracingConnection( std::shared_ptr< managedkafka_schemaregistry_v1::ManagedSchemaRegistryConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.h b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.h index 5ba2cc1d3907c..71baa9f5567e8 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.h +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace managedkafka_schemaregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedSchemaRegistryTracingConnection : public managedkafka_schemaregistry_v1::ManagedSchemaRegistryConnection { public: @@ -178,8 +176,6 @@ class ManagedSchemaRegistryTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.cc b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.cc index 774119d645d08..a056efa0d5b26 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.cc +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace managedkafka_schemaregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedSchemaRegistryTracingStub::ManagedSchemaRegistryTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -482,15 +480,9 @@ Status ManagedSchemaRegistryTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedSchemaRegistryTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.h b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.h index 73b930b89f1c9..3ed2f4f77fbc7 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.h +++ b/google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace managedkafka_schemaregistry_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedSchemaRegistryTracingStub : public ManagedSchemaRegistryStub { public: ~ManagedSchemaRegistryTracingStub() override = default; @@ -208,8 +206,6 @@ class ManagedSchemaRegistryTracingStub : public ManagedSchemaRegistryStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection.h b/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection.h index acdf9070692e2..4cb2eb6b0e8cc 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection.h +++ b/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/managedkafka/schemaregistry/v1/internal/managed_schema_registry_retry_traits.h" #include "google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection_idempotency_policy.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection_idempotency_policy.h b/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection_idempotency_policy.h index 1ec4dcdfc7cdf..6cf04b1411228 100644 --- a/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection_idempotency_policy.h +++ b/google/cloud/managedkafka/schemaregistry/v1/managed_schema_registry_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_SCHEMAREGISTRY_V1_MANAGED_SCHEMA_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_SCHEMAREGISTRY_V1_MANAGED_SCHEMA_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/managedkafka/schemaregistry/v1/schema_registry.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.cc index 82ce3c96faa5f..9f2c3636ed83d 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/managedkafka/v1/managed_kafka.proto #include "google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.h" -#include +#include "google/cloud/managedkafka/v1/managed_kafka.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.h b/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.h index 86d1f24c91f31..84d059e24249c 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/managedkafka/v1/internal/managed_kafka_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_connection_impl.h b/google/cloud/managedkafka/v1/internal/managed_kafka_connection_impl.h index 098e36eb2f311..308618d70d139 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_connection_impl.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.cc index 9a2e6c0d243ff..e855380be29da 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/managedkafka/v1/managed_kafka.proto #include "google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.h" +#include "google/cloud/managedkafka/v1/managed_kafka.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.h b/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.h index 7717f0f2d60f6..c9e752a0ba873 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/managedkafka/v1/internal/managed_kafka_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.cc index bdc06e5562674..17b0f085c4085 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/managedkafka/v1/managed_kafka.proto #include "google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.h" +#include "google/cloud/managedkafka/v1/managed_kafka.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 #include #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.h b/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.h index a2f04524f9b3a..b64fbd1d80836 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/managedkafka/v1/internal/managed_kafka_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc index fb1eedf366ffa..cd83baecd7fe3 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/managedkafka/v1/managed_kafka.proto #include "google/cloud/managedkafka/v1/internal/managed_kafka_stub.h" +#include "google/cloud/managedkafka/v1/managed_kafka.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h index c2dd4fdb803da..90b5e86d2f210 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_V1_INTERNAL_MANAGED_KAFKA_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_V1_INTERNAL_MANAGED_KAFKA_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/managedkafka/v1/managed_kafka.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc index bd7033102a8e9..37693d3602a6d 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/managedkafka/v1/managed_kafka.proto #include "google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/managedkafka/v1/internal/managed_kafka_auth_decorator.h" #include "google/cloud/managedkafka/v1/internal/managed_kafka_logging_decorator.h" #include "google/cloud/managedkafka/v1/internal/managed_kafka_metadata_decorator.h" #include "google/cloud/managedkafka/v1/internal/managed_kafka_stub.h" #include "google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.h" +#include "google/cloud/managedkafka/v1/managed_kafka.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.cc index c7c642124a45f..8b69d00e95ef8 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace managedkafka_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedKafkaTracingConnection::ManagedKafkaTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -343,16 +341,12 @@ Status ManagedKafkaTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedKafkaTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.h b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.h index da1319aa883c3..420ab9a31e45c 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace managedkafka_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedKafkaTracingConnection : public managedkafka_v1::ManagedKafkaConnection { public: @@ -163,8 +161,6 @@ class ManagedKafkaTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.cc index 9df21a51b5377..50a321195b2b5 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace managedkafka_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedKafkaTracingStub::ManagedKafkaTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -418,15 +416,9 @@ future ManagedKafkaTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedKafkaTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.h b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.h index 1a3e8eb31d843..321179fadb740 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace managedkafka_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedKafkaTracingStub : public ManagedKafkaStub { public: ~ManagedKafkaTracingStub() override = default; @@ -202,8 +200,6 @@ class ManagedKafkaTracingStub : public ManagedKafkaStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/managedkafka/v1/managed_kafka_client.h b/google/cloud/managedkafka/v1/managed_kafka_client.h index 60991360280dd..5a5d942fb4d98 100644 --- a/google/cloud/managedkafka/v1/managed_kafka_client.h +++ b/google/cloud/managedkafka/v1/managed_kafka_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/managedkafka/v1/managed_kafka_connection.h b/google/cloud/managedkafka/v1/managed_kafka_connection.h index 142f735ffa416..1ced1e2a070e8 100644 --- a/google/cloud/managedkafka/v1/managed_kafka_connection.h +++ b/google/cloud/managedkafka/v1/managed_kafka_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_V1_MANAGED_KAFKA_CONNECTION_H #include "google/cloud/managedkafka/v1/internal/managed_kafka_retry_traits.h" +#include "google/cloud/managedkafka/v1/managed_kafka.pb.h" #include "google/cloud/managedkafka/v1/managed_kafka_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/managedkafka/v1/managed_kafka_connection_idempotency_policy.h b/google/cloud/managedkafka/v1/managed_kafka_connection_idempotency_policy.h index 89ec93e610f7a..2662b271ca0af 100644 --- a/google/cloud/managedkafka/v1/managed_kafka_connection_idempotency_policy.h +++ b/google/cloud/managedkafka/v1/managed_kafka_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_V1_MANAGED_KAFKA_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDKAFKA_V1_MANAGED_KAFKA_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/managedkafka/v1/managed_kafka.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/memcache/BUILD.bazel b/google/cloud/memcache/BUILD.bazel index de82ac26cddf5..0c1545cb30b90 100644 --- a/google/cloud/memcache/BUILD.bazel +++ b/google/cloud/memcache/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/memcache/v1:memcache_cc_grpc", + "@googleapis//google/cloud/memcache/v1:memcache_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/memcache/quickstart/.bazelrc b/google/cloud/memcache/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/memcache/quickstart/.bazelrc +++ b/google/cloud/memcache/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/memcache/v1/cloud_memcache_client.h b/google/cloud/memcache/v1/cloud_memcache_client.h index a076622936609..4ac2c9a7cbc1a 100644 --- a/google/cloud/memcache/v1/cloud_memcache_client.h +++ b/google/cloud/memcache/v1/cloud_memcache_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memcache/v1/cloud_memcache_connection.h b/google/cloud/memcache/v1/cloud_memcache_connection.h index 79f42842c44c5..fefdbacce9904 100644 --- a/google/cloud/memcache/v1/cloud_memcache_connection.h +++ b/google/cloud/memcache/v1/cloud_memcache_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_V1_CLOUD_MEMCACHE_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_V1_CLOUD_MEMCACHE_CONNECTION_H +#include "google/cloud/memcache/v1/cloud_memcache.pb.h" #include "google/cloud/memcache/v1/cloud_memcache_connection_idempotency_policy.h" #include "google/cloud/memcache/v1/internal/cloud_memcache_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/memcache/v1/cloud_memcache_connection_idempotency_policy.h b/google/cloud/memcache/v1/cloud_memcache_connection_idempotency_policy.h index e60afc8229530..4cb0a8856fb26 100644 --- a/google/cloud/memcache/v1/cloud_memcache_connection_idempotency_policy.h +++ b/google/cloud/memcache/v1/cloud_memcache_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_V1_CLOUD_MEMCACHE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_V1_CLOUD_MEMCACHE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/memcache/v1/cloud_memcache.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.cc b/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.cc index 527ea70dd58e2..18e03823e5611 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/memcache/v1/cloud_memcache.proto #include "google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.h" -#include +#include "google/cloud/memcache/v1/cloud_memcache.grpc.pb.h" #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.h b/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.h index a4b4c6422844f..79239bf1bca0d 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/memcache/v1/internal/cloud_memcache_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_connection_impl.h b/google/cloud/memcache/v1/internal/cloud_memcache_connection_impl.h index 1f398abf38889..b45baf9a60ad5 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_connection_impl.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.cc b/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.cc index 89c14660837fd..30fbe4921e306 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/memcache/v1/cloud_memcache.proto #include "google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.h" +#include "google/cloud/memcache/v1/cloud_memcache.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.h b/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.h index b63518362e26c..efd3ec2f346a4 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/memcache/v1/internal/cloud_memcache_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.cc b/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.cc index 0cc34713c2b88..fd26c754f7e06 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/memcache/v1/cloud_memcache.proto #include "google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.h" +#include "google/cloud/memcache/v1/cloud_memcache.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 #include #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.h b/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.h index 38a0e3ac1b1ff..b66082fd186b1 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/memcache/v1/internal/cloud_memcache_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc b/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc index 38c0a8f6848e6..be86fb2e4e7e3 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/memcache/v1/cloud_memcache.proto #include "google/cloud/memcache/v1/internal/cloud_memcache_stub.h" +#include "google/cloud/memcache/v1/cloud_memcache.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_stub.h b/google/cloud/memcache/v1/internal/cloud_memcache_stub.h index 07373332c0a18..0cb581484de6e 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_stub.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_V1_INTERNAL_CLOUD_MEMCACHE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_V1_INTERNAL_CLOUD_MEMCACHE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/memcache/v1/cloud_memcache.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc b/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc index d6a4881ef1946..d5ab7c3e35f7d 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/memcache/v1/cloud_memcache.proto #include "google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/memcache/v1/cloud_memcache.grpc.pb.h" #include "google/cloud/memcache/v1/internal/cloud_memcache_auth_decorator.h" #include "google/cloud/memcache/v1/internal/cloud_memcache_logging_decorator.h" #include "google/cloud/memcache/v1/internal/cloud_memcache_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc index bd21eb7ef1b13..cac0172f220c8 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace memcache_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudMemcacheTracingConnection::CloudMemcacheTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -286,16 +284,12 @@ Status CloudMemcacheTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudMemcacheTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.h b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.h index a77734d587f09..801932f73c17a 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace memcache_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudMemcacheTracingConnection : public memcache_v1::CloudMemcacheConnection { public: @@ -140,8 +138,6 @@ class CloudMemcacheTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc index 7f01af79327b7..cb587a09a8558 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace memcache_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudMemcacheTracingStub::CloudMemcacheTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -315,15 +313,9 @@ future CloudMemcacheTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudMemcacheTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.h b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.h index 02884eb8f59af..41a9132e2236e 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace memcache_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudMemcacheTracingStub : public CloudMemcacheStub { public: ~CloudMemcacheTracingStub() override = default; @@ -161,8 +159,6 @@ class CloudMemcacheTracingStub : public CloudMemcacheStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/memorystore/BUILD.bazel b/google/cloud/memorystore/BUILD.bazel index 06cb560083b62..4474b6ffd6b3a 100644 --- a/google/cloud/memorystore/BUILD.bazel +++ b/google/cloud/memorystore/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/memorystore/v1:memorystore_cc_grpc", + "@googleapis//google/cloud/memorystore/v1:memorystore_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.cc b/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.cc index 8a6c3007f5e9e..3d7cc861eeb0e 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/memorystore/v1/memorystore.proto #include "google/cloud/memorystore/v1/internal/memorystore_auth_decorator.h" -#include +#include "google/cloud/memorystore/v1/memorystore.grpc.pb.h" #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.h b/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.h index 3a7291774b8d2..da4c2246c868c 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.h +++ b/google/cloud/memorystore/v1/internal/memorystore_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/memorystore/v1/internal/memorystore_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_connection_impl.h b/google/cloud/memorystore/v1/internal/memorystore_connection_impl.h index 4a0c5ee66ccc4..6d01a2a3504e0 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_connection_impl.h +++ b/google/cloud/memorystore/v1/internal/memorystore_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.cc b/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.cc index 37ee8010eb6b2..5426951dc1153 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/memorystore/v1/memorystore.proto #include "google/cloud/memorystore/v1/internal/memorystore_logging_decorator.h" +#include "google/cloud/memorystore/v1/memorystore.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.h b/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.h index 26174c0da7a15..e0800e738befc 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.h +++ b/google/cloud/memorystore/v1/internal/memorystore_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/memorystore/v1/internal/memorystore_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.cc b/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.cc index d28e989435abe..ff9949e077853 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/memorystore/v1/memorystore.proto #include "google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.h" +#include "google/cloud/memorystore/v1/memorystore.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 #include #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.h b/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.h index 04242b0d31600..cd0d5d0d5b330 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.h +++ b/google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/memorystore/v1/internal/memorystore_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_stub.cc b/google/cloud/memorystore/v1/internal/memorystore_stub.cc index 3ed9a7e92dfaa..f3cea453cc620 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_stub.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/memorystore/v1/memorystore.proto #include "google/cloud/memorystore/v1/internal/memorystore_stub.h" +#include "google/cloud/memorystore/v1/memorystore.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_stub.h b/google/cloud/memorystore/v1/internal/memorystore_stub.h index aa10cd69cf01b..3419bebee8040 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_stub.h +++ b/google/cloud/memorystore/v1/internal/memorystore_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMORYSTORE_V1_INTERNAL_MEMORYSTORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMORYSTORE_V1_INTERNAL_MEMORYSTORE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/memorystore/v1/memorystore.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_stub_factory.cc b/google/cloud/memorystore/v1/internal/memorystore_stub_factory.cc index dca058f0c892a..7ce435915f19d 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_stub_factory.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/memorystore/v1/memorystore.proto #include "google/cloud/memorystore/v1/internal/memorystore_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/memorystore/v1/internal/memorystore_auth_decorator.h" #include "google/cloud/memorystore/v1/internal/memorystore_logging_decorator.h" #include "google/cloud/memorystore/v1/internal/memorystore_metadata_decorator.h" #include "google/cloud/memorystore/v1/internal/memorystore_stub.h" #include "google/cloud/memorystore/v1/internal/memorystore_tracing_stub.h" +#include "google/cloud/memorystore/v1/memorystore.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.cc b/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.cc index b06b77efe6d90..d8bdf7b00f138 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace memorystore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MemorystoreTracingConnection::MemorystoreTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -365,16 +363,12 @@ Status MemorystoreTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMemorystoreTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.h b/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.h index aaa8abfe069ef..14e6862ce4b83 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.h +++ b/google/cloud/memorystore/v1/internal/memorystore_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace memorystore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MemorystoreTracingConnection : public memorystore_v1::MemorystoreConnection { public: @@ -176,8 +174,6 @@ class MemorystoreTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.cc b/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.cc index 87045ce21fd40..0b1cabfff0a79 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.cc +++ b/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace memorystore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MemorystoreTracingStub::MemorystoreTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -398,15 +396,9 @@ future MemorystoreTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMemorystoreTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.h b/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.h index ac516054425e5..5ee3e553781f8 100644 --- a/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.h +++ b/google/cloud/memorystore/v1/internal/memorystore_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace memorystore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MemorystoreTracingStub : public MemorystoreStub { public: ~MemorystoreTracingStub() override = default; @@ -201,8 +199,6 @@ class MemorystoreTracingStub : public MemorystoreStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/memorystore/v1/memorystore_client.h b/google/cloud/memorystore/v1/memorystore_client.h index 51a9baee736cf..1e309cdc13c20 100644 --- a/google/cloud/memorystore/v1/memorystore_client.h +++ b/google/cloud/memorystore/v1/memorystore_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/memorystore/v1/memorystore_connection.h b/google/cloud/memorystore/v1/memorystore_connection.h index f7b5b9a106777..c1c53d007403a 100644 --- a/google/cloud/memorystore/v1/memorystore_connection.h +++ b/google/cloud/memorystore/v1/memorystore_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMORYSTORE_V1_MEMORYSTORE_CONNECTION_H #include "google/cloud/memorystore/v1/internal/memorystore_retry_traits.h" +#include "google/cloud/memorystore/v1/memorystore.pb.h" #include "google/cloud/memorystore/v1/memorystore_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/memorystore/v1/memorystore_connection_idempotency_policy.h b/google/cloud/memorystore/v1/memorystore_connection_idempotency_policy.h index fea0d32e11117..a4ac953d6307c 100644 --- a/google/cloud/memorystore/v1/memorystore_connection_idempotency_policy.h +++ b/google/cloud/memorystore/v1/memorystore_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMORYSTORE_V1_MEMORYSTORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMORYSTORE_V1_MEMORYSTORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/memorystore/v1/memorystore.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/BUILD.bazel b/google/cloud/metastore/BUILD.bazel index a6dd7643bb1a4..68644492fe9ac 100644 --- a/google/cloud/metastore/BUILD.bazel +++ b/google/cloud/metastore/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/metastore/v1:metastore_cc_grpc", + "@googleapis//google/cloud/metastore/v1:metastore_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/metastore/quickstart/.bazelrc b/google/cloud/metastore/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/metastore/quickstart/.bazelrc +++ b/google/cloud/metastore/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/metastore/v1/dataproc_metastore_client.h b/google/cloud/metastore/v1/dataproc_metastore_client.h index 9bf83004f273b..7951db6d2f690 100644 --- a/google/cloud/metastore/v1/dataproc_metastore_client.h +++ b/google/cloud/metastore/v1/dataproc_metastore_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/dataproc_metastore_connection.h b/google/cloud/metastore/v1/dataproc_metastore_connection.h index 11892b59d0351..a106e2d05c989 100644 --- a/google/cloud/metastore/v1/dataproc_metastore_connection.h +++ b/google/cloud/metastore/v1/dataproc_metastore_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/metastore/v1/dataproc_metastore_connection_idempotency_policy.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_retry_traits.h" +#include "google/cloud/metastore/v1/metastore.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/v1/dataproc_metastore_connection_idempotency_policy.h b/google/cloud/metastore/v1/dataproc_metastore_connection_idempotency_policy.h index b4efe3e332a94..13b86763af619 100644 --- a/google/cloud/metastore/v1/dataproc_metastore_connection_idempotency_policy.h +++ b/google/cloud/metastore/v1/dataproc_metastore_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_DATAPROC_METASTORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_DATAPROC_METASTORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/metastore/v1/metastore.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/v1/dataproc_metastore_federation_client.h b/google/cloud/metastore/v1/dataproc_metastore_federation_client.h index deb4faee66c42..b7da299782b6a 100644 --- a/google/cloud/metastore/v1/dataproc_metastore_federation_client.h +++ b/google/cloud/metastore/v1/dataproc_metastore_federation_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/dataproc_metastore_federation_connection.h b/google/cloud/metastore/v1/dataproc_metastore_federation_connection.h index 5e8540dad5e9b..23dfcea318e42 100644 --- a/google/cloud/metastore/v1/dataproc_metastore_federation_connection.h +++ b/google/cloud/metastore/v1/dataproc_metastore_federation_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/metastore/v1/dataproc_metastore_federation_connection_idempotency_policy.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_retry_traits.h" +#include "google/cloud/metastore/v1/metastore_federation.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/v1/dataproc_metastore_federation_connection_idempotency_policy.h b/google/cloud/metastore/v1/dataproc_metastore_federation_connection_idempotency_policy.h index 434d64d90a4d3..0b2952b42f5f4 100644 --- a/google/cloud/metastore/v1/dataproc_metastore_federation_connection_idempotency_policy.h +++ b/google/cloud/metastore/v1/dataproc_metastore_federation_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_DATAPROC_METASTORE_FEDERATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_DATAPROC_METASTORE_FEDERATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/metastore/v1/metastore_federation.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.cc index 772731a108094..58582cd16887f 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/metastore/v1/metastore.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.h" -#include +#include "google/cloud/metastore/v1/metastore.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.h b/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.h index d7135ad88735e..bdbb6c37161b8 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/metastore/v1/internal/dataproc_metastore_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_connection_impl.h b/google/cloud/metastore/v1/internal/dataproc_metastore_connection_impl.h index 1f327a778fa5e..6b2792d0769b0 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_connection_impl.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.cc index 25b3d0d56a65b..4a5db77ef147e 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/metastore/v1/metastore_federation.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.h" -#include +#include "google/cloud/metastore/v1/metastore_federation.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.h index f1503af5067bd..223f4031c5773 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_connection_impl.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_connection_impl.h index ec3fe203131d3..ff97c633f5a12 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_connection_impl.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.cc index c8cc96e8cdfed..9fc6d14eed7f0 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/metastore/v1/metastore_federation.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.h" +#include "google/cloud/metastore/v1/metastore_federation.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.h index 69d5defcd7109..908f2aee4f26a 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.cc index f8820a4c6f03f..290c1962e5164 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/metastore/v1/metastore_federation.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.h" +#include "google/cloud/metastore/v1/metastore_federation.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 #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.h index 92f2612eb0fcf..b3f84518c85f8 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc index b5a806633829b..88b6bc1d0f216 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/metastore/v1/metastore_federation.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h" +#include "google/cloud/metastore/v1/metastore_federation.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h index fdf3ffc47578b..da14c20b9ff94 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_INTERNAL_DATAPROC_METASTORE_FEDERATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_INTERNAL_DATAPROC_METASTORE_FEDERATION_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/metastore/v1/metastore_federation.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc index 96314fb95d78c..e5a9c53c63a47 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/metastore/v1/metastore_federation.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_auth_decorator.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_logging_decorator.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_metadata_decorator.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.h" +#include "google/cloud/metastore/v1/metastore_federation.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc index e75ddd7ff3e40..6f9fab332d696 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataprocMetastoreFederationTracingConnection:: DataprocMetastoreFederationTracingConnection( std::shared_ptr @@ -229,17 +227,13 @@ Status DataprocMetastoreFederationTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataprocMetastoreFederationTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.h index e12254d0ff9c8..83a0bb6d6ac79 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataprocMetastoreFederationTracingConnection : public metastore_v1::DataprocMetastoreFederationConnection { public: @@ -115,8 +113,6 @@ class DataprocMetastoreFederationTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc index 762771da8360c..6d29820455acd 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataprocMetastoreFederationTracingStub::DataprocMetastoreFederationTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -282,17 +280,11 @@ future DataprocMetastoreFederationTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataprocMetastoreFederationTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.h index 986a10423809b..7c62a2dc4ce2f 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataprocMetastoreFederationTracingStub : public DataprocMetastoreFederationStub { public: @@ -140,8 +138,6 @@ class DataprocMetastoreFederationTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.cc index 3dee1bd4433df..927f833f85122 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/metastore/v1/metastore.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.h" +#include "google/cloud/metastore/v1/metastore.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.h b/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.h index e4b3f8b67d3e8..46c1a739ed538 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/metastore/v1/internal/dataproc_metastore_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.cc index ca74827d760b1..7fef943aa99fa 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/metastore/v1/metastore.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.h" +#include "google/cloud/metastore/v1/metastore.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 #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.h b/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.h index f3eb9576a037d..efeeda2b5a0b2 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/metastore/v1/internal/dataproc_metastore_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc index 790c5e870066b..865be821add30 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/metastore/v1/metastore.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_stub.h" +#include "google/cloud/metastore/v1/metastore.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h index 1a64c7e358547..c6c8d327c887c 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_INTERNAL_DATAPROC_METASTORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_METASTORE_V1_INTERNAL_DATAPROC_METASTORE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/metastore/v1/metastore.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc index 0d936b90275a0..3485a72f31895 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/metastore/v1/metastore.proto #include "google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_auth_decorator.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_logging_decorator.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_metadata_decorator.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_stub.h" #include "google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.h" +#include "google/cloud/metastore/v1/metastore.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc index 497259ee3a3a4..3b1d22e2bfd24 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataprocMetastoreTracingConnection::DataprocMetastoreTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -534,17 +532,13 @@ Status DataprocMetastoreTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataprocMetastoreTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.h b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.h index 546e51ca3e786..3a004e58dc2d5 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataprocMetastoreTracingConnection : public metastore_v1::DataprocMetastoreConnection { public: @@ -244,8 +242,6 @@ class DataprocMetastoreTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc index e0421e4023397..81aceaa6db298 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataprocMetastoreTracingStub::DataprocMetastoreTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -559,15 +557,9 @@ future DataprocMetastoreTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataprocMetastoreTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.h b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.h index 3c6b2e2f6c2c2..8eabfdfa6fb5f 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace metastore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataprocMetastoreTracingStub : public DataprocMetastoreStub { public: ~DataprocMetastoreTracingStub() override = default; @@ -266,8 +264,6 @@ class DataprocMetastoreTracingStub : public DataprocMetastoreStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/migrationcenter/BUILD.bazel b/google/cloud/migrationcenter/BUILD.bazel index ad51f70663581..3184649afdb6f 100644 --- a/google/cloud/migrationcenter/BUILD.bazel +++ b/google/cloud/migrationcenter/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/migrationcenter/v1:migrationcenter_cc_grpc", + "@googleapis//google/cloud/migrationcenter/v1:migrationcenter_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/migrationcenter/quickstart/.bazelrc b/google/cloud/migrationcenter/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/migrationcenter/quickstart/.bazelrc +++ b/google/cloud/migrationcenter/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.cc b/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.cc index 137565f94659a..5b56770f64932 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/migrationcenter/v1/migrationcenter.proto #include "google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.h" -#include +#include "google/cloud/migrationcenter/v1/migrationcenter.grpc.pb.h" #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.h b/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.h index da65393253175..7cec00c970a1d 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/migrationcenter/v1/internal/migration_center_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_connection_impl.h b/google/cloud/migrationcenter/v1/internal/migration_center_connection_impl.h index b95a719b5b5a2..158e70e84fc81 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_connection_impl.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.cc b/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.cc index 75ae1b230858d..f8386b43a2a00 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/migrationcenter/v1/migrationcenter.proto #include "google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.h b/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.h index b51a77d24aa57..542eaaddec134 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/migrationcenter/v1/internal/migration_center_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.cc b/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.cc index 370a4ce90d543..59d7e7b60b643 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/migrationcenter/v1/migrationcenter.proto #include "google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.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 #include #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.h b/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.h index 34e1eeb088265..aeaaaf46d42f3 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/migrationcenter/v1/internal/migration_center_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc b/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc index 74a34cd8ae463..a24dd8e23402e 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/migrationcenter/v1/migrationcenter.proto #include "google/cloud/migrationcenter/v1/internal/migration_center_stub.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_stub.h b/google/cloud/migrationcenter/v1/internal/migration_center_stub.h index b6ca527489260..a3f1dbb949047 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_stub.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MIGRATIONCENTER_V1_INTERNAL_MIGRATION_CENTER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MIGRATIONCENTER_V1_INTERNAL_MIGRATION_CENTER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc b/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc index 413a3ab5cff32..e65315b4abd9d 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/migrationcenter/v1/migrationcenter.proto #include "google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/migrationcenter/v1/internal/migration_center_auth_decorator.h" #include "google/cloud/migrationcenter/v1/internal/migration_center_logging_decorator.h" #include "google/cloud/migrationcenter/v1/internal/migration_center_metadata_decorator.h" #include "google/cloud/migrationcenter/v1/internal/migration_center_stub.h" #include "google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc index faae7dfc21e82..9b38d22ac52e7 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace migrationcenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MigrationCenterTracingConnection::MigrationCenterTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1041,16 +1039,12 @@ Status MigrationCenterTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMigrationCenterTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.h b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.h index 38abdf782971d..2fa0468d1cf90 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace migrationcenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MigrationCenterTracingConnection : public migrationcenter_v1::MigrationCenterConnection { public: @@ -455,8 +453,6 @@ class MigrationCenterTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc index 26397676502a6..fe8599f584723 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace migrationcenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MigrationCenterTracingStub::MigrationCenterTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1076,15 +1074,9 @@ future MigrationCenterTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMigrationCenterTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.h b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.h index 21822ba25a5b7..ee5179b0d7636 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace migrationcenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MigrationCenterTracingStub : public MigrationCenterStub { public: ~MigrationCenterTracingStub() override = default; @@ -491,8 +489,6 @@ class MigrationCenterTracingStub : public MigrationCenterStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/migrationcenter/v1/migration_center_client.h b/google/cloud/migrationcenter/v1/migration_center_client.h index 9c1e5d4575321..852b17fe37e46 100644 --- a/google/cloud/migrationcenter/v1/migration_center_client.h +++ b/google/cloud/migrationcenter/v1/migration_center_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/migrationcenter/v1/migration_center_connection.h b/google/cloud/migrationcenter/v1/migration_center_connection.h index c3a72e09354bb..4d2d86707d6bc 100644 --- a/google/cloud/migrationcenter/v1/migration_center_connection.h +++ b/google/cloud/migrationcenter/v1/migration_center_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/migrationcenter/v1/internal/migration_center_retry_traits.h" #include "google/cloud/migrationcenter/v1/migration_center_connection_idempotency_policy.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/migrationcenter/v1/migration_center_connection_idempotency_policy.h b/google/cloud/migrationcenter/v1/migration_center_connection_idempotency_policy.h index af1b8725a3875..ee728ca0a2f22 100644 --- a/google/cloud/migrationcenter/v1/migration_center_connection_idempotency_policy.h +++ b/google/cloud/migrationcenter/v1/migration_center_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MIGRATIONCENTER_V1_MIGRATION_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MIGRATIONCENTER_V1_MIGRATION_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/migrationcenter/v1/migrationcenter.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/BUILD.bazel b/google/cloud/monitoring/BUILD.bazel index e6558817758bd..23a679b994a47 100644 --- a/google/cloud/monitoring/BUILD.bazel +++ b/google/cloud/monitoring/BUILD.bazel @@ -26,9 +26,9 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/monitoring/dashboard/v1:dashboard_cc_grpc", - "@com_google_googleapis//google/monitoring/metricsscope/v1:metricsscope_cc_grpc", - "@com_google_googleapis//google/monitoring/v3:monitoring_cc_grpc", + "@googleapis//google/monitoring/dashboard/v1:dashboard_cc_grpc", + "@googleapis//google/monitoring/metricsscope/v1:metricsscope_cc_grpc", + "@googleapis//google/monitoring/v3:monitoring_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/monitoring/dashboard/v1/dashboards_connection.h b/google/cloud/monitoring/dashboard/v1/dashboards_connection.h index 1ab7a10561569..08e3ab8351d39 100644 --- a/google/cloud/monitoring/dashboard/v1/dashboards_connection.h +++ b/google/cloud/monitoring/dashboard/v1/dashboards_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/dashboard/v1/dashboards_connection_idempotency_policy.h b/google/cloud/monitoring/dashboard/v1/dashboards_connection_idempotency_policy.h index 236076bab218b..68c8342a60c37 100644 --- a/google/cloud/monitoring/dashboard/v1/dashboards_connection_idempotency_policy.h +++ b/google/cloud/monitoring/dashboard/v1/dashboards_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_auth_decorator.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_auth_decorator.cc index 6e8b45107741a..c7a801b4c73ce 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_auth_decorator.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/dashboard/v1/dashboards_service.proto #include "google/cloud/monitoring/dashboard/v1/internal/dashboards_auth_decorator.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_logging_decorator.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_logging_decorator.cc index b681e3d9586a9..249e5811c88d2 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_logging_decorator.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/dashboard/v1/internal/dashboards_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_metadata_decorator.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_metadata_decorator.cc index 796d3b0b0e2fa..52a4e63fca2e8 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_metadata_decorator.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.cc index 38b4a457dedf2..abe6ece5c191a 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.h b/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.h index 5f46cbc42e32f..fd6c9d893fc70 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.h +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub_factory.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub_factory.cc index 86b27275b6470..12758bb68c2c5 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub_factory.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/dashboard/v1/dashboards_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc index 88854b32f8317..d7beb23d767a9 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_dashboard_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DashboardsServiceTracingConnection::DashboardsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -80,18 +78,14 @@ DashboardsServiceTracingConnection::UpdateDashboard( return internal::EndSpan(*span, child_->UpdateDashboard(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDashboardsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.h b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.h index 37b4642a5c5ca..ddd9a7a7532c9 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.h +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_dashboard_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DashboardsServiceTracingConnection : public monitoring_dashboard_v1::DashboardsServiceConnection { public: @@ -65,8 +63,6 @@ class DashboardsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.cc index f4eb644e592ea..cb0aa3804d8f3 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_dashboard_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DashboardsServiceTracingStub::DashboardsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -91,15 +89,9 @@ DashboardsServiceTracingStub::UpdateDashboard( child_->UpdateDashboard(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDashboardsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.h b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.h index b1c1691a71a68..72387400b40e0 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.h +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_dashboard_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DashboardsServiceTracingStub : public DashboardsServiceStub { public: ~DashboardsServiceTracingStub() override = default; @@ -70,8 +68,6 @@ class DashboardsServiceTracingStub : public DashboardsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.cc index 58efda0fc5df8..0c463bbec7a8b 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/metricsscope/v1/metrics_scopes.proto #include "google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.h" -#include +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.h index c56398d7eff01..52b51cd3c0af5 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_connection_impl.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_connection_impl.h index 5dd3278b9bd15..8a4cbc0faeab2 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_connection_impl.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.cc index 46d52d2d0700e..bd051d1d296a1 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.h index 50804394f6e19..8b27fdc52932e 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.cc index adbae1e40720a..7a227acfdd98e 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.h index 1d0508a18ecdc..5c8e27449cc4b 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc index d9a6ec489bd0b..4bda6dd828ba8 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h index a13f45f01d62f..59f999195ef55 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub_factory.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub_factory.cc index abe17046f95a3..ceb0e0736b51d 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub_factory.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc index c9db4d3cbbb9b..120cf578ba0b4 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_metricsscope_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetricsScopesTracingConnection::MetricsScopesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -127,16 +125,12 @@ MetricsScopesTracingConnection::DeleteMonitoredProject( child_->DeleteMonitoredProject(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetricsScopesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.h index aa67eec6ae105..3f8def50f4cba 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_metricsscope_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetricsScopesTracingConnection : public monitoring_metricsscope_v1::MetricsScopesConnection { public: @@ -83,8 +81,6 @@ class MetricsScopesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc index 16cd4237cdd8a..890734b15bd73 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_metricsscope_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetricsScopesTracingStub::MetricsScopesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -153,15 +151,9 @@ future MetricsScopesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetricsScopesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.h index af5f0eab4fe6d..3f5a0fcf15293 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_metricsscope_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetricsScopesTracingStub : public MetricsScopesStub { public: ~MetricsScopesTracingStub() override = default; @@ -92,8 +90,6 @@ class MetricsScopesTracingStub : public MetricsScopesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/metricsscope/v1/metrics_scopes_client.h b/google/cloud/monitoring/metricsscope/v1/metrics_scopes_client.h index b52ddad0890b1..c2c688e2ca933 100644 --- a/google/cloud/monitoring/metricsscope/v1/metrics_scopes_client.h +++ b/google/cloud/monitoring/metricsscope/v1/metrics_scopes_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection.h b/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection.h index a15d5a5921570..ea1a97db4c9ac 100644 --- a/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection.h +++ b/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection.h @@ -29,8 +29,8 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/monitoring/metricsscope/v1/metrics_scopes.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection_idempotency_policy.h b/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection_idempotency_policy.h index af83e3ed2b977..8e91748771b50 100644 --- a/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection_idempotency_policy.h +++ b/google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/metricsscope/v1/metrics_scopes.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/quickstart/.bazelrc b/google/cloud/monitoring/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/monitoring/quickstart/.bazelrc +++ b/google/cloud/monitoring/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/monitoring/v3/alert_policy_connection.h b/google/cloud/monitoring/v3/alert_policy_connection.h index ba46c0c9557fc..7d2bed051c265 100644 --- a/google/cloud/monitoring/v3/alert_policy_connection.h +++ b/google/cloud/monitoring/v3/alert_policy_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/alert_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/alert_policy_connection_idempotency_policy.h b/google/cloud/monitoring/v3/alert_policy_connection_idempotency_policy.h index 3ff3391db3277..e7af4627ffb03 100644 --- a/google/cloud/monitoring/v3/alert_policy_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/alert_policy_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/group_connection.h b/google/cloud/monitoring/v3/group_connection.h index 970c92b73daea..e52371f6656d5 100644 --- a/google/cloud/monitoring/v3/group_connection.h +++ b/google/cloud/monitoring/v3/group_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/group_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/group_connection_idempotency_policy.h b/google/cloud/monitoring/v3/group_connection_idempotency_policy.h index ab318d3db53c4..c79ef43f5a0df 100644 --- a/google/cloud/monitoring/v3/group_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/group_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/internal/alert_policy_auth_decorator.cc b/google/cloud/monitoring/v3/internal/alert_policy_auth_decorator.cc index 744f9277029d1..419a963629bed 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/alert_service.proto #include "google/cloud/monitoring/v3/internal/alert_policy_auth_decorator.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/alert_policy_logging_decorator.cc b/google/cloud/monitoring/v3/internal/alert_policy_logging_decorator.cc index 5dca3b1b83cf2..8a00875e09a60 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/alert_policy_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/alert_policy_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/alert_policy_metadata_decorator.cc index 103e46adf0270..129c45183efa2 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/alert_policy_stub.cc b/google/cloud/monitoring/v3/internal/alert_policy_stub.cc index d1e4549ac5403..4726a594f6601 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_stub.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/alert_policy_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/alert_policy_stub.h b/google/cloud/monitoring/v3/internal/alert_policy_stub.h index 0c2d44a88bbc9..8ef02b2c9a987 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_stub.h +++ b/google/cloud/monitoring/v3/internal/alert_policy_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/alert_policy_stub_factory.cc b/google/cloud/monitoring/v3/internal/alert_policy_stub_factory.cc index 23c81623130bd..20157491fd1bd 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/alert_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc b/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc index 3a4741a2e7cbe..794c3568f2786 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AlertPolicyServiceTracingConnection::AlertPolicyServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -79,17 +77,13 @@ AlertPolicyServiceTracingConnection::UpdateAlertPolicy( return internal::EndSpan(*span, child_->UpdateAlertPolicy(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAlertPolicyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.h b/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.h index 59ea0de728f8c..b9746c3fa5ca9 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AlertPolicyServiceTracingConnection : public monitoring_v3::AlertPolicyServiceConnection { public: @@ -59,8 +57,6 @@ class AlertPolicyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.cc b/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.cc index afcf3658f45d4..fda3aa97643cc 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AlertPolicyServiceTracingStub::AlertPolicyServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -91,15 +89,9 @@ AlertPolicyServiceTracingStub::UpdateAlertPolicy( context, *span, child_->UpdateAlertPolicy(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAlertPolicyServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.h b/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.h index a9fa878e405c4..576a03a99b661 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/alert_policy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AlertPolicyServiceTracingStub : public AlertPolicyServiceStub { public: ~AlertPolicyServiceTracingStub() override = default; @@ -65,8 +63,6 @@ class AlertPolicyServiceTracingStub : public AlertPolicyServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/group_auth_decorator.cc b/google/cloud/monitoring/v3/internal/group_auth_decorator.cc index b864ecb94d7b3..5d5cf04f1c986 100644 --- a/google/cloud/monitoring/v3/internal/group_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/group_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/group_service.proto #include "google/cloud/monitoring/v3/internal/group_auth_decorator.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/group_logging_decorator.cc b/google/cloud/monitoring/v3/internal/group_logging_decorator.cc index 5538379be5d7d..23511b5f20851 100644 --- a/google/cloud/monitoring/v3/internal/group_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/group_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/group_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/group_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/group_metadata_decorator.cc index 6b006748fc4a2..416854af26e06 100644 --- a/google/cloud/monitoring/v3/internal/group_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/group_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/group_stub.cc b/google/cloud/monitoring/v3/internal/group_stub.cc index 795ea16b9795e..4fc4ab6186753 100644 --- a/google/cloud/monitoring/v3/internal/group_stub.cc +++ b/google/cloud/monitoring/v3/internal/group_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/group_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/group_stub.h b/google/cloud/monitoring/v3/internal/group_stub.h index 2967b6c047c5e..944fabff84bc4 100644 --- a/google/cloud/monitoring/v3/internal/group_stub.h +++ b/google/cloud/monitoring/v3/internal/group_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/group_stub_factory.cc b/google/cloud/monitoring/v3/internal/group_stub_factory.cc index 221e9b59f7a36..4ec7bd0a85a9e 100644 --- a/google/cloud/monitoring/v3/internal/group_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/group_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/group_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/group_tracing_connection.cc b/google/cloud/monitoring/v3/internal/group_tracing_connection.cc index d88eb0f01a426..bd90ee9a321b4 100644 --- a/google/cloud/monitoring/v3/internal/group_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/group_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GroupServiceTracingConnection::GroupServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -89,16 +87,12 @@ GroupServiceTracingConnection::ListGroupMembers( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGroupServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/group_tracing_connection.h b/google/cloud/monitoring/v3/internal/group_tracing_connection.h index d3baeb706c985..685c783c79c25 100644 --- a/google/cloud/monitoring/v3/internal/group_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/group_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GroupServiceTracingConnection : public monitoring_v3::GroupServiceConnection { public: @@ -62,8 +60,6 @@ class GroupServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/group_tracing_stub.cc b/google/cloud/monitoring/v3/internal/group_tracing_stub.cc index d97f2aafa00f4..4c1984ca397bd 100644 --- a/google/cloud/monitoring/v3/internal/group_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/group_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GroupServiceTracingStub::GroupServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -100,15 +98,9 @@ GroupServiceTracingStub::ListGroupMembers( child_->ListGroupMembers(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeGroupServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/group_tracing_stub.h b/google/cloud/monitoring/v3/internal/group_tracing_stub.h index bacacbb3c7176..13323b946ed56 100644 --- a/google/cloud/monitoring/v3/internal/group_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/group_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class GroupServiceTracingStub : public GroupServiceStub { public: ~GroupServiceTracingStub() override = default; @@ -68,8 +66,6 @@ class GroupServiceTracingStub : public GroupServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/metric_auth_decorator.cc b/google/cloud/monitoring/v3/internal/metric_auth_decorator.cc index d922c6d4bf279..386bc631f8806 100644 --- a/google/cloud/monitoring/v3/internal/metric_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/metric_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/metric_service.proto #include "google/cloud/monitoring/v3/internal/metric_auth_decorator.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/metric_logging_decorator.cc b/google/cloud/monitoring/v3/internal/metric_logging_decorator.cc index 4a46659aacace..efefc5687d242 100644 --- a/google/cloud/monitoring/v3/internal/metric_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/metric_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/metric_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/metric_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/metric_metadata_decorator.cc index b6de4a382c956..5620e2bcc41af 100644 --- a/google/cloud/monitoring/v3/internal/metric_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/metric_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/metric_stub.cc b/google/cloud/monitoring/v3/internal/metric_stub.cc index a8f39bda788dd..3ed8104dfd45e 100644 --- a/google/cloud/monitoring/v3/internal/metric_stub.cc +++ b/google/cloud/monitoring/v3/internal/metric_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/metric_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/metric_stub.h b/google/cloud/monitoring/v3/internal/metric_stub.h index 5ac060bd3abd9..4562e97fc74db 100644 --- a/google/cloud/monitoring/v3/internal/metric_stub.h +++ b/google/cloud/monitoring/v3/internal/metric_stub.h @@ -24,7 +24,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/metric_stub_factory.cc b/google/cloud/monitoring/v3/internal/metric_stub_factory.cc index 487d308ac4d7f..3a2458ee4d166 100644 --- a/google/cloud/monitoring/v3/internal/metric_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/metric_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc b/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc index 569f793d45661..2448a9601b7c8 100644 --- a/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetricServiceTracingConnection::MetricServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -129,16 +127,12 @@ future MetricServiceTracingConnection::AsyncCreateTimeSeries( child_->AsyncCreateTimeSeries(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetricServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/metric_tracing_connection.h b/google/cloud/monitoring/v3/internal/metric_tracing_connection.h index 39e75cee00d14..b75cd3f07c033 100644 --- a/google/cloud/monitoring/v3/internal/metric_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/metric_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetricServiceTracingConnection : public monitoring_v3::MetricServiceConnection { public: @@ -81,8 +79,6 @@ class MetricServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc b/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc index 8af526e1c8ae5..7528e0215e590 100644 --- a/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - MetricServiceTracingStub::MetricServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -158,15 +156,9 @@ future MetricServiceTracingStub::AsyncCreateTimeSeries( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeMetricServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/metric_tracing_stub.h b/google/cloud/monitoring/v3/internal/metric_tracing_stub.h index 991bdcdc2add4..bcab70e4a7a04 100644 --- a/google/cloud/monitoring/v3/internal/metric_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/metric_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class MetricServiceTracingStub : public MetricServiceStub { public: ~MetricServiceTracingStub() override = default; @@ -95,8 +93,6 @@ class MetricServiceTracingStub : public MetricServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/notification_channel_auth_decorator.cc b/google/cloud/monitoring/v3/internal/notification_channel_auth_decorator.cc index 240ae37737a47..9107475bd9b22 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/notification_service.proto #include "google/cloud/monitoring/v3/internal/notification_channel_auth_decorator.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/notification_channel_logging_decorator.cc b/google/cloud/monitoring/v3/internal/notification_channel_logging_decorator.cc index f14cc0a10c3cc..91890ec5e83c8 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/notification_channel_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/notification_channel_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/notification_channel_metadata_decorator.cc index fc4dc0d49225c..1743db79dabee 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/notification_channel_stub.cc b/google/cloud/monitoring/v3/internal/notification_channel_stub.cc index 4ce21e7acb74e..924d048e38fde 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_stub.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/notification_channel_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/notification_channel_stub.h b/google/cloud/monitoring/v3/internal/notification_channel_stub.h index c836e0201878e..fac311c36652e 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_stub.h +++ b/google/cloud/monitoring/v3/internal/notification_channel_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/notification_channel_stub_factory.cc b/google/cloud/monitoring/v3/internal/notification_channel_stub_factory.cc index 5195812c8e503..fe736bd5aa9d8 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc b/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc index 2e4fe58f9e73e..6dbeb93c29624 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotificationChannelServiceTracingConnection:: NotificationChannelServiceTracingConnection( std::shared_ptr @@ -147,17 +145,13 @@ NotificationChannelServiceTracingConnection::VerifyNotificationChannel( return internal::EndSpan(*span, child_->VerifyNotificationChannel(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotificationChannelServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.h b/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.h index fc3ef89fa1762..dae69bb37d052 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotificationChannelServiceTracingConnection : public monitoring_v3::NotificationChannelServiceConnection { public: @@ -94,8 +92,6 @@ class NotificationChannelServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.cc b/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.cc index da5ff9b9dbd91..16bb5181c219d 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotificationChannelServiceTracingStub::NotificationChannelServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -175,17 +173,11 @@ NotificationChannelServiceTracingStub::VerifyNotificationChannel( child_->VerifyNotificationChannel(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotificationChannelServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.h b/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.h index d5239c38bd0ef..bfd5bf5cb1f90 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/notification_channel_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotificationChannelServiceTracingStub : public NotificationChannelServiceStub { public: @@ -106,8 +104,6 @@ class NotificationChannelServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/query_auth_decorator.cc b/google/cloud/monitoring/v3/internal/query_auth_decorator.cc index 3fae0d6977e10..dacd52afba2fb 100644 --- a/google/cloud/monitoring/v3/internal/query_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/query_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/query_service.proto #include "google/cloud/monitoring/v3/internal/query_auth_decorator.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/query_logging_decorator.cc b/google/cloud/monitoring/v3/internal/query_logging_decorator.cc index c0c5559b88449..891e6455c15e2 100644 --- a/google/cloud/monitoring/v3/internal/query_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/query_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/query_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/query_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/query_metadata_decorator.cc index a138ab5cca3bf..34c6c50cff1a4 100644 --- a/google/cloud/monitoring/v3/internal/query_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/query_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/query_stub.cc b/google/cloud/monitoring/v3/internal/query_stub.cc index 5b79953b71a52..041819cc433bf 100644 --- a/google/cloud/monitoring/v3/internal/query_stub.cc +++ b/google/cloud/monitoring/v3/internal/query_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/query_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/query_stub.h b/google/cloud/monitoring/v3/internal/query_stub.h index 916cd270e34e4..10c30425a335d 100644 --- a/google/cloud/monitoring/v3/internal/query_stub.h +++ b/google/cloud/monitoring/v3/internal/query_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/query_stub_factory.cc b/google/cloud/monitoring/v3/internal/query_stub_factory.cc index b0cdfa5504a31..1061bf78d459b 100644 --- a/google/cloud/monitoring/v3/internal/query_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/query_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/query_tracing_connection.cc b/google/cloud/monitoring/v3/internal/query_tracing_connection.cc index be4fc8e890d8a..44f2491d01649 100644 --- a/google/cloud/monitoring/v3/internal/query_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/query_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - QueryServiceTracingConnection::QueryServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -44,16 +42,12 @@ QueryServiceTracingConnection::QueryTimeSeries( google::monitoring::v3::TimeSeriesData>(std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeQueryServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/query_tracing_connection.h b/google/cloud/monitoring/v3/internal/query_tracing_connection.h index c3a4899de8b23..5cb28c1745dd2 100644 --- a/google/cloud/monitoring/v3/internal/query_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/query_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class QueryServiceTracingConnection : public monitoring_v3::QueryServiceConnection { public: @@ -47,8 +45,6 @@ class QueryServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/query_tracing_stub.cc b/google/cloud/monitoring/v3/internal/query_tracing_stub.cc index bf636a9037d77..beae09f5843fa 100644 --- a/google/cloud/monitoring/v3/internal/query_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/query_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - QueryServiceTracingStub::QueryServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ QueryServiceTracingStub::QueryTimeSeries( child_->QueryTimeSeries(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeQueryServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/query_tracing_stub.h b/google/cloud/monitoring/v3/internal/query_tracing_stub.h index c977cc28e3a97..50934d6f39e7e 100644 --- a/google/cloud/monitoring/v3/internal/query_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/query_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class QueryServiceTracingStub : public QueryServiceStub { public: ~QueryServiceTracingStub() override = default; @@ -48,8 +46,6 @@ class QueryServiceTracingStub : public QueryServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_auth_decorator.cc b/google/cloud/monitoring/v3/internal/service_monitoring_auth_decorator.cc index e36b004f1d502..368f94312335e 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/service_service.proto #include "google/cloud/monitoring/v3/internal/service_monitoring_auth_decorator.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_logging_decorator.cc b/google/cloud/monitoring/v3/internal/service_monitoring_logging_decorator.cc index adbb84e9fa711..cd5ffedd71702 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/service_monitoring_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/service_monitoring_metadata_decorator.cc index 8407c7d126921..49855fa93c556 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_stub.cc b/google/cloud/monitoring/v3/internal/service_monitoring_stub.cc index b9b0c2bbcce89..ce23dcb547f25 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_stub.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/service_monitoring_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_stub.h b/google/cloud/monitoring/v3/internal/service_monitoring_stub.h index bdbc31c43c9bb..74367b0837d3b 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_stub.h +++ b/google/cloud/monitoring/v3/internal/service_monitoring_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_stub_factory.cc b/google/cloud/monitoring/v3/internal/service_monitoring_stub_factory.cc index 42e8903cd7dd6..534546c6b2d13 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc index 1fdfc82e9fcdd..8d535d4857cb1 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceMonitoringServiceTracingConnection:: ServiceMonitoringServiceTracingConnection( std::shared_ptr @@ -133,17 +131,13 @@ Status ServiceMonitoringServiceTracingConnection::DeleteServiceLevelObjective( return internal::EndSpan(*span, child_->DeleteServiceLevelObjective(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceMonitoringServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.h b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.h index 2c63e67d40208..be6eb380d6467 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceMonitoringServiceTracingConnection : public monitoring_v3::ServiceMonitoringServiceConnection { public: @@ -83,8 +81,6 @@ class ServiceMonitoringServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.cc b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.cc index 9d83816be0f7f..c0c35bf909fd3 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceMonitoringServiceTracingStub::ServiceMonitoringServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -160,16 +158,10 @@ Status ServiceMonitoringServiceTracingStub::DeleteServiceLevelObjective( child_->DeleteServiceLevelObjective(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceMonitoringServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.h b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.h index a62708a7008db..b58af82aae2f3 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceMonitoringServiceTracingStub : public ServiceMonitoringServiceStub { public: @@ -95,8 +93,6 @@ class ServiceMonitoringServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/snooze_auth_decorator.cc b/google/cloud/monitoring/v3/internal/snooze_auth_decorator.cc index be84ea6351224..a704bf4d23e6e 100644 --- a/google/cloud/monitoring/v3/internal/snooze_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/snooze_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/snooze_service.proto #include "google/cloud/monitoring/v3/internal/snooze_auth_decorator.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/snooze_logging_decorator.cc b/google/cloud/monitoring/v3/internal/snooze_logging_decorator.cc index e30fa434cce58..e030e178e6348 100644 --- a/google/cloud/monitoring/v3/internal/snooze_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/snooze_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/snooze_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/snooze_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/snooze_metadata_decorator.cc index 6d26652d33ad2..ed1c99990057c 100644 --- a/google/cloud/monitoring/v3/internal/snooze_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/snooze_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/snooze_stub.cc b/google/cloud/monitoring/v3/internal/snooze_stub.cc index 847f622acefbb..05b73d54e4c6c 100644 --- a/google/cloud/monitoring/v3/internal/snooze_stub.cc +++ b/google/cloud/monitoring/v3/internal/snooze_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/snooze_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/snooze_stub.h b/google/cloud/monitoring/v3/internal/snooze_stub.h index b2ff6727c9b31..584b2ba3c8318 100644 --- a/google/cloud/monitoring/v3/internal/snooze_stub.h +++ b/google/cloud/monitoring/v3/internal/snooze_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/snooze_stub_factory.cc b/google/cloud/monitoring/v3/internal/snooze_stub_factory.cc index a9c76d5a24adc..e6ec8f4bcc7f0 100644 --- a/google/cloud/monitoring/v3/internal/snooze_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/snooze_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc b/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc index d34f9f1e25606..0ce1af7ca0235 100644 --- a/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SnoozeServiceTracingConnection::SnoozeServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -71,16 +69,12 @@ SnoozeServiceTracingConnection::UpdateSnooze( return internal::EndSpan(*span, child_->UpdateSnooze(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSnoozeServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/snooze_tracing_connection.h b/google/cloud/monitoring/v3/internal/snooze_tracing_connection.h index f63a4a3e50f57..2cdbef406d59a 100644 --- a/google/cloud/monitoring/v3/internal/snooze_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/snooze_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SnoozeServiceTracingConnection : public monitoring_v3::SnoozeServiceConnection { public: @@ -56,8 +54,6 @@ class SnoozeServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/snooze_tracing_stub.cc b/google/cloud/monitoring/v3/internal/snooze_tracing_stub.cc index 0b8b6b32a9018..d4c1e28d2226f 100644 --- a/google/cloud/monitoring/v3/internal/snooze_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/snooze_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SnoozeServiceTracingStub::SnoozeServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -77,15 +75,9 @@ StatusOr SnoozeServiceTracingStub::UpdateSnooze( child_->UpdateSnooze(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSnoozeServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/snooze_tracing_stub.h b/google/cloud/monitoring/v3/internal/snooze_tracing_stub.h index 275e8dd37b947..561f50f15b6d4 100644 --- a/google/cloud/monitoring/v3/internal/snooze_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/snooze_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SnoozeServiceTracingStub : public SnoozeServiceStub { public: ~SnoozeServiceTracingStub() override = default; @@ -60,8 +58,6 @@ class SnoozeServiceTracingStub : public SnoozeServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/internal/uptime_check_auth_decorator.cc b/google/cloud/monitoring/v3/internal/uptime_check_auth_decorator.cc index 5dd45d7963274..4bcdab5b7f489 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_auth_decorator.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/monitoring/v3/uptime_service.proto #include "google/cloud/monitoring/v3/internal/uptime_check_auth_decorator.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/uptime_check_logging_decorator.cc b/google/cloud/monitoring/v3/internal/uptime_check_logging_decorator.cc index 0babcdb818fba..6d5616f7833ca 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_logging_decorator.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/uptime_check_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/uptime_check_metadata_decorator.cc b/google/cloud/monitoring/v3/internal/uptime_check_metadata_decorator.cc index aa0aaad8b901b..c3c6498de7b96 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_metadata_decorator.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include #include #include diff --git a/google/cloud/monitoring/v3/internal/uptime_check_stub.cc b/google/cloud/monitoring/v3/internal/uptime_check_stub.cc index 9ebdbcf599298..8df1400101b9a 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_stub.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/monitoring/v3/internal/uptime_check_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/uptime_check_stub.h b/google/cloud/monitoring/v3/internal/uptime_check_stub.h index 75c43250fdbcb..028e69494e186 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_stub.h +++ b/google/cloud/monitoring/v3/internal/uptime_check_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/uptime_check_stub_factory.cc b/google/cloud/monitoring/v3/internal/uptime_check_stub_factory.cc index 87366269ebfcd..07ad1bf4a19c4 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_stub_factory.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include #include diff --git a/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc b/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc index 9135e3336ce88..e061a378cf3e6 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UptimeCheckServiceTracingConnection::UptimeCheckServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -91,17 +89,13 @@ UptimeCheckServiceTracingConnection::ListUptimeCheckIps( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUptimeCheckServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.h b/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.h index f462e47dbf0c5..47165f2211243 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.h +++ b/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UptimeCheckServiceTracingConnection : public monitoring_v3::UptimeCheckServiceConnection { public: @@ -66,8 +64,6 @@ class UptimeCheckServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.cc b/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.cc index bd0fc8358cb9f..27bc70506355d 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UptimeCheckServiceTracingStub::UptimeCheckServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -107,15 +105,9 @@ UptimeCheckServiceTracingStub::ListUptimeCheckIps( context, *span, child_->ListUptimeCheckIps(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUptimeCheckServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.h b/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.h index e5fbec21be3d6..9b3c35ef22fb4 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.h +++ b/google/cloud/monitoring/v3/internal/uptime_check_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace monitoring_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UptimeCheckServiceTracingStub : public UptimeCheckServiceStub { public: ~UptimeCheckServiceTracingStub() override = default; @@ -76,8 +74,6 @@ class UptimeCheckServiceTracingStub : public UptimeCheckServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/monitoring/v3/metric_connection.h b/google/cloud/monitoring/v3/metric_connection.h index 8842e0a37abf7..2bec797bf2745 100644 --- a/google/cloud/monitoring/v3/metric_connection.h +++ b/google/cloud/monitoring/v3/metric_connection.h @@ -28,7 +28,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/metric_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/metric_connection_idempotency_policy.h b/google/cloud/monitoring/v3/metric_connection_idempotency_policy.h index e1d6d5d6dfb84..80176db57ab87 100644 --- a/google/cloud/monitoring/v3/metric_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/metric_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/metric_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/notification_channel_connection.h b/google/cloud/monitoring/v3/notification_channel_connection.h index 121d40016f60c..b9bda3f8e3a0d 100644 --- a/google/cloud/monitoring/v3/notification_channel_connection.h +++ b/google/cloud/monitoring/v3/notification_channel_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/notification_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/notification_channel_connection_idempotency_policy.h b/google/cloud/monitoring/v3/notification_channel_connection_idempotency_policy.h index b3d0c2fa6b92e..4dd1c90db1115 100644 --- a/google/cloud/monitoring/v3/notification_channel_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/notification_channel_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/notification_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/query_connection.h b/google/cloud/monitoring/v3/query_connection.h index 104d50b77b132..8eed2998d8023 100644 --- a/google/cloud/monitoring/v3/query_connection.h +++ b/google/cloud/monitoring/v3/query_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/query_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/query_connection_idempotency_policy.h b/google/cloud/monitoring/v3/query_connection_idempotency_policy.h index 0d480646cd5a5..03384dd2ef14c 100644 --- a/google/cloud/monitoring/v3/query_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/query_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/query_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/service_monitoring_connection.h b/google/cloud/monitoring/v3/service_monitoring_connection.h index e35d14c50e859..a77ae5b34aa22 100644 --- a/google/cloud/monitoring/v3/service_monitoring_connection.h +++ b/google/cloud/monitoring/v3/service_monitoring_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/service_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/service_monitoring_connection_idempotency_policy.h b/google/cloud/monitoring/v3/service_monitoring_connection_idempotency_policy.h index cfbf41a37e2ed..9c8a3b4b74853 100644 --- a/google/cloud/monitoring/v3/service_monitoring_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/service_monitoring_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/service_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/snooze_connection.h b/google/cloud/monitoring/v3/snooze_connection.h index 3d785cd7afc4d..75c1b39eccfbe 100644 --- a/google/cloud/monitoring/v3/snooze_connection.h +++ b/google/cloud/monitoring/v3/snooze_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/snooze_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/snooze_connection_idempotency_policy.h b/google/cloud/monitoring/v3/snooze_connection_idempotency_policy.h index 0acdf7829c643..114e19f5dc41d 100644 --- a/google/cloud/monitoring/v3/snooze_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/snooze_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/snooze_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/uptime_check_connection.h b/google/cloud/monitoring/v3/uptime_check_connection.h index e423daa52ab6c..1f9e5adca3617 100644 --- a/google/cloud/monitoring/v3/uptime_check_connection.h +++ b/google/cloud/monitoring/v3/uptime_check_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/uptime_service.pb.h" #include namespace google { diff --git a/google/cloud/monitoring/v3/uptime_check_connection_idempotency_policy.h b/google/cloud/monitoring/v3/uptime_check_connection_idempotency_policy.h index 6ab43a7d000d0..d3ab7df224981 100644 --- a/google/cloud/monitoring/v3/uptime_check_connection_idempotency_policy.h +++ b/google/cloud/monitoring/v3/uptime_check_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/monitoring/v3/uptime_service.grpc.pb.h" #include namespace google { diff --git a/google/cloud/netapp/BUILD.bazel b/google/cloud/netapp/BUILD.bazel index a56322706ac90..43f51cf274ec1 100644 --- a/google/cloud/netapp/BUILD.bazel +++ b/google/cloud/netapp/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/netapp/v1:netapp_cc_grpc", + "@googleapis//google/cloud/netapp/v1:netapp_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/netapp/quickstart/.bazelrc b/google/cloud/netapp/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/netapp/quickstart/.bazelrc +++ b/google/cloud/netapp/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/netapp/v1/internal/net_app_auth_decorator.cc b/google/cloud/netapp/v1/internal/net_app_auth_decorator.cc index e9daffa749021..c5915c1e67920 100644 --- a/google/cloud/netapp/v1/internal/net_app_auth_decorator.cc +++ b/google/cloud/netapp/v1/internal/net_app_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/netapp/v1/cloud_netapp_service.proto #include "google/cloud/netapp/v1/internal/net_app_auth_decorator.h" -#include +#include "google/cloud/netapp/v1/cloud_netapp_service.grpc.pb.h" #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_auth_decorator.h b/google/cloud/netapp/v1/internal/net_app_auth_decorator.h index d4b55473c81ce..00646049139cc 100644 --- a/google/cloud/netapp/v1/internal/net_app_auth_decorator.h +++ b/google/cloud/netapp/v1/internal/net_app_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/netapp/v1/internal/net_app_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_connection_impl.h b/google/cloud/netapp/v1/internal/net_app_connection_impl.h index 7e2853b026305..08eb262b2e9e2 100644 --- a/google/cloud/netapp/v1/internal/net_app_connection_impl.h +++ b/google/cloud/netapp/v1/internal/net_app_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/netapp/v1/internal/net_app_logging_decorator.cc b/google/cloud/netapp/v1/internal/net_app_logging_decorator.cc index 1ef5cb1538e44..ffdaaf478fc7a 100644 --- a/google/cloud/netapp/v1/internal/net_app_logging_decorator.cc +++ b/google/cloud/netapp/v1/internal/net_app_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/netapp/v1/cloud_netapp_service.proto #include "google/cloud/netapp/v1/internal/net_app_logging_decorator.h" +#include "google/cloud/netapp/v1/cloud_netapp_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_logging_decorator.h b/google/cloud/netapp/v1/internal/net_app_logging_decorator.h index fd82cfd1cdfbe..90505bb45daf1 100644 --- a/google/cloud/netapp/v1/internal/net_app_logging_decorator.h +++ b/google/cloud/netapp/v1/internal/net_app_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/netapp/v1/internal/net_app_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_metadata_decorator.cc b/google/cloud/netapp/v1/internal/net_app_metadata_decorator.cc index 28174acc202e0..74c336a408620 100644 --- a/google/cloud/netapp/v1/internal/net_app_metadata_decorator.cc +++ b/google/cloud/netapp/v1/internal/net_app_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/netapp/v1/cloud_netapp_service.proto #include "google/cloud/netapp/v1/internal/net_app_metadata_decorator.h" +#include "google/cloud/netapp/v1/cloud_netapp_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 #include #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_metadata_decorator.h b/google/cloud/netapp/v1/internal/net_app_metadata_decorator.h index 6b24cb7701dc0..28eaeadd7777b 100644 --- a/google/cloud/netapp/v1/internal/net_app_metadata_decorator.h +++ b/google/cloud/netapp/v1/internal/net_app_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/netapp/v1/internal/net_app_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_stub.cc b/google/cloud/netapp/v1/internal/net_app_stub.cc index c4f291df26e4f..f36c0ce15f82b 100644 --- a/google/cloud/netapp/v1/internal/net_app_stub.cc +++ b/google/cloud/netapp/v1/internal/net_app_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/netapp/v1/cloud_netapp_service.proto #include "google/cloud/netapp/v1/internal/net_app_stub.h" +#include "google/cloud/netapp/v1/cloud_netapp_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_stub.h b/google/cloud/netapp/v1/internal/net_app_stub.h index 1e1e5e0ac9e9f..d12ea8c977084 100644 --- a/google/cloud/netapp/v1/internal/net_app_stub.h +++ b/google/cloud/netapp/v1/internal/net_app_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETAPP_V1_INTERNAL_NET_APP_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETAPP_V1_INTERNAL_NET_APP_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/netapp/v1/cloud_netapp_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_stub_factory.cc b/google/cloud/netapp/v1/internal/net_app_stub_factory.cc index 5286c3fb763b6..57ee680384674 100644 --- a/google/cloud/netapp/v1/internal/net_app_stub_factory.cc +++ b/google/cloud/netapp/v1/internal/net_app_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/netapp/v1/cloud_netapp_service.proto #include "google/cloud/netapp/v1/internal/net_app_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/netapp/v1/cloud_netapp_service.grpc.pb.h" #include "google/cloud/netapp/v1/internal/net_app_auth_decorator.h" #include "google/cloud/netapp/v1/internal/net_app_logging_decorator.h" #include "google/cloud/netapp/v1/internal/net_app_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc b/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc index 2f1c35ba44500..dd505e52edbf6 100644 --- a/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc +++ b/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace netapp_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetAppTracingConnection::NetAppTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1387,15 +1385,11 @@ Status NetAppTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetAppTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/netapp/v1/internal/net_app_tracing_connection.h b/google/cloud/netapp/v1/internal/net_app_tracing_connection.h index ef95c45a2a957..d41856ceb67ea 100644 --- a/google/cloud/netapp/v1/internal/net_app_tracing_connection.h +++ b/google/cloud/netapp/v1/internal/net_app_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace netapp_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetAppTracingConnection : public netapp_v1::NetAppConnection { public: ~NetAppTracingConnection() override = default; @@ -585,8 +583,6 @@ class NetAppTracingConnection : public netapp_v1::NetAppConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc b/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc index a64c760fcddd0..6e1cccc9bfdd5 100644 --- a/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc +++ b/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace netapp_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetAppTracingStub::NetAppTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1392,15 +1390,9 @@ future NetAppTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetAppTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/netapp/v1/internal/net_app_tracing_stub.h b/google/cloud/netapp/v1/internal/net_app_tracing_stub.h index 7216207735243..391138afac1dd 100644 --- a/google/cloud/netapp/v1/internal/net_app_tracing_stub.h +++ b/google/cloud/netapp/v1/internal/net_app_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace netapp_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetAppTracingStub : public NetAppStub { public: ~NetAppTracingStub() override = default; @@ -621,8 +619,6 @@ class NetAppTracingStub : public NetAppStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/netapp/v1/net_app_client.h b/google/cloud/netapp/v1/net_app_client.h index b71686484bd86..994a2844750f5 100644 --- a/google/cloud/netapp/v1/net_app_client.h +++ b/google/cloud/netapp/v1/net_app_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/netapp/v1/net_app_connection.h b/google/cloud/netapp/v1/net_app_connection.h index 0e1ac5d9d903d..be8050d544abc 100644 --- a/google/cloud/netapp/v1/net_app_connection.h +++ b/google/cloud/netapp/v1/net_app_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETAPP_V1_NET_APP_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETAPP_V1_NET_APP_CONNECTION_H +#include "google/cloud/netapp/v1/cloud_netapp_service.pb.h" #include "google/cloud/netapp/v1/internal/net_app_retry_traits.h" #include "google/cloud/netapp/v1/net_app_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/netapp/v1/net_app_connection_idempotency_policy.h b/google/cloud/netapp/v1/net_app_connection_idempotency_policy.h index adde8276faeb9..1449fa1b6140b 100644 --- a/google/cloud/netapp/v1/net_app_connection_idempotency_policy.h +++ b/google/cloud/netapp/v1/net_app_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETAPP_V1_NET_APP_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETAPP_V1_NET_APP_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/netapp/v1/cloud_netapp_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/BUILD.bazel b/google/cloud/networkconnectivity/BUILD.bazel index b00c4d9762a5d..cad27b8b526f3 100644 --- a/google/cloud/networkconnectivity/BUILD.bazel +++ b/google/cloud/networkconnectivity/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/networkconnectivity/v1:networkconnectivity_cc_grpc", + "@googleapis//google/cloud/networkconnectivity/v1:networkconnectivity_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/networkconnectivity/quickstart/.bazelrc b/google/cloud/networkconnectivity/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/networkconnectivity/quickstart/.bazelrc +++ b/google/cloud/networkconnectivity/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/networkconnectivity/v1/data_transfer_client.h b/google/cloud/networkconnectivity/v1/data_transfer_client.h index 1270d886dd554..d15e78472be27 100644 --- a/google/cloud/networkconnectivity/v1/data_transfer_client.h +++ b/google/cloud/networkconnectivity/v1/data_transfer_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/data_transfer_connection.h b/google/cloud/networkconnectivity/v1/data_transfer_connection.h index 4a234ea5cf626..b40dd527764b1 100644 --- a/google/cloud/networkconnectivity/v1/data_transfer_connection.h +++ b/google/cloud/networkconnectivity/v1/data_transfer_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_DATA_TRANSFER_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_DATA_TRANSFER_CONNECTION_H +#include "google/cloud/networkconnectivity/v1/data_transfer.pb.h" #include "google/cloud/networkconnectivity/v1/data_transfer_connection_idempotency_policy.h" #include "google/cloud/networkconnectivity/v1/internal/data_transfer_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/data_transfer_connection_idempotency_policy.h b/google/cloud/networkconnectivity/v1/data_transfer_connection_idempotency_policy.h index 93ee8dc589edf..5c82cb33337da 100644 --- a/google/cloud/networkconnectivity/v1/data_transfer_connection_idempotency_policy.h +++ b/google/cloud/networkconnectivity/v1/data_transfer_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/data_transfer.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/hub_client.h b/google/cloud/networkconnectivity/v1/hub_client.h index c9eea6a58e232..e41028baf726c 100644 --- a/google/cloud/networkconnectivity/v1/hub_client.h +++ b/google/cloud/networkconnectivity/v1/hub_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/hub_connection.h b/google/cloud/networkconnectivity/v1/hub_connection.h index d7e41f2e09191..23727b9fd84a8 100644 --- a/google/cloud/networkconnectivity/v1/hub_connection.h +++ b/google/cloud/networkconnectivity/v1/hub_connection.h @@ -19,6 +19,8 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_HUB_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_HUB_CONNECTION_H +#include "google/cloud/networkconnectivity/v1/common.pb.h" +#include "google/cloud/networkconnectivity/v1/hub.pb.h" #include "google/cloud/networkconnectivity/v1/hub_connection_idempotency_policy.h" #include "google/cloud/networkconnectivity/v1/internal/hub_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/hub_connection_idempotency_policy.h b/google/cloud/networkconnectivity/v1/hub_connection_idempotency_policy.h index 81ec5aecfdf65..fe8a2a8db2cb8 100644 --- a/google/cloud/networkconnectivity/v1/hub_connection_idempotency_policy.h +++ b/google/cloud/networkconnectivity/v1/hub_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_HUB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_HUB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/hub.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.cc index abbb1281d3cca..ee8b651193f87 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networkconnectivity/v1/data_transfer.proto #include "google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.h" -#include +#include "google/cloud/networkconnectivity/v1/data_transfer.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.h index db94b0bc72caf..df9da91d3e98f 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_connection_impl.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_connection_impl.h index 499c6afe3f2d0..663ae7a966023 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_connection_impl.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.cc index fbb408449389d..90dbf23e49a9d 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networkconnectivity/v1/data_transfer.proto #include "google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.h" +#include "google/cloud/networkconnectivity/v1/data_transfer.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.h index bfe46c7599054..ffd5ab0b89c7e 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.cc index f57ac01552b29..b978613ab436a 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networkconnectivity/v1/data_transfer.proto #include "google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.h" +#include "google/cloud/networkconnectivity/v1/data_transfer.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 #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.h index 5e3636806de9c..0f115002ef986 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.cc index 77a924cfe5816..68615c5c02523 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networkconnectivity/v1/data_transfer.proto #include "google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h" +#include "google/cloud/networkconnectivity/v1/data_transfer.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h index 9a6e348631bfe..6079b005ca960 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_INTERNAL_DATA_TRANSFER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_INTERNAL_DATA_TRANSFER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/data_transfer.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_stub_factory.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_stub_factory.cc index df0662acb3553..20da2bf8d3480 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_stub_factory.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/networkconnectivity/v1/data_transfer.proto #include "google/cloud/networkconnectivity/v1/internal/data_transfer_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/data_transfer.grpc.pb.h" #include "google/cloud/networkconnectivity/v1/internal/data_transfer_auth_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/data_transfer_logging_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/data_transfer_metadata_decorator.h" @@ -28,10 +30,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.cc index e69910edf2185..2822dc939614b 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataTransferServiceTracingConnection::DataTransferServiceTracingConnection( std::shared_ptr child) @@ -413,18 +411,14 @@ Status DataTransferServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataTransferServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.h index 3a5e358607309..635693f9ec620 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataTransferServiceTracingConnection : public networkconnectivity_v1::DataTransferServiceConnection { public: @@ -190,8 +188,6 @@ class DataTransferServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.cc b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.cc index 8b0ca8c8972cf..34dc898ca42eb 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DataTransferServiceTracingStub::DataTransferServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -452,15 +450,9 @@ future DataTransferServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDataTransferServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.h b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.h index 09e5803a4f951..d7886c7b46d04 100644 --- a/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/data_transfer_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DataTransferServiceTracingStub : public DataTransferServiceStub { public: ~DataTransferServiceTracingStub() override = default; @@ -208,8 +206,6 @@ class DataTransferServiceTracingStub : public DataTransferServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.cc b/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.cc index 2c35b8a5c8261..f9f7ce7030a9c 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networkconnectivity/v1/hub.proto #include "google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.h" -#include +#include "google/cloud/networkconnectivity/v1/hub.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.h b/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.h index c376f1e4a78cd..d836c676ef9f9 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/hub_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_connection_impl.h b/google/cloud/networkconnectivity/v1/internal/hub_connection_impl.h index 77dc5995d29a6..29ac095fb28f2 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_connection_impl.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.cc b/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.cc index 1e9c9b5553bfb..e669b3213e6e7 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networkconnectivity/v1/hub.proto #include "google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.h" +#include "google/cloud/networkconnectivity/v1/hub.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.h b/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.h index 9c431a6c8c757..1a2ed8c297ff5 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/hub_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.cc b/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.cc index 323a2c521c188..42c436617fc4c 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networkconnectivity/v1/hub.proto #include "google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.h" +#include "google/cloud/networkconnectivity/v1/hub.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 #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.h b/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.h index 590f48688d782..a9068de73b788 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/hub_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_stub.cc b/google/cloud/networkconnectivity/v1/internal/hub_stub.cc index 1378d7322c437..33fc630ec4022 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networkconnectivity/v1/hub.proto #include "google/cloud/networkconnectivity/v1/internal/hub_stub.h" +#include "google/cloud/networkconnectivity/v1/hub.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_stub.h b/google/cloud/networkconnectivity/v1/internal/hub_stub.h index 7872c0997f77a..eb81a43aa3b37 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_INTERNAL_HUB_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_INTERNAL_HUB_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/common.pb.h" +#include "google/cloud/networkconnectivity/v1/hub.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc b/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc index f7c3f9c3e51de..bdfbbe4ed3793 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/networkconnectivity/v1/hub.proto #include "google/cloud/networkconnectivity/v1/internal/hub_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/hub.grpc.pb.h" #include "google/cloud/networkconnectivity/v1/internal/hub_auth_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/hub_logging_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/hub_metadata_decorator.h" @@ -28,10 +30,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc b/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc index 3f922be22eabd..4f695d4f9dae5 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - HubServiceTracingConnection::HubServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -567,16 +565,12 @@ Status HubServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeHubServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.h b/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.h index 55d2bdd477e24..16bbd9ee289b6 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class HubServiceTracingConnection : public networkconnectivity_v1::HubServiceConnection { public: @@ -262,8 +260,6 @@ class HubServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc b/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc index ecdb5518996f3..c05510c377481 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - HubServiceTracingStub::HubServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -599,15 +597,9 @@ future HubServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeHubServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.h b/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.h index 4397ecf410b94..4377c735216e6 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class HubServiceTracingStub : public HubServiceStub { public: ~HubServiceTracingStub() override = default; @@ -287,8 +285,6 @@ class HubServiceTracingStub : public HubServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.cc index bb76fd4b15b24..9b485181b439b 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networkconnectivity/v1/policy_based_routing.proto #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.h" -#include +#include "google/cloud/networkconnectivity/v1/policy_based_routing.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.h index 2af808c611b29..5a806864f8bbe 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_connection_impl.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_connection_impl.h index c1d69e610659f..cd04ca7928724 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_connection_impl.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.cc index e6625c18565ec..dcc8e8e602e4c 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networkconnectivity/v1/policy_based_routing.proto #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.h index b313a50cb88f4..e3832b93b84b8 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.cc index 0d02f27b12003..a2eaace3560b2 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networkconnectivity/v1/policy_based_routing.proto #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.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 #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.h index 593fcda6f43ab..195d4b5613892 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc index 8bb4cc2f8de77..8f376d222eecc 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networkconnectivity/v1/policy_based_routing.proto #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h index 9fbe2bc1cf724..f002aa7284523 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_INTERNAL_POLICY_BASED_ROUTING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_INTERNAL_POLICY_BASED_ROUTING_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc index 122fea418d456..042a64e0f145a 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/networkconnectivity/v1/policy_based_routing.proto #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_auth_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_logging_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_metadata_decorator.h" #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h" #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.cc index ed95b8e45951c..48ef5a5d05c06 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyBasedRoutingServiceTracingConnection:: PolicyBasedRoutingServiceTracingConnection( std::shared_ptr< @@ -225,18 +223,14 @@ Status PolicyBasedRoutingServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyBasedRoutingServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.h index 224fd7fdb3637..2dae46a381f3c 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyBasedRoutingServiceTracingConnection : public networkconnectivity_v1::PolicyBasedRoutingServiceConnection { public: @@ -110,8 +108,6 @@ class PolicyBasedRoutingServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.cc index b3c9d1de51693..9ebb140245423 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyBasedRoutingServiceTracingStub::PolicyBasedRoutingServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -267,17 +265,11 @@ future PolicyBasedRoutingServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyBasedRoutingServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.h index 19830dda88364..a13edac2a082d 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networkconnectivity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyBasedRoutingServiceTracingStub : public PolicyBasedRoutingServiceStub { public: @@ -131,8 +129,6 @@ class PolicyBasedRoutingServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networkconnectivity/v1/policy_based_routing_client.h b/google/cloud/networkconnectivity/v1/policy_based_routing_client.h index a8a38330b317b..9720461c8235c 100644 --- a/google/cloud/networkconnectivity/v1/policy_based_routing_client.h +++ b/google/cloud/networkconnectivity/v1/policy_based_routing_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkconnectivity/v1/policy_based_routing_connection.h b/google/cloud/networkconnectivity/v1/policy_based_routing_connection.h index 4761b8e3dabf2..b707159e70b42 100644 --- a/google/cloud/networkconnectivity/v1/policy_based_routing_connection.h +++ b/google/cloud/networkconnectivity/v1/policy_based_routing_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_POLICY_BASED_ROUTING_CONNECTION_H #include "google/cloud/networkconnectivity/v1/internal/policy_based_routing_retry_traits.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.pb.h" #include "google/cloud/networkconnectivity/v1/policy_based_routing_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkconnectivity/v1/policy_based_routing_connection_idempotency_policy.h b/google/cloud/networkconnectivity/v1/policy_based_routing_connection_idempotency_policy.h index 84c2e96a78e5f..56b490b83ff6d 100644 --- a/google/cloud/networkconnectivity/v1/policy_based_routing_connection_idempotency_policy.h +++ b/google/cloud/networkconnectivity/v1/policy_based_routing_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_POLICY_BASED_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_V1_POLICY_BASED_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkconnectivity/v1/policy_based_routing.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkmanagement/BUILD.bazel b/google/cloud/networkmanagement/BUILD.bazel index 7b8790a4bc567..4b9ca74409458 100644 --- a/google/cloud/networkmanagement/BUILD.bazel +++ b/google/cloud/networkmanagement/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/networkmanagement/v1:networkmanagement_cc_grpc", + "@googleapis//google/cloud/networkmanagement/v1:networkmanagement_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/networkmanagement/quickstart/.bazelrc b/google/cloud/networkmanagement/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/networkmanagement/quickstart/.bazelrc +++ b/google/cloud/networkmanagement/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.cc b/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.cc index 435592b760fd4..a5121a554309b 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networkmanagement/v1/reachability.proto #include "google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.h" -#include +#include "google/cloud/networkmanagement/v1/reachability.grpc.pb.h" #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.h b/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.h index 1a41e6a8ef605..b32a4b5584957 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkmanagement/v1/internal/reachability_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_connection_impl.h b/google/cloud/networkmanagement/v1/internal/reachability_connection_impl.h index a2082e24c26a9..321d077b01755 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_connection_impl.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.cc b/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.cc index 544009fdfefa6..c320023d4528b 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networkmanagement/v1/reachability.proto #include "google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.h" +#include "google/cloud/networkmanagement/v1/reachability.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.h b/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.h index 97239bd386be4..c51589d488012 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkmanagement/v1/internal/reachability_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.cc b/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.cc index 595951f7ded16..ac8f0b85bcc8b 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networkmanagement/v1/reachability.proto #include "google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.h" +#include "google/cloud/networkmanagement/v1/reachability.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 #include #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.h b/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.h index b4217c8d8c416..9825d25c18525 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkmanagement/v1/internal/reachability_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_stub.cc b/google/cloud/networkmanagement/v1/internal/reachability_stub.cc index 6bfbeda436194..eb835b0379ae8 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_stub.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networkmanagement/v1/reachability.proto #include "google/cloud/networkmanagement/v1/internal/reachability_stub.h" +#include "google/cloud/networkmanagement/v1/reachability.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_stub.h b/google/cloud/networkmanagement/v1/internal/reachability_stub.h index 5f29667c5290e..5f79acf460c92 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_stub.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_V1_INTERNAL_REACHABILITY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_V1_INTERNAL_REACHABILITY_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkmanagement/v1/reachability.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc b/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc index 554f5998fb9b7..1d88b8e50d51e 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/networkmanagement/v1/reachability.proto #include "google/cloud/networkmanagement/v1/internal/reachability_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/networkmanagement/v1/internal/reachability_auth_decorator.h" #include "google/cloud/networkmanagement/v1/internal/reachability_logging_decorator.h" #include "google/cloud/networkmanagement/v1/internal/reachability_metadata_decorator.h" #include "google/cloud/networkmanagement/v1/internal/reachability_stub.h" #include "google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.h" +#include "google/cloud/networkmanagement/v1/reachability.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc b/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc index 45cb400869c6e..10f4cbe86eae3 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networkmanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReachabilityServiceTracingConnection::ReachabilityServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -286,17 +284,13 @@ Status ReachabilityServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReachabilityServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.h b/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.h index 29e88e06d44d6..bfe6c6680d1c4 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networkmanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReachabilityServiceTracingConnection : public networkmanagement_v1::ReachabilityServiceConnection { public: @@ -138,8 +136,6 @@ class ReachabilityServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc b/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc index 5d90d5f708bb7..c6c66b2170dd0 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networkmanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ReachabilityServiceTracingStub::ReachabilityServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -323,15 +321,9 @@ future ReachabilityServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeReachabilityServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.h b/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.h index 72a4b5a56dd8c..985988f30cc12 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networkmanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ReachabilityServiceTracingStub : public ReachabilityServiceStub { public: ~ReachabilityServiceTracingStub() override = default; @@ -153,8 +151,6 @@ class ReachabilityServiceTracingStub : public ReachabilityServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networkmanagement/v1/reachability_client.h b/google/cloud/networkmanagement/v1/reachability_client.h index 4fe67211099f0..5a6bd2f446b7d 100644 --- a/google/cloud/networkmanagement/v1/reachability_client.h +++ b/google/cloud/networkmanagement/v1/reachability_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkmanagement/v1/reachability_connection.h b/google/cloud/networkmanagement/v1/reachability_connection.h index 507c71dec956f..83e0308f4c252 100644 --- a/google/cloud/networkmanagement/v1/reachability_connection.h +++ b/google/cloud/networkmanagement/v1/reachability_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_V1_REACHABILITY_CONNECTION_H #include "google/cloud/networkmanagement/v1/internal/reachability_retry_traits.h" +#include "google/cloud/networkmanagement/v1/reachability.pb.h" #include "google/cloud/networkmanagement/v1/reachability_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkmanagement/v1/reachability_connection_idempotency_policy.h b/google/cloud/networkmanagement/v1/reachability_connection_idempotency_policy.h index 2d95b71e7df01..7541979cdf712 100644 --- a/google/cloud/networkmanagement/v1/reachability_connection_idempotency_policy.h +++ b/google/cloud/networkmanagement/v1/reachability_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_V1_REACHABILITY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_V1_REACHABILITY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkmanagement/v1/reachability.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networksecurity/BUILD.bazel b/google/cloud/networksecurity/BUILD.bazel index a77fe0a8536f6..79f6dc3906290 100644 --- a/google/cloud/networksecurity/BUILD.bazel +++ b/google/cloud/networksecurity/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/networksecurity/v1:networksecurity_cc_grpc", + "@googleapis//google/cloud/networksecurity/v1:networksecurity_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/networksecurity/quickstart/.bazelrc b/google/cloud/networksecurity/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/networksecurity/quickstart/.bazelrc +++ b/google/cloud/networksecurity/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.cc b/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.cc index ed6424b93edb9..3ff68fa52f5d8 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networksecurity/v1/network_security.proto #include "google/cloud/networksecurity/v1/internal/network_security_auth_decorator.h" -#include +#include "google/cloud/networksecurity/v1/network_security.grpc.pb.h" #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.h b/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.h index 22d5f9d3bf803..fbf647e9967c2 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.h +++ b/google/cloud/networksecurity/v1/internal/network_security_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networksecurity/v1/internal/network_security_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_connection_impl.h b/google/cloud/networksecurity/v1/internal/network_security_connection_impl.h index 9cf54949b88a9..cb0213066d675 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_connection_impl.h +++ b/google/cloud/networksecurity/v1/internal/network_security_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.cc b/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.cc index 748a21c1ba4ed..906c1e5a73a7c 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networksecurity/v1/network_security.proto #include "google/cloud/networksecurity/v1/internal/network_security_logging_decorator.h" +#include "google/cloud/networksecurity/v1/network_security.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.h b/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.h index e27bb17138f65..23a9ebe4e86ef 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.h +++ b/google/cloud/networksecurity/v1/internal/network_security_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networksecurity/v1/internal/network_security_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.cc b/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.cc index c17532b8f4ec1..bc4e5db525ee9 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networksecurity/v1/network_security.proto #include "google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.h" +#include "google/cloud/networksecurity/v1/network_security.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 #include #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.h b/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.h index 21e5f0afe2e04..1d941c5bc94c8 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.h +++ b/google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networksecurity/v1/internal/network_security_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_stub.cc b/google/cloud/networksecurity/v1/internal/network_security_stub.cc index 77555bdf82f59..26c5741f820c5 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_stub.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networksecurity/v1/network_security.proto #include "google/cloud/networksecurity/v1/internal/network_security_stub.h" +#include "google/cloud/networksecurity/v1/network_security.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_stub.h b/google/cloud/networksecurity/v1/internal/network_security_stub.h index a958f1110d9c0..68b5f6d8012c4 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_stub.h +++ b/google/cloud/networksecurity/v1/internal/network_security_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSECURITY_V1_INTERNAL_NETWORK_SECURITY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSECURITY_V1_INTERNAL_NETWORK_SECURITY_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networksecurity/v1/common.pb.h" +#include "google/cloud/networksecurity/v1/network_security.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc b/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc index 8e42fca7d8861..6d7b86a380638 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/networksecurity/v1/network_security.proto #include "google/cloud/networksecurity/v1/internal/network_security_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/networksecurity/v1/internal/network_security_auth_decorator.h" #include "google/cloud/networksecurity/v1/internal/network_security_logging_decorator.h" #include "google/cloud/networksecurity/v1/internal/network_security_metadata_decorator.h" #include "google/cloud/networksecurity/v1/internal/network_security_stub.h" #include "google/cloud/networksecurity/v1/internal/network_security_tracing_stub.h" +#include "google/cloud/networksecurity/v1/network_security.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc b/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc index 83c2a4edda198..cd155064fda46 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networksecurity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkSecurityTracingConnection::NetworkSecurityTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -490,16 +488,12 @@ Status NetworkSecurityTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkSecurityTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.h b/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.h index b85cbf92baa11..c858b05037503 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.h +++ b/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networksecurity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkSecurityTracingConnection : public networksecurity_v1::NetworkSecurityConnection { public: @@ -224,8 +222,6 @@ class NetworkSecurityTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc b/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc index c84aa0ec60150..ca12662de927b 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networksecurity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkSecurityTracingStub::NetworkSecurityTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -530,15 +528,9 @@ future NetworkSecurityTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkSecurityTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.h b/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.h index 1a466ecbbf119..10f9e47f64d97 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.h +++ b/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networksecurity_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkSecurityTracingStub : public NetworkSecurityStub { public: ~NetworkSecurityTracingStub() override = default; @@ -241,8 +239,6 @@ class NetworkSecurityTracingStub : public NetworkSecurityStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networksecurity/v1/network_security_client.h b/google/cloud/networksecurity/v1/network_security_client.h index 63967dfc8aecc..d1f75500bc344 100644 --- a/google/cloud/networksecurity/v1/network_security_client.h +++ b/google/cloud/networksecurity/v1/network_security_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networksecurity/v1/network_security_connection.h b/google/cloud/networksecurity/v1/network_security_connection.h index 313568bfd717a..b69e925f227aa 100644 --- a/google/cloud/networksecurity/v1/network_security_connection.h +++ b/google/cloud/networksecurity/v1/network_security_connection.h @@ -19,7 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSECURITY_V1_NETWORK_SECURITY_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSECURITY_V1_NETWORK_SECURITY_CONNECTION_H +#include "google/cloud/networksecurity/v1/common.pb.h" #include "google/cloud/networksecurity/v1/internal/network_security_retry_traits.h" +#include "google/cloud/networksecurity/v1/network_security.pb.h" #include "google/cloud/networksecurity/v1/network_security_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networksecurity/v1/network_security_connection_idempotency_policy.h b/google/cloud/networksecurity/v1/network_security_connection_idempotency_policy.h index e9693649b51fc..66d1a0c9233ad 100644 --- a/google/cloud/networksecurity/v1/network_security_connection_idempotency_policy.h +++ b/google/cloud/networksecurity/v1/network_security_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSECURITY_V1_NETWORK_SECURITY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSECURITY_V1_NETWORK_SECURITY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networksecurity/v1/network_security.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkservices/BUILD.bazel b/google/cloud/networkservices/BUILD.bazel index 1f4c5e7f1660b..4580fd4893a7b 100644 --- a/google/cloud/networkservices/BUILD.bazel +++ b/google/cloud/networkservices/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/networkservices/v1:networkservices_cc_grpc", + "@googleapis//google/cloud/networkservices/v1:networkservices_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/networkservices/quickstart/.bazelrc b/google/cloud/networkservices/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/networkservices/quickstart/.bazelrc +++ b/google/cloud/networkservices/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/networkservices/v1/dep_client.h b/google/cloud/networkservices/v1/dep_client.h index dbe51a7a76116..66533d158d641 100644 --- a/google/cloud/networkservices/v1/dep_client.h +++ b/google/cloud/networkservices/v1/dep_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/dep_connection.h b/google/cloud/networkservices/v1/dep_connection.h index 041a35523c553..4879e6d7dfeff 100644 --- a/google/cloud/networkservices/v1/dep_connection.h +++ b/google/cloud/networkservices/v1/dep_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_DEP_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_DEP_CONNECTION_H +#include "google/cloud/networkservices/v1/dep.pb.h" #include "google/cloud/networkservices/v1/dep_connection_idempotency_policy.h" #include "google/cloud/networkservices/v1/internal/dep_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkservices/v1/dep_connection_idempotency_policy.h b/google/cloud/networkservices/v1/dep_connection_idempotency_policy.h index 874fc7614c79e..be352f7959754 100644 --- a/google/cloud/networkservices/v1/dep_connection_idempotency_policy.h +++ b/google/cloud/networkservices/v1/dep_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_DEP_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_DEP_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkservices/v1/dep.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkservices/v1/internal/dep_auth_decorator.cc b/google/cloud/networkservices/v1/internal/dep_auth_decorator.cc index 3c2d66d6970f4..626c5b446c468 100644 --- a/google/cloud/networkservices/v1/internal/dep_auth_decorator.cc +++ b/google/cloud/networkservices/v1/internal/dep_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networkservices/v1/dep.proto #include "google/cloud/networkservices/v1/internal/dep_auth_decorator.h" -#include +#include "google/cloud/networkservices/v1/dep.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_auth_decorator.h b/google/cloud/networkservices/v1/internal/dep_auth_decorator.h index 80b2d502aa5f2..58dda1d6ecf94 100644 --- a/google/cloud/networkservices/v1/internal/dep_auth_decorator.h +++ b/google/cloud/networkservices/v1/internal/dep_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkservices/v1/internal/dep_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_connection_impl.h b/google/cloud/networkservices/v1/internal/dep_connection_impl.h index 44e3d4b03191a..3f275af2aad41 100644 --- a/google/cloud/networkservices/v1/internal/dep_connection_impl.h +++ b/google/cloud/networkservices/v1/internal/dep_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkservices/v1/internal/dep_logging_decorator.cc b/google/cloud/networkservices/v1/internal/dep_logging_decorator.cc index 26dd6fb5f819b..f0595e2ad0aad 100644 --- a/google/cloud/networkservices/v1/internal/dep_logging_decorator.cc +++ b/google/cloud/networkservices/v1/internal/dep_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networkservices/v1/dep.proto #include "google/cloud/networkservices/v1/internal/dep_logging_decorator.h" +#include "google/cloud/networkservices/v1/dep.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_logging_decorator.h b/google/cloud/networkservices/v1/internal/dep_logging_decorator.h index fccc49fe45c59..808bed118499b 100644 --- a/google/cloud/networkservices/v1/internal/dep_logging_decorator.h +++ b/google/cloud/networkservices/v1/internal/dep_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkservices/v1/internal/dep_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_metadata_decorator.cc b/google/cloud/networkservices/v1/internal/dep_metadata_decorator.cc index ec4c164397b52..605373fa22934 100644 --- a/google/cloud/networkservices/v1/internal/dep_metadata_decorator.cc +++ b/google/cloud/networkservices/v1/internal/dep_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networkservices/v1/dep.proto #include "google/cloud/networkservices/v1/internal/dep_metadata_decorator.h" +#include "google/cloud/networkservices/v1/dep.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 #include #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_metadata_decorator.h b/google/cloud/networkservices/v1/internal/dep_metadata_decorator.h index 4f51d57722ae8..d644f66c236ce 100644 --- a/google/cloud/networkservices/v1/internal/dep_metadata_decorator.h +++ b/google/cloud/networkservices/v1/internal/dep_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkservices/v1/internal/dep_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_stub.cc b/google/cloud/networkservices/v1/internal/dep_stub.cc index 9e0a16c1fa041..f732abee03170 100644 --- a/google/cloud/networkservices/v1/internal/dep_stub.cc +++ b/google/cloud/networkservices/v1/internal/dep_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networkservices/v1/dep.proto #include "google/cloud/networkservices/v1/internal/dep_stub.h" +#include "google/cloud/networkservices/v1/dep.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_stub.h b/google/cloud/networkservices/v1/internal/dep_stub.h index 9c3a7cbaf7cb8..d4dc7c493a8d6 100644 --- a/google/cloud/networkservices/v1/internal/dep_stub.h +++ b/google/cloud/networkservices/v1/internal/dep_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_INTERNAL_DEP_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_INTERNAL_DEP_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkservices/v1/dep.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_stub_factory.cc b/google/cloud/networkservices/v1/internal/dep_stub_factory.cc index 4e919a379e61e..8cc5d093a4f54 100644 --- a/google/cloud/networkservices/v1/internal/dep_stub_factory.cc +++ b/google/cloud/networkservices/v1/internal/dep_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/networkservices/v1/dep.proto #include "google/cloud/networkservices/v1/internal/dep_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkservices/v1/dep.grpc.pb.h" #include "google/cloud/networkservices/v1/internal/dep_auth_decorator.h" #include "google/cloud/networkservices/v1/internal/dep_logging_decorator.h" #include "google/cloud/networkservices/v1/internal/dep_metadata_decorator.h" @@ -28,10 +30,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/dep_tracing_connection.cc b/google/cloud/networkservices/v1/internal/dep_tracing_connection.cc index d71f217e7e508..ccbc0a6754596 100644 --- a/google/cloud/networkservices/v1/internal/dep_tracing_connection.cc +++ b/google/cloud/networkservices/v1/internal/dep_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DepServiceTracingConnection::DepServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -599,16 +597,12 @@ Status DepServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDepServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networkservices/v1/internal/dep_tracing_connection.h b/google/cloud/networkservices/v1/internal/dep_tracing_connection.h index 973c59e85987e..35b6877d3e336 100644 --- a/google/cloud/networkservices/v1/internal/dep_tracing_connection.h +++ b/google/cloud/networkservices/v1/internal/dep_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DepServiceTracingConnection : public networkservices_v1::DepServiceConnection { public: @@ -279,8 +277,6 @@ class DepServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networkservices/v1/internal/dep_tracing_stub.cc b/google/cloud/networkservices/v1/internal/dep_tracing_stub.cc index 5d166bfdbdd8f..8df7676db7f78 100644 --- a/google/cloud/networkservices/v1/internal/dep_tracing_stub.cc +++ b/google/cloud/networkservices/v1/internal/dep_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DepServiceTracingStub::DepServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -621,15 +619,9 @@ future DepServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDepServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkservices/v1/internal/dep_tracing_stub.h b/google/cloud/networkservices/v1/internal/dep_tracing_stub.h index 95c5f89163794..9db7ebc645e2b 100644 --- a/google/cloud/networkservices/v1/internal/dep_tracing_stub.h +++ b/google/cloud/networkservices/v1/internal/dep_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DepServiceTracingStub : public DepServiceStub { public: ~DepServiceTracingStub() override = default; @@ -287,8 +285,6 @@ class DepServiceTracingStub : public DepServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networkservices/v1/internal/network_services_auth_decorator.cc b/google/cloud/networkservices/v1/internal/network_services_auth_decorator.cc index 751e69c52c6af..3c66750dd09bb 100644 --- a/google/cloud/networkservices/v1/internal/network_services_auth_decorator.cc +++ b/google/cloud/networkservices/v1/internal/network_services_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/networkservices/v1/network_services.proto #include "google/cloud/networkservices/v1/internal/network_services_auth_decorator.h" -#include +#include "google/cloud/networkservices/v1/network_services.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_auth_decorator.h b/google/cloud/networkservices/v1/internal/network_services_auth_decorator.h index 4ed9ae4349311..9194058983a3a 100644 --- a/google/cloud/networkservices/v1/internal/network_services_auth_decorator.h +++ b/google/cloud/networkservices/v1/internal/network_services_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkservices/v1/internal/network_services_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_connection_impl.h b/google/cloud/networkservices/v1/internal/network_services_connection_impl.h index 80d4275c2034f..12cb4f5755802 100644 --- a/google/cloud/networkservices/v1/internal/network_services_connection_impl.h +++ b/google/cloud/networkservices/v1/internal/network_services_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkservices/v1/internal/network_services_logging_decorator.cc b/google/cloud/networkservices/v1/internal/network_services_logging_decorator.cc index 2f2a7abbc095c..391907ca26487 100644 --- a/google/cloud/networkservices/v1/internal/network_services_logging_decorator.cc +++ b/google/cloud/networkservices/v1/internal/network_services_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/networkservices/v1/network_services.proto #include "google/cloud/networkservices/v1/internal/network_services_logging_decorator.h" +#include "google/cloud/networkservices/v1/network_services.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_logging_decorator.h b/google/cloud/networkservices/v1/internal/network_services_logging_decorator.h index 7563a8b1ea79d..ed3b51254530b 100644 --- a/google/cloud/networkservices/v1/internal/network_services_logging_decorator.h +++ b/google/cloud/networkservices/v1/internal/network_services_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkservices/v1/internal/network_services_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.cc b/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.cc index 22c06f9ed7755..bd97d77a9da85 100644 --- a/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.cc +++ b/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/networkservices/v1/network_services.proto #include "google/cloud/networkservices/v1/internal/network_services_metadata_decorator.h" +#include "google/cloud/networkservices/v1/network_services.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 #include #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.h b/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.h index 819cbce73ef98..325f7f5046a43 100644 --- a/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.h +++ b/google/cloud/networkservices/v1/internal/network_services_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/networkservices/v1/internal/network_services_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_stub.cc b/google/cloud/networkservices/v1/internal/network_services_stub.cc index 962b18476aace..e39585f2e26f4 100644 --- a/google/cloud/networkservices/v1/internal/network_services_stub.cc +++ b/google/cloud/networkservices/v1/internal/network_services_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/networkservices/v1/network_services.proto #include "google/cloud/networkservices/v1/internal/network_services_stub.h" +#include "google/cloud/networkservices/v1/network_services.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_stub.h b/google/cloud/networkservices/v1/internal/network_services_stub.h index 2cb715a2e50c1..551433fbbe427 100644 --- a/google/cloud/networkservices/v1/internal/network_services_stub.h +++ b/google/cloud/networkservices/v1/internal/network_services_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_INTERNAL_NETWORK_SERVICES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_INTERNAL_NETWORK_SERVICES_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkservices/v1/extensibility.pb.h" +#include "google/cloud/networkservices/v1/network_services.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc b/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc index 900f9828b73cd..3b9cf2a4ba8ca 100644 --- a/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc +++ b/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/networkservices/v1/network_services.proto #include "google/cloud/networkservices/v1/internal/network_services_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/networkservices/v1/internal/network_services_auth_decorator.h" #include "google/cloud/networkservices/v1/internal/network_services_logging_decorator.h" #include "google/cloud/networkservices/v1/internal/network_services_metadata_decorator.h" #include "google/cloud/networkservices/v1/internal/network_services_stub.h" #include "google/cloud/networkservices/v1/internal/network_services_tracing_stub.h" +#include "google/cloud/networkservices/v1/network_services.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc b/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc index 3fd726763d814..407039150b77e 100644 --- a/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc +++ b/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkServicesTracingConnection::NetworkServicesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1369,16 +1367,12 @@ Status NetworkServicesTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkServicesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/networkservices/v1/internal/network_services_tracing_connection.h b/google/cloud/networkservices/v1/internal/network_services_tracing_connection.h index dfc8f9c8ddc1d..53732106c02b3 100644 --- a/google/cloud/networkservices/v1/internal/network_services_tracing_connection.h +++ b/google/cloud/networkservices/v1/internal/network_services_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkServicesTracingConnection : public networkservices_v1::NetworkServicesConnection { public: @@ -601,8 +599,6 @@ class NetworkServicesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc b/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc index 9e22688f6a023..12eb0952cd3b7 100644 --- a/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc +++ b/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NetworkServicesTracingStub::NetworkServicesTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1401,15 +1399,9 @@ future NetworkServicesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNetworkServicesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkservices/v1/internal/network_services_tracing_stub.h b/google/cloud/networkservices/v1/internal/network_services_tracing_stub.h index c7ceb1a7381a7..4d97ab864b363 100644 --- a/google/cloud/networkservices/v1/internal/network_services_tracing_stub.h +++ b/google/cloud/networkservices/v1/internal/network_services_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace networkservices_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NetworkServicesTracingStub : public NetworkServicesStub { public: ~NetworkServicesTracingStub() override = default; @@ -621,8 +619,6 @@ class NetworkServicesTracingStub : public NetworkServicesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/networkservices/v1/network_services_client.h b/google/cloud/networkservices/v1/network_services_client.h index 53a082a54bbe5..875ccde795ef7 100644 --- a/google/cloud/networkservices/v1/network_services_client.h +++ b/google/cloud/networkservices/v1/network_services_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/networkservices/v1/network_services_connection.h b/google/cloud/networkservices/v1/network_services_connection.h index e96b8e26416c6..d682bafcd26a0 100644 --- a/google/cloud/networkservices/v1/network_services_connection.h +++ b/google/cloud/networkservices/v1/network_services_connection.h @@ -19,7 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_NETWORK_SERVICES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_NETWORK_SERVICES_CONNECTION_H +#include "google/cloud/networkservices/v1/extensibility.pb.h" #include "google/cloud/networkservices/v1/internal/network_services_retry_traits.h" +#include "google/cloud/networkservices/v1/network_services.pb.h" #include "google/cloud/networkservices/v1/network_services_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/networkservices/v1/network_services_connection_idempotency_policy.h b/google/cloud/networkservices/v1/network_services_connection_idempotency_policy.h index b2adcea8b8b9c..4e107d6f6c282 100644 --- a/google/cloud/networkservices/v1/network_services_connection_idempotency_policy.h +++ b/google/cloud/networkservices/v1/network_services_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_NETWORK_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKSERVICES_V1_NETWORK_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/networkservices/v1/network_services.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/BUILD.bazel b/google/cloud/notebooks/BUILD.bazel index a7ca423cce1f4..8a3032e1a8afc 100644 --- a/google/cloud/notebooks/BUILD.bazel +++ b/google/cloud/notebooks/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/notebooks/v1:notebooks_cc_grpc", - "@com_google_googleapis//google/cloud/notebooks/v2:notebooks_cc_grpc", + "@googleapis//google/cloud/notebooks/v1:notebooks_cc_grpc", + "@googleapis//google/cloud/notebooks/v2:notebooks_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/notebooks/quickstart/.bazelrc b/google/cloud/notebooks/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/notebooks/quickstart/.bazelrc +++ b/google/cloud/notebooks/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.cc b/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.cc index 0085878d73413..fcf596ade21ab 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/notebooks/v1/managed_service.proto #include "google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.h" -#include +#include "google/cloud/notebooks/v1/managed_service.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.h b/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.h index 583354fc681bf..7c8f7e82ce1f4 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v1/internal/managed_notebook_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_connection_impl.h b/google/cloud/notebooks/v1/internal/managed_notebook_connection_impl.h index c73f99ea8e637..a7def763692c7 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_connection_impl.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.cc b/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.cc index f593ff2b8f30e..cd860a8cf4617 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/notebooks/v1/managed_service.proto #include "google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.h" +#include "google/cloud/notebooks/v1/managed_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.h b/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.h index e9d9b8fbdf5ff..373345b46a0c4 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v1/internal/managed_notebook_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.cc b/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.cc index bc370e7e72951..d5094d65a6864 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/notebooks/v1/managed_service.proto #include "google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.h" +#include "google/cloud/notebooks/v1/managed_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 #include #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.h b/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.h index 70a0172f75fd3..3c62066ce61d0 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v1/internal/managed_notebook_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc b/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc index e473ecbc92f22..c97a9cc362f49 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/notebooks/v1/managed_service.proto #include "google/cloud/notebooks/v1/internal/managed_notebook_stub.h" +#include "google/cloud/notebooks/v1/managed_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_stub.h b/google/cloud/notebooks/v1/internal/managed_notebook_stub.h index a98bcc7f14043..c74aba32b215b 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_stub.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_INTERNAL_MANAGED_NOTEBOOK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_INTERNAL_MANAGED_NOTEBOOK_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/notebooks/v1/managed_service.grpc.pb.h" +#include "google/cloud/notebooks/v1/service.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc b/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc index 1c0604fc72f8d..66f3c018676c6 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/notebooks/v1/managed_service.proto #include "google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/notebooks/v1/internal/managed_notebook_auth_decorator.h" #include "google/cloud/notebooks/v1/internal/managed_notebook_logging_decorator.h" #include "google/cloud/notebooks/v1/internal/managed_notebook_metadata_decorator.h" #include "google/cloud/notebooks/v1/internal/managed_notebook_stub.h" #include "google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.h" +#include "google/cloud/notebooks/v1/managed_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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc index de9314c009ea6..bda7f084bbe1b 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedNotebookServiceTracingConnection:: ManagedNotebookServiceTracingConnection( std::shared_ptr child) @@ -433,17 +431,13 @@ Status ManagedNotebookServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedNotebookServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.h b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.h index 3d4a1d88e0f52..288e73b1b49be 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedNotebookServiceTracingConnection : public notebooks_v1::ManagedNotebookServiceConnection { public: @@ -200,8 +198,6 @@ class ManagedNotebookServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc index 0145be708ecd5..0a96ae9a2de85 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ManagedNotebookServiceTracingStub::ManagedNotebookServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -468,16 +466,10 @@ future ManagedNotebookServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeManagedNotebookServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.h b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.h index d267092bb351d..3f277f9726d94 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ManagedNotebookServiceTracingStub : public ManagedNotebookServiceStub { public: ~ManagedNotebookServiceTracingStub() override = default; @@ -226,8 +224,6 @@ class ManagedNotebookServiceTracingStub : public ManagedNotebookServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/notebooks/v1/internal/notebook_auth_decorator.cc b/google/cloud/notebooks/v1/internal/notebook_auth_decorator.cc index f2217ffa394bf..82b0dfba7f20b 100644 --- a/google/cloud/notebooks/v1/internal/notebook_auth_decorator.cc +++ b/google/cloud/notebooks/v1/internal/notebook_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/notebooks/v1/service.proto #include "google/cloud/notebooks/v1/internal/notebook_auth_decorator.h" -#include +#include "google/cloud/notebooks/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_auth_decorator.h b/google/cloud/notebooks/v1/internal/notebook_auth_decorator.h index 77d438e9ac3c2..03cd00c1673e7 100644 --- a/google/cloud/notebooks/v1/internal/notebook_auth_decorator.h +++ b/google/cloud/notebooks/v1/internal/notebook_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v1/internal/notebook_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_connection_impl.h b/google/cloud/notebooks/v1/internal/notebook_connection_impl.h index 724dae3ee8ca7..b0b7ce72e629d 100644 --- a/google/cloud/notebooks/v1/internal/notebook_connection_impl.h +++ b/google/cloud/notebooks/v1/internal/notebook_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v1/internal/notebook_logging_decorator.cc b/google/cloud/notebooks/v1/internal/notebook_logging_decorator.cc index 3d04ce2cc28bb..dc8ac7310825b 100644 --- a/google/cloud/notebooks/v1/internal/notebook_logging_decorator.cc +++ b/google/cloud/notebooks/v1/internal/notebook_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/notebooks/v1/service.proto #include "google/cloud/notebooks/v1/internal/notebook_logging_decorator.h" +#include "google/cloud/notebooks/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_logging_decorator.h b/google/cloud/notebooks/v1/internal/notebook_logging_decorator.h index 56b4043a53428..ba1005c261637 100644 --- a/google/cloud/notebooks/v1/internal/notebook_logging_decorator.h +++ b/google/cloud/notebooks/v1/internal/notebook_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v1/internal/notebook_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.cc b/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.cc index 774de3c20653f..18c5fbd478c10 100644 --- a/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.cc +++ b/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/notebooks/v1/service.proto #include "google/cloud/notebooks/v1/internal/notebook_metadata_decorator.h" +#include "google/cloud/notebooks/v1/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 #include #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.h b/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.h index 2c8df58bd0ebb..0593286aad841 100644 --- a/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.h +++ b/google/cloud/notebooks/v1/internal/notebook_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v1/internal/notebook_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_stub.cc b/google/cloud/notebooks/v1/internal/notebook_stub.cc index eb80157d20d38..e03b8999f8f4e 100644 --- a/google/cloud/notebooks/v1/internal/notebook_stub.cc +++ b/google/cloud/notebooks/v1/internal/notebook_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/notebooks/v1/service.proto #include "google/cloud/notebooks/v1/internal/notebook_stub.h" +#include "google/cloud/notebooks/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_stub.h b/google/cloud/notebooks/v1/internal/notebook_stub.h index da6aa06364115..c3e7cea740042 100644 --- a/google/cloud/notebooks/v1/internal/notebook_stub.h +++ b/google/cloud/notebooks/v1/internal/notebook_stub.h @@ -19,16 +19,16 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_INTERNAL_NOTEBOOK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_INTERNAL_NOTEBOOK_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/notebooks/v1/service.grpc.pb.h" +#include "google/cloud/notebooks/v1/service.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc b/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc index 03e413caae60e..2b0d3eaeb8967 100644 --- a/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc +++ b/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/notebooks/v1/service.proto #include "google/cloud/notebooks/v1/internal/notebook_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/notebooks/v1/internal/notebook_auth_decorator.h" #include "google/cloud/notebooks/v1/internal/notebook_logging_decorator.h" #include "google/cloud/notebooks/v1/internal/notebook_metadata_decorator.h" #include "google/cloud/notebooks/v1/internal/notebook_stub.h" #include "google/cloud/notebooks/v1/internal/notebook_tracing_stub.h" +#include "google/cloud/notebooks/v1/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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc b/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc index c9dfcafa248fa..5e9d483df5897 100644 --- a/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc +++ b/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotebookServiceTracingConnection::NotebookServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -915,16 +913,12 @@ Status NotebookServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotebookServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/notebooks/v1/internal/notebook_tracing_connection.h b/google/cloud/notebooks/v1/internal/notebook_tracing_connection.h index f37f037a2a6a0..6c46b2914ccae 100644 --- a/google/cloud/notebooks/v1/internal/notebook_tracing_connection.h +++ b/google/cloud/notebooks/v1/internal/notebook_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotebookServiceTracingConnection : public notebooks_v1::NotebookServiceConnection { public: @@ -397,8 +395,6 @@ class NotebookServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc b/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc index f4e68db60c46a..2a38e2b1168e9 100644 --- a/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc +++ b/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotebookServiceTracingStub::NotebookServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -931,15 +929,9 @@ future NotebookServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotebookServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/notebooks/v1/internal/notebook_tracing_stub.h b/google/cloud/notebooks/v1/internal/notebook_tracing_stub.h index e4e85e9e22d89..ac28deb32cddf 100644 --- a/google/cloud/notebooks/v1/internal/notebook_tracing_stub.h +++ b/google/cloud/notebooks/v1/internal/notebook_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace notebooks_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotebookServiceTracingStub : public NotebookServiceStub { public: ~NotebookServiceTracingStub() override = default; @@ -426,8 +424,6 @@ class NotebookServiceTracingStub : public NotebookServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/notebooks/v1/managed_notebook_client.h b/google/cloud/notebooks/v1/managed_notebook_client.h index d99436ba1d942..037b298fb28a4 100644 --- a/google/cloud/notebooks/v1/managed_notebook_client.h +++ b/google/cloud/notebooks/v1/managed_notebook_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/managed_notebook_connection.h b/google/cloud/notebooks/v1/managed_notebook_connection.h index e792b6bc98885..9880e9028bb8e 100644 --- a/google/cloud/notebooks/v1/managed_notebook_connection.h +++ b/google/cloud/notebooks/v1/managed_notebook_connection.h @@ -21,6 +21,8 @@ #include "google/cloud/notebooks/v1/internal/managed_notebook_retry_traits.h" #include "google/cloud/notebooks/v1/managed_notebook_connection_idempotency_policy.h" +#include "google/cloud/notebooks/v1/managed_service.pb.h" +#include "google/cloud/notebooks/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v1/managed_notebook_connection_idempotency_policy.h b/google/cloud/notebooks/v1/managed_notebook_connection_idempotency_policy.h index 814c370d2a44c..f86f4b4141b2e 100644 --- a/google/cloud/notebooks/v1/managed_notebook_connection_idempotency_policy.h +++ b/google/cloud/notebooks/v1/managed_notebook_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_MANAGED_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_MANAGED_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/notebooks/v1/managed_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v1/notebook_client.h b/google/cloud/notebooks/v1/notebook_client.h index 1a99a48313fd5..ea5cf119e239c 100644 --- a/google/cloud/notebooks/v1/notebook_client.h +++ b/google/cloud/notebooks/v1/notebook_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v1/notebook_connection.h b/google/cloud/notebooks/v1/notebook_connection.h index 2af16793a5c7a..ef2f230794f1e 100644 --- a/google/cloud/notebooks/v1/notebook_connection.h +++ b/google/cloud/notebooks/v1/notebook_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/notebooks/v1/internal/notebook_retry_traits.h" #include "google/cloud/notebooks/v1/notebook_connection_idempotency_policy.h" +#include "google/cloud/notebooks/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v1/notebook_connection_idempotency_policy.h b/google/cloud/notebooks/v1/notebook_connection_idempotency_policy.h index 0b6c2d38e4078..8e315025d4950 100644 --- a/google/cloud/notebooks/v1/notebook_connection_idempotency_policy.h +++ b/google/cloud/notebooks/v1/notebook_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V1_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/notebooks/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v2/internal/notebook_auth_decorator.cc b/google/cloud/notebooks/v2/internal/notebook_auth_decorator.cc index d427e48a6290a..9fd0f85c6182c 100644 --- a/google/cloud/notebooks/v2/internal/notebook_auth_decorator.cc +++ b/google/cloud/notebooks/v2/internal/notebook_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/notebooks/v2/service.proto #include "google/cloud/notebooks/v2/internal/notebook_auth_decorator.h" -#include +#include "google/cloud/notebooks/v2/service.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_auth_decorator.h b/google/cloud/notebooks/v2/internal/notebook_auth_decorator.h index 93172b35dcf72..14cd3b0a724b1 100644 --- a/google/cloud/notebooks/v2/internal/notebook_auth_decorator.h +++ b/google/cloud/notebooks/v2/internal/notebook_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v2/internal/notebook_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_connection_impl.h b/google/cloud/notebooks/v2/internal/notebook_connection_impl.h index 01c855a3dd52a..0fc80c6648ab1 100644 --- a/google/cloud/notebooks/v2/internal/notebook_connection_impl.h +++ b/google/cloud/notebooks/v2/internal/notebook_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v2/internal/notebook_logging_decorator.cc b/google/cloud/notebooks/v2/internal/notebook_logging_decorator.cc index 4a8aa38a0f015..e3c8f67d1b1af 100644 --- a/google/cloud/notebooks/v2/internal/notebook_logging_decorator.cc +++ b/google/cloud/notebooks/v2/internal/notebook_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/notebooks/v2/service.proto #include "google/cloud/notebooks/v2/internal/notebook_logging_decorator.h" +#include "google/cloud/notebooks/v2/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_logging_decorator.h b/google/cloud/notebooks/v2/internal/notebook_logging_decorator.h index fbb9c01dcb892..9413fa33272e7 100644 --- a/google/cloud/notebooks/v2/internal/notebook_logging_decorator.h +++ b/google/cloud/notebooks/v2/internal/notebook_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v2/internal/notebook_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.cc b/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.cc index 6c40195db01a4..2bb87415d19c6 100644 --- a/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.cc +++ b/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/notebooks/v2/service.proto #include "google/cloud/notebooks/v2/internal/notebook_metadata_decorator.h" +#include "google/cloud/notebooks/v2/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 #include #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.h b/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.h index 9390f99263324..b0df5db255265 100644 --- a/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.h +++ b/google/cloud/notebooks/v2/internal/notebook_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/notebooks/v2/internal/notebook_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_stub.cc b/google/cloud/notebooks/v2/internal/notebook_stub.cc index 28e67e0ae555d..deabeb790e443 100644 --- a/google/cloud/notebooks/v2/internal/notebook_stub.cc +++ b/google/cloud/notebooks/v2/internal/notebook_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/notebooks/v2/service.proto #include "google/cloud/notebooks/v2/internal/notebook_stub.h" +#include "google/cloud/notebooks/v2/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_stub.h b/google/cloud/notebooks/v2/internal/notebook_stub.h index 704d2a52c1684..dad19aa30f9fc 100644 --- a/google/cloud/notebooks/v2/internal/notebook_stub.h +++ b/google/cloud/notebooks/v2/internal/notebook_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V2_INTERNAL_NOTEBOOK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V2_INTERNAL_NOTEBOOK_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/notebooks/v2/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc b/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc index 27da3d3f19bd1..c3e9842f47bbe 100644 --- a/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc +++ b/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/notebooks/v2/service.proto #include "google/cloud/notebooks/v2/internal/notebook_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/notebooks/v2/internal/notebook_auth_decorator.h" #include "google/cloud/notebooks/v2/internal/notebook_logging_decorator.h" #include "google/cloud/notebooks/v2/internal/notebook_metadata_decorator.h" #include "google/cloud/notebooks/v2/internal/notebook_stub.h" #include "google/cloud/notebooks/v2/internal/notebook_tracing_stub.h" +#include "google/cloud/notebooks/v2/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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc b/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc index a8dd89301de3e..e82a62d77714e 100644 --- a/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc +++ b/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace notebooks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotebookServiceTracingConnection::NotebookServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -406,16 +404,12 @@ Status NotebookServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotebookServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/notebooks/v2/internal/notebook_tracing_connection.h b/google/cloud/notebooks/v2/internal/notebook_tracing_connection.h index 731b10c943177..1627dae0cb8c6 100644 --- a/google/cloud/notebooks/v2/internal/notebook_tracing_connection.h +++ b/google/cloud/notebooks/v2/internal/notebook_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace notebooks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotebookServiceTracingConnection : public notebooks_v2::NotebookServiceConnection { public: @@ -190,8 +188,6 @@ class NotebookServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc b/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc index ccd2d9466602c..896afd0debd36 100644 --- a/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc +++ b/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace notebooks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - NotebookServiceTracingStub::NotebookServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -443,15 +441,9 @@ future NotebookServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeNotebookServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/notebooks/v2/internal/notebook_tracing_stub.h b/google/cloud/notebooks/v2/internal/notebook_tracing_stub.h index 983cb55e315fc..069e642c28942 100644 --- a/google/cloud/notebooks/v2/internal/notebook_tracing_stub.h +++ b/google/cloud/notebooks/v2/internal/notebook_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace notebooks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class NotebookServiceTracingStub : public NotebookServiceStub { public: ~NotebookServiceTracingStub() override = default; @@ -216,8 +214,6 @@ class NotebookServiceTracingStub : public NotebookServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/notebooks/v2/notebook_client.h b/google/cloud/notebooks/v2/notebook_client.h index f2bee21d195be..cbf3a5f6f318d 100644 --- a/google/cloud/notebooks/v2/notebook_client.h +++ b/google/cloud/notebooks/v2/notebook_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/notebooks/v2/notebook_connection.h b/google/cloud/notebooks/v2/notebook_connection.h index 92cd6bb84383f..33a411f49d9ec 100644 --- a/google/cloud/notebooks/v2/notebook_connection.h +++ b/google/cloud/notebooks/v2/notebook_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/notebooks/v2/internal/notebook_retry_traits.h" #include "google/cloud/notebooks/v2/notebook_connection_idempotency_policy.h" +#include "google/cloud/notebooks/v2/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/notebooks/v2/notebook_connection_idempotency_policy.h b/google/cloud/notebooks/v2/notebook_connection_idempotency_policy.h index 74754bd4ab416..0e8d467507c49 100644 --- a/google/cloud/notebooks/v2/notebook_connection_idempotency_policy.h +++ b/google/cloud/notebooks/v2/notebook_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V2_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_V2_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/notebooks/v2/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/oauth2/BUILD.bazel b/google/cloud/oauth2/BUILD.bazel index 9c183403236b5..b5b3f4d2d7c19 100644 --- a/google/cloud/oauth2/BUILD.bazel +++ b/google/cloud/oauth2/BUILD.bazel @@ -43,6 +43,6 @@ cc_library( ":google_cloud_cpp_oauth2", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_oauth2_unit_tests] diff --git a/google/cloud/opentelemetry/BUILD.bazel b/google/cloud/opentelemetry/BUILD.bazel index c47262a611ebd..08065ff265602 100644 --- a/google/cloud/opentelemetry/BUILD.bazel +++ b/google/cloud/opentelemetry/BUILD.bazel @@ -34,8 +34,8 @@ cc_library( "//:monitoring", "//:trace", "//google/cloud:google_cloud_cpp_rest_internal", - "@io_opentelemetry_cpp//sdk/src/metrics", - "@io_opentelemetry_cpp//sdk/src/trace", + "@opentelemetry-cpp//sdk/src/metrics", + "@opentelemetry-cpp//sdk/src/trace", ], ) diff --git a/google/cloud/opentelemetry/integration_tests/BUILD.bazel b/google/cloud/opentelemetry/integration_tests/BUILD.bazel index ab46542ae62dd..592eff7d7dfac 100644 --- a/google/cloud/opentelemetry/integration_tests/BUILD.bazel +++ b/google/cloud/opentelemetry/integration_tests/BUILD.bazel @@ -27,6 +27,6 @@ licenses(["notice"]) # Apache 2.0 "//:opentelemetry", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in opentelemetry_integration_tests] diff --git a/google/cloud/opentelemetry/integration_tests/configure_basic_tracing_integration_test.cc b/google/cloud/opentelemetry/integration_tests/configure_basic_tracing_integration_test.cc index ba8a8e9e8167e..63cecebcaba3a 100644 --- a/google/cloud/opentelemetry/integration_tests/configure_basic_tracing_integration_test.cc +++ b/google/cloud/opentelemetry/integration_tests/configure_basic_tracing_integration_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/opentelemetry/configure_basic_tracing.h" #include "google/cloud/trace/v1/trace_client.h" #include "google/cloud/internal/getenv.h" @@ -160,4 +159,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace otel } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/opentelemetry/integration_tests/monitoring_exporter_integration_test.cc b/google/cloud/opentelemetry/integration_tests/monitoring_exporter_integration_test.cc index 8c93dbd9fdc2d..e962f31f48b25 100644 --- a/google/cloud/opentelemetry/integration_tests/monitoring_exporter_integration_test.cc +++ b/google/cloud/opentelemetry/integration_tests/monitoring_exporter_integration_test.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace google { namespace cloud { @@ -40,7 +40,7 @@ using ::testing::IsEmpty; using ::testing::Not; namespace metrics_api = ::opentelemetry::metrics; namespace metrics_sdk = ::opentelemetry::sdk::metrics; -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; auto constexpr kJobName = "monitoring_exporter_integration_test"; auto constexpr kMeterName = @@ -59,9 +59,9 @@ void InstallExporter(std::unique_ptr exporter, // attributes which will map to a `generic_task`, which seems apt for this // workflow. auto resource = opentelemetry::sdk::resource::Resource::Create( - {{sc::kServiceNamespace, "gl-cpp"}, - {sc::kServiceName, kJobName}, - {sc::kServiceInstanceId, task_id}}); + {{sc::service::kServiceNamespace, "gl-cpp"}, + {sc::service::kServiceName, kJobName}, + {sc::service::kServiceInstanceId, task_id}}); // Initialize and set the global MeterProvider metrics_sdk::PeriodicExportingMetricReaderOptions options; diff --git a/google/cloud/opentelemetry/internal/monitored_resource.cc b/google/cloud/opentelemetry/internal/monitored_resource.cc index 24c0c08e514c7..b9b4d44eed2aa 100644 --- a/google/cloud/opentelemetry/internal/monitored_resource.cc +++ b/google/cloud/opentelemetry/internal/monitored_resource.cc @@ -20,10 +20,15 @@ #include "absl/types/variant.h" #include #include -#include +#include +#include +#include +#include +#include #include #include #include +#include namespace google { namespace cloud { @@ -31,7 +36,7 @@ namespace otel_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; struct AsStringVisitor { template @@ -86,22 +91,23 @@ class MonitoredResourceProvider { }; MonitoredResourceProvider GceInstance() { - return MonitoredResourceProvider("gce_instance", - { - {"zone", {{sc::kCloudAvailabilityZone}}}, - {"instance_id", {{sc::kHostId}}}, - }); + return MonitoredResourceProvider( + "gce_instance", { + {"zone", {{sc::cloud::kCloudAvailabilityZone}}}, + {"instance_id", {{sc::host::kHostId}}}, + }); } MonitoredResourceProvider K8sContainer() { return MonitoredResourceProvider( "k8s_container", { - {"location", {{sc::kCloudAvailabilityZone, sc::kCloudRegion}}}, - {"cluster_name", {{sc::kK8sClusterName}}}, - {"namespace_name", {{sc::kK8sNamespaceName}}}, - {"pod_name", {{sc::kK8sPodName}}}, - {"container_name", {{sc::kK8sContainerName}}}, + {"location", + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}}}, + {"cluster_name", {{sc::k8s::kK8sClusterName}}}, + {"namespace_name", {{sc::k8s::kK8sNamespaceName}}}, + {"pod_name", {{sc::k8s::kK8sPodName}}}, + {"container_name", {{sc::k8s::kK8sContainerName}}}, }); } @@ -109,10 +115,11 @@ MonitoredResourceProvider K8sPod() { return MonitoredResourceProvider( "k8s_pod", { - {"location", {{sc::kCloudAvailabilityZone, sc::kCloudRegion}}}, - {"cluster_name", {{sc::kK8sClusterName}}}, - {"namespace_name", {{sc::kK8sNamespaceName}}}, - {"pod_name", {{sc::kK8sPodName}}}, + {"location", + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}}}, + {"cluster_name", {{sc::k8s::kK8sClusterName}}}, + {"namespace_name", {{sc::k8s::kK8sNamespaceName}}}, + {"pod_name", {{sc::k8s::kK8sPodName}}}, }); } @@ -120,9 +127,10 @@ MonitoredResourceProvider K8sNode() { return MonitoredResourceProvider( "k8s_node", { - {"location", {{sc::kCloudAvailabilityZone, sc::kCloudRegion}}}, - {"cluster_name", {{sc::kK8sClusterName}}}, - {"node_name", {{sc::kK8sNodeName}}}, + {"location", + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}}}, + {"cluster_name", {{sc::k8s::kK8sClusterName}}}, + {"node_name", {{sc::k8s::kK8sNodeName}}}, }); } @@ -130,8 +138,9 @@ MonitoredResourceProvider K8sCluster() { return MonitoredResourceProvider( "k8s_cluster", { - {"location", {{sc::kCloudAvailabilityZone, sc::kCloudRegion}}}, - {"cluster_name", {{sc::kK8sClusterName}}}, + {"location", + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}}}, + {"cluster_name", {{sc::k8s::kK8sClusterName}}}, }); } @@ -139,10 +148,11 @@ MonitoredResourceProvider GaeInstance() { return MonitoredResourceProvider( "gae_instance", { - {"location", {{sc::kCloudAvailabilityZone, sc::kCloudRegion}}}, - {"module_id", {{sc::kFaasName}}}, - {"version_id", {{sc::kFaasVersion}}}, - {"instance_id", {{sc::kFaasInstance}}}, + {"location", + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}}}, + {"module_id", {{sc::faas::kFaasName}}}, + {"version_id", {{sc::faas::kFaasVersion}}}, + {"instance_id", {{sc::faas::kFaasInstance}}}, }); } @@ -150,9 +160,10 @@ MonitoredResourceProvider AwsEc2Instance() { return MonitoredResourceProvider( "aws_ec2_instance", { - {"instance_id", {{sc::kHostId}}}, - {"region", {{sc::kCloudAvailabilityZone, sc::kCloudRegion}}}, - {"aws_account", {{sc::kCloudAccountId}}}, + {"instance_id", {{sc::host::kHostId}}}, + {"region", + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}}}, + {"aws_account", {{sc::cloud::kCloudAccountId}}}, }); } @@ -161,10 +172,12 @@ MonitoredResourceProvider GenericTask() { "generic_task", { {"location", - {{sc::kCloudAvailabilityZone, sc::kCloudRegion}, "global"}}, - {"namespace", {{sc::kServiceNamespace}}}, - {"job", {{sc::kServiceName, sc::kFaasName}}}, - {"task_id", {{sc::kServiceInstanceId, sc::kFaasInstance}}}, + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}, + "global"}}, + {"namespace", {{sc::service::kServiceNamespace}}}, + {"job", {{sc::service::kServiceName, sc::faas::kFaasName}}}, + {"task_id", + {{sc::service::kServiceInstanceId, sc::faas::kFaasInstance}}}, }); } @@ -173,9 +186,10 @@ MonitoredResourceProvider GenericNode() { "generic_node", { {"location", - {{sc::kCloudAvailabilityZone, sc::kCloudRegion}, "global"}}, - {"namespace", {{sc::kServiceNamespace}}}, - {"node_id", {{sc::kHostId, sc::kHostName}}}, + {{sc::cloud::kCloudAvailabilityZone, sc::cloud::kCloudRegion}, + "global"}}, + {"namespace", {{sc::service::kServiceNamespace}}}, + {"node_id", {{sc::host::kHostId, sc::host::kHostName}}}, }); } @@ -185,20 +199,20 @@ MonitoredResourceProvider GenericNode() { MonitoredResourceProvider MakeProvider( opentelemetry::sdk::resource::ResourceAttributes const& attributes) { std::string platform; - auto p = attributes.find(sc::kCloudPlatform); + auto p = attributes.find(sc::cloud::kCloudPlatform); if (p != attributes.end()) platform = AsString(p->second); if (platform == "gcp_compute_engine") { return GceInstance(); } if (platform == "gcp_kubernetes_engine") { - if (attributes.find(sc::kK8sContainerName) != attributes.end()) { + if (attributes.find(sc::k8s::kK8sContainerName) != attributes.end()) { return K8sContainer(); } - if (attributes.find(sc::kK8sPodName) != attributes.end()) { + if (attributes.find(sc::k8s::kK8sPodName) != attributes.end()) { return K8sPod(); } - if (attributes.find(sc::kK8sNodeName) != attributes.end()) { + if (attributes.find(sc::k8s::kK8sNodeName) != attributes.end()) { return K8sNode(); } return K8sCluster(); @@ -209,10 +223,10 @@ MonitoredResourceProvider MakeProvider( if (platform == "aws_ec2") { return AwsEc2Instance(); } - if ((attributes.find(sc::kServiceName) != attributes.end() && - attributes.find(sc::kServiceInstanceId) != attributes.end()) || - (attributes.find(sc::kFaasName) != attributes.end() && - attributes.find(sc::kFaasInstance) != attributes.end())) { + if ((attributes.find(sc::service::kServiceName) != attributes.end() && + attributes.find(sc::service::kServiceInstanceId) != attributes.end()) || + (attributes.find(sc::faas::kFaasName) != attributes.end() && + attributes.find(sc::faas::kFaasInstance) != attributes.end())) { return GenericTask(); } return GenericNode(); @@ -222,7 +236,7 @@ MonitoredResourceProvider MakeProvider( std::string AsString( opentelemetry::sdk::common::OwnedAttributeValue const& attribute) { - return absl::visit(AsStringVisitor{}, attribute); + return std::visit(AsStringVisitor{}, attribute); } MonitoredResource ToMonitoredResource( diff --git a/google/cloud/opentelemetry/internal/monitored_resource_test.cc b/google/cloud/opentelemetry/internal/monitored_resource_test.cc index 217e43cf90426..b1e02253a3a27 100644 --- a/google/cloud/opentelemetry/internal/monitored_resource_test.cc +++ b/google/cloud/opentelemetry/internal/monitored_resource_test.cc @@ -16,14 +16,18 @@ #include "google/cloud/version.h" #include "absl/types/optional.h" #include -#include +#include +#include +#include +#include +#include namespace google { namespace cloud { namespace otel_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; using ::testing::Pair; using ::testing::UnorderedElementsAre; @@ -69,9 +73,9 @@ TEST(AsString, VectorsAreJoined) { TEST(MonitoredResource, GceInstance) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "gcp_compute_engine"}, - {sc::kHostId, "1020304050607080900"}, - {sc::kCloudAvailabilityZone, "us-central1-a"}, + {sc::cloud::kCloudPlatform, "gcp_compute_engine"}, + {sc::host::kHostId, "1020304050607080900"}, + {sc::cloud::kCloudAvailabilityZone, "us-central1-a"}, }; auto mr = ToMonitoredResource(attributes); @@ -94,14 +98,14 @@ TEST(MonitoredResource, K8sContainer) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "gcp_kubernetes_engine"}, - {sc::kK8sClusterName, "test-cluster"}, - {sc::kK8sNamespaceName, "test-namespace"}, - {sc::kK8sPodName, "test-pod"}, - {sc::kK8sContainerName, "test-container"}, + {sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"}, + {sc::k8s::kK8sClusterName, "test-cluster"}, + {sc::k8s::kK8sNamespaceName, "test-namespace"}, + {sc::k8s::kK8sPodName, "test-pod"}, + {sc::k8s::kK8sContainerName, "test-container"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "k8s_container"); @@ -127,13 +131,13 @@ TEST(MonitoredResource, K8sPod) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "gcp_kubernetes_engine"}, - {sc::kK8sClusterName, "test-cluster"}, - {sc::kK8sNamespaceName, "test-namespace"}, - {sc::kK8sPodName, "test-pod"}, + {sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"}, + {sc::k8s::kK8sClusterName, "test-cluster"}, + {sc::k8s::kK8sNamespaceName, "test-namespace"}, + {sc::k8s::kK8sPodName, "test-pod"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "k8s_pod"); @@ -158,12 +162,12 @@ TEST(MonitoredResource, K8sNode) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "gcp_kubernetes_engine"}, - {sc::kK8sClusterName, "test-cluster"}, - {sc::kK8sNodeName, "test-node"}, + {sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"}, + {sc::k8s::kK8sClusterName, "test-cluster"}, + {sc::k8s::kK8sNodeName, "test-node"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "k8s_node"); @@ -187,11 +191,11 @@ TEST(MonitoredResource, K8sCluster) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "gcp_kubernetes_engine"}, - {sc::kK8sClusterName, "test-cluster"}, + {sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"}, + {sc::k8s::kK8sClusterName, "test-cluster"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "k8s_cluster"); @@ -214,13 +218,13 @@ TEST(MonitoredResource, GaeInstance) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "gcp_app_engine"}, - {sc::kFaasName, "test-module"}, - {sc::kFaasVersion, "test-version"}, - {sc::kFaasInstance, "test-instance"}, + {sc::cloud::kCloudPlatform, "gcp_app_engine"}, + {sc::faas::kFaasName, "test-module"}, + {sc::faas::kFaasVersion, "test-version"}, + {sc::faas::kFaasInstance, "test-instance"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "gae_instance"); @@ -245,12 +249,12 @@ TEST(MonitoredResource, AwsEc2Instance) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudPlatform, "aws_ec2"}, - {sc::kHostId, "test-instance"}, - {sc::kCloudAccountId, "test-account"}, + {sc::cloud::kCloudPlatform, "aws_ec2"}, + {sc::host::kHostId, "test-instance"}, + {sc::cloud::kCloudAccountId, "test-account"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "aws_ec2_instance"); @@ -275,11 +279,11 @@ TEST(MonitoredResource, GenericTaskFaas) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kFaasName, "faas-name"}, - {sc::kFaasInstance, "faas-instance"}, + {sc::faas::kFaasName, "faas-name"}, + {sc::faas::kFaasInstance, "faas-instance"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "generic_task"); @@ -305,12 +309,12 @@ TEST(MonitoredResource, GenericTaskService) { }; for (auto const& test : tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kServiceNamespace, "test-namespace"}, - {sc::kServiceName, "test-name"}, - {sc::kServiceInstanceId, "test-instance"}, + {sc::service::kServiceNamespace, "test-namespace"}, + {sc::service::kServiceName, "test-name"}, + {sc::service::kServiceInstanceId, "test-instance"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "generic_task"); @@ -336,11 +340,11 @@ TEST(MonitoredResource, GenericNode) { }; for (auto const& test : location_tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kServiceNamespace, "test-namespace"}, - {sc::kHostId, "test-instance"}, + {sc::service::kServiceNamespace, "test-namespace"}, + {sc::host::kHostId, "test-instance"}, }; - if (test.zone) attributes[sc::kCloudAvailabilityZone] = *test.zone; - if (test.region) attributes[sc::kCloudRegion] = *test.region; + if (test.zone) attributes[sc::cloud::kCloudAvailabilityZone] = *test.zone; + if (test.region) attributes[sc::cloud::kCloudRegion] = *test.region; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "generic_node"); @@ -360,12 +364,12 @@ TEST(MonitoredResource, GenericNode) { }; for (auto const& test : node_id_tests) { auto attributes = opentelemetry::sdk::resource::ResourceAttributes{ - {sc::kCloudAvailabilityZone, "us-central1-a"}, - {sc::kCloudRegion, "us-central1"}, - {sc::kServiceNamespace, "test-namespace"}, - {sc::kHostName, "test-name"}, + {sc::cloud::kCloudAvailabilityZone, "us-central1-a"}, + {sc::cloud::kCloudRegion, "us-central1"}, + {sc::service::kServiceNamespace, "test-namespace"}, + {sc::host::kHostName, "test-name"}, }; - if (test.host_id) attributes[sc::kHostId] = *test.host_id; + if (test.host_id) attributes[sc::host::kHostId] = *test.host_id; auto mr = ToMonitoredResource(attributes); EXPECT_EQ(mr.type, "generic_node"); diff --git a/google/cloud/opentelemetry/internal/monitoring_exporter_test.cc b/google/cloud/opentelemetry/internal/monitoring_exporter_test.cc index 7602f35539626..f3e495bc5d0a2 100644 --- a/google/cloud/opentelemetry/internal/monitoring_exporter_test.cc +++ b/google/cloud/opentelemetry/internal/monitoring_exporter_test.cc @@ -20,6 +20,7 @@ #include #include #include +#include namespace google { namespace cloud { @@ -134,15 +135,14 @@ TEST(MonitoringExporter, ExportSuccess) { auto& labels = *resource.mutable_labels(); auto const& attributes = pda.attributes.GetAttributes(); labels["project_id"] = - absl::get(attributes.find("project_id")->second); + std::get(attributes.find("project_id")->second); labels["instance"] = - absl::get(attributes.find("instance")->second); + std::get(attributes.find("instance")->second); labels["cluster"] = - absl::get(attributes.find("cluster")->second); + std::get(attributes.find("cluster")->second); labels["table"] = - absl::get(attributes.find("table")->second); - labels["zone"] = - absl::get(attributes.find("zone")->second); + std::get(attributes.find("table")->second); + labels["zone"] = std::get(attributes.find("zone")->second); return std::make_pair(labels["project_id"], resource); }; diff --git a/google/cloud/opentelemetry/internal/recordable.cc b/google/cloud/opentelemetry/internal/recordable.cc index ca2623dc03c70..ec88aa5a8ef0c 100644 --- a/google/cloud/opentelemetry/internal/recordable.cc +++ b/google/cloud/opentelemetry/internal/recordable.cc @@ -19,6 +19,7 @@ #include "google/cloud/internal/noexcept_action.h" #include "google/cloud/internal/time_utils.h" #include "absl/time/time.h" +#include "absl/types/variant.h" #include #include @@ -207,7 +208,7 @@ void AddAttributeImpl( std::size_t limit) { auto* proto = ProtoOrDrop(attributes, key, limit); if (proto) { - absl::visit(AttributeVisitor{*proto}, value); + std::visit(AttributeVisitor{*proto}, value); } else { attributes.set_dropped_attributes_count( attributes.dropped_attributes_count() + 1); diff --git a/google/cloud/opentelemetry/internal/recordable.h b/google/cloud/opentelemetry/internal/recordable.h index 578a9d6fc9729..de3bd557eb460 100644 --- a/google/cloud/opentelemetry/internal/recordable.h +++ b/google/cloud/opentelemetry/internal/recordable.h @@ -17,8 +17,8 @@ #include "google/cloud/project.h" #include "google/cloud/version.h" -#include -#include +#include "google/devtools/cloudtrace/v2/trace.pb.h" +#include "google/devtools/cloudtrace/v2/tracing.pb.h" #include #include #include diff --git a/google/cloud/opentelemetry/internal/recordable_test.cc b/google/cloud/opentelemetry/internal/recordable_test.cc index 0d2ea0e91db9b..2622891fb8b7a 100644 --- a/google/cloud/opentelemetry/internal/recordable_test.cc +++ b/google/cloud/opentelemetry/internal/recordable_test.cc @@ -20,7 +20,8 @@ #include #include #include -#include +#include +#include namespace google { namespace cloud { @@ -28,7 +29,7 @@ namespace otel_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; namespace v2 = ::google::devtools::cloudtrace::v2; using ::testing::_; using ::testing::AllOf; @@ -674,10 +675,10 @@ TEST(Recordable, SetAttributeRespectsLimit) { TEST(Recordable, SetResourceMapsMonitoredResources) { auto resource = opentelemetry::sdk::resource::Resource::Create({ - {sc::kCloudProvider, "gcp"}, - {sc::kCloudPlatform, "gcp_compute_engine"}, - {sc::kHostId, "1020304050607080900"}, - {sc::kCloudAvailabilityZone, "us-central1-a"}, + {sc::cloud::kCloudProvider, "gcp"}, + {sc::cloud::kCloudPlatform, "gcp_compute_engine"}, + {sc::host::kHostId, "1020304050607080900"}, + {sc::cloud::kCloudAvailabilityZone, "us-central1-a"}, }); auto rec = Recordable(Project(kProjectId), TestGenerator()); diff --git a/google/cloud/opentelemetry/internal/resource_detector_impl.cc b/google/cloud/opentelemetry/internal/resource_detector_impl.cc index 99e03ba08c4dd..5f97035a8e330 100644 --- a/google/cloud/opentelemetry/internal/resource_detector_impl.cc +++ b/google/cloud/opentelemetry/internal/resource_detector_impl.cc @@ -23,7 +23,11 @@ #include "absl/strings/match.h" #include #include -#include +#include +#include +#include +#include +#include namespace google { namespace cloud { @@ -31,7 +35,7 @@ namespace otel_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; // The metadata server returns fully qualified names. (e.g. a zone may be // "projects/p/zones/us-central1-a"). Return the IDs only. @@ -84,8 +88,9 @@ class Parser { // environment variables into resource attributes. This populates the // `attributes_` member. void ProcessMetadataAndEnv() { - SetAttribute(sc::kCloudProvider, "gcp"); - SetAttribute(sc::kCloudAccountId, Metadata({"project", "projectId"})); + SetAttribute(sc::cloud::kCloudProvider, "gcp"); + SetAttribute(sc::cloud::kCloudAccountId, + Metadata({"project", "projectId"})); if (internal::GetEnv("KUBERNETES_SERVICE_HOST")) return Gke(); if (internal::GetEnv("FUNCTION_TARGET")) return CloudFunctions(); @@ -95,10 +100,10 @@ class Parser { } void Gke() { - SetAttribute(sc::kCloudPlatform, "gcp_kubernetes_engine"); - SetAttribute(sc::kK8sClusterName, + SetAttribute(sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"); + SetAttribute(sc::k8s::kK8sClusterName, Metadata({"instance", "attributes", "cluster-name"})); - SetAttribute(sc::kHostId, Metadata({"instance", "id"})); + SetAttribute(sc::host::kHostId, Metadata({"instance", "id"})); auto cluster_location = Tail(Metadata({"instance", "attributes", "cluster-location"})); @@ -106,48 +111,49 @@ class Parser { auto hyphen_count = std::count(cluster_location.begin(), cluster_location.end(), '-'); if (hyphen_count == 1) { - SetAttribute(sc::kCloudRegion, cluster_location); + SetAttribute(sc::cloud::kCloudRegion, cluster_location); } else if (hyphen_count == 2) { - SetAttribute(sc::kCloudAvailabilityZone, cluster_location); + SetAttribute(sc::cloud::kCloudAvailabilityZone, cluster_location); } } void CloudFunctions() { - SetAttribute(sc::kCloudPlatform, "gcp_cloud_functions"); - SetEnvAttribute(sc::kFaasName, "K_SERVICE"); - SetEnvAttribute(sc::kFaasVersion, "K_REVISION"); - SetAttribute(sc::kFaasInstance, Metadata({"instance", "id"})); + SetAttribute(sc::cloud::kCloudPlatform, "gcp_cloud_functions"); + SetEnvAttribute(sc::faas::kFaasName, "K_SERVICE"); + SetEnvAttribute(sc::faas::kFaasVersion, "K_REVISION"); + SetAttribute(sc::faas::kFaasInstance, Metadata({"instance", "id"})); } void CloudRun() { - SetAttribute(sc::kCloudPlatform, "gcp_cloud_run"); - SetEnvAttribute(sc::kFaasName, "K_SERVICE"); - SetEnvAttribute(sc::kFaasVersion, "K_REVISION"); - SetAttribute(sc::kFaasInstance, Metadata({"instance", "id"})); + SetAttribute(sc::cloud::kCloudPlatform, "gcp_cloud_run"); + SetEnvAttribute(sc::faas::kFaasName, "K_SERVICE"); + SetEnvAttribute(sc::faas::kFaasVersion, "K_REVISION"); + SetAttribute(sc::faas::kFaasInstance, Metadata({"instance", "id"})); } void Gae() { - SetAttribute(sc::kCloudPlatform, "gcp_app_engine"); - SetEnvAttribute(sc::kFaasName, "GAE_SERVICE"); - SetEnvAttribute(sc::kFaasVersion, "GAE_VERSION"); - SetEnvAttribute(sc::kFaasInstance, "GAE_INSTANCE"); + SetAttribute(sc::cloud::kCloudPlatform, "gcp_app_engine"); + SetEnvAttribute(sc::faas::kFaasName, "GAE_SERVICE"); + SetEnvAttribute(sc::faas::kFaasVersion, "GAE_VERSION"); + SetEnvAttribute(sc::faas::kFaasInstance, "GAE_INSTANCE"); auto zone = Tail(Metadata({"instance", "zone"})); - SetAttribute(sc::kCloudAvailabilityZone, zone); + SetAttribute(sc::cloud::kCloudAvailabilityZone, zone); auto const pos = zone.rfind('-'); - SetAttribute(sc::kCloudRegion, zone.substr(0, pos)); + SetAttribute(sc::cloud::kCloudRegion, zone.substr(0, pos)); } void Gce() { - SetAttribute(sc::kCloudPlatform, "gcp_compute_engine"); - SetAttribute(sc::kHostType, Tail(Metadata({"instance", "machineType"}))); - SetAttribute(sc::kHostId, Metadata({"instance", "id"})); - SetAttribute(sc::kHostName, Metadata({"instance", "name"})); + SetAttribute(sc::cloud::kCloudPlatform, "gcp_compute_engine"); + SetAttribute(sc::host::kHostType, + Tail(Metadata({"instance", "machineType"}))); + SetAttribute(sc::host::kHostId, Metadata({"instance", "id"})); + SetAttribute(sc::host::kHostName, Metadata({"instance", "name"})); auto zone = Tail(Metadata({"instance", "zone"})); - SetAttribute(sc::kCloudAvailabilityZone, zone); + SetAttribute(sc::cloud::kCloudAvailabilityZone, zone); auto const pos = zone.rfind('-'); - SetAttribute(sc::kCloudRegion, zone.substr(0, pos)); + SetAttribute(sc::cloud::kCloudRegion, zone.substr(0, pos)); } std::string Metadata(std::deque keys) { diff --git a/google/cloud/opentelemetry/internal/resource_detector_impl_test.cc b/google/cloud/opentelemetry/internal/resource_detector_impl_test.cc index bb790c5726305..d30e444c1d1a2 100644 --- a/google/cloud/opentelemetry/internal/resource_detector_impl_test.cc +++ b/google/cloud/opentelemetry/internal/resource_detector_impl_test.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/opentelemetry/internal/resource_detector_impl.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/compute_engine_util.h" @@ -25,7 +24,11 @@ #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/version.h" #include -#include +#include +#include +#include +#include +#include namespace google { namespace cloud { @@ -33,7 +36,7 @@ namespace otel { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; using ::google::cloud::testing_util::MakeMockHttpPayloadSuccess; using ::google::cloud::testing_util::MockHttpPayload; using ::google::cloud::testing_util::MockRestClient; @@ -118,9 +121,8 @@ TEST(ResourceDetector, RetriesTransientConnectionError) { auto resource = detector->Detect(); auto const& attributes = resource.GetAttributes(); - EXPECT_THAT( - attributes, - Not(Contains(OTelAttribute(sc::kCloudProvider, "gcp")))); + EXPECT_THAT(attributes, Not(Contains(OTelAttribute( + sc::cloud::kCloudProvider, "gcp")))); EXPECT_THAT( log.ExtractLines(), @@ -142,9 +144,8 @@ TEST(ResourceDetector, PermanentConnectionError) { auto resource = detector->Detect(); auto const& attributes = resource.GetAttributes(); - EXPECT_THAT( - attributes, - Not(Contains(OTelAttribute(sc::kCloudProvider, "gcp")))); + EXPECT_THAT(attributes, Not(Contains(OTelAttribute( + sc::cloud::kCloudProvider, "gcp")))); EXPECT_THAT(log.ExtractLines(), Contains(AllOf(HasSubstr("Could not query the metadata server"), @@ -172,9 +173,8 @@ TEST(ResourceDetector, HttpError) { auto resource = detector->Detect(); auto const& attributes = resource.GetAttributes(); - EXPECT_THAT( - attributes, - Not(Contains(OTelAttribute(sc::kCloudProvider, "gcp")))); + EXPECT_THAT(attributes, Not(Contains(OTelAttribute( + sc::cloud::kCloudProvider, "gcp")))); EXPECT_THAT(log.ExtractLines(), Contains(AllOf(HasSubstr("Could not query the metadata server"), @@ -209,9 +209,8 @@ TEST(ResourceDetector, ValidatesHeaders) { auto resource = detector->Detect(); auto const& attributes = resource.GetAttributes(); - EXPECT_THAT( - attributes, - Not(Contains(OTelAttribute(sc::kCloudProvider, "gcp")))); + EXPECT_THAT(attributes, Not(Contains(OTelAttribute( + sc::cloud::kCloudProvider, "gcp")))); EXPECT_THAT( log.ExtractLines(), @@ -246,9 +245,8 @@ TEST(ResourceDetector, PayloadReadError) { auto resource = detector->Detect(); auto const& attributes = resource.GetAttributes(); - EXPECT_THAT( - attributes, - Not(Contains(OTelAttribute(sc::kCloudProvider, "gcp")))); + EXPECT_THAT(attributes, Not(Contains(OTelAttribute( + sc::cloud::kCloudProvider, "gcp")))); EXPECT_THAT(log.ExtractLines(), Contains(AllOf(HasSubstr("Could not query the metadata server"), @@ -304,13 +302,14 @@ TEST(ResourceDetector, GkeRegion) { EXPECT_THAT( attributes, IsSupersetOf({ - OTelAttribute(sc::kCloudProvider, "gcp"), - OTelAttribute(sc::kCloudAccountId, "test-project"), - OTelAttribute(sc::kCloudPlatform, + OTelAttribute(sc::cloud::kCloudProvider, "gcp"), + OTelAttribute(sc::cloud::kCloudAccountId, + "test-project"), + OTelAttribute(sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"), - OTelAttribute(sc::kK8sClusterName, "test-cluster"), - OTelAttribute(sc::kHostId, "1020304050607080900"), - OTelAttribute(sc::kCloudRegion, "us-central1"), + OTelAttribute(sc::k8s::kK8sClusterName, "test-cluster"), + OTelAttribute(sc::host::kHostId, "1020304050607080900"), + OTelAttribute(sc::cloud::kCloudRegion, "us-central1"), })); } @@ -336,13 +335,14 @@ TEST(ResourceDetector, GkeZone) { EXPECT_THAT( attributes, IsSupersetOf({ - OTelAttribute(sc::kCloudProvider, "gcp"), - OTelAttribute(sc::kCloudAccountId, "test-project"), - OTelAttribute(sc::kCloudPlatform, + OTelAttribute(sc::cloud::kCloudProvider, "gcp"), + OTelAttribute(sc::cloud::kCloudAccountId, + "test-project"), + OTelAttribute(sc::cloud::kCloudPlatform, "gcp_kubernetes_engine"), - OTelAttribute(sc::kK8sClusterName, "test-cluster"), - OTelAttribute(sc::kHostId, "1020304050607080900"), - OTelAttribute(sc::kCloudAvailabilityZone, + OTelAttribute(sc::k8s::kK8sClusterName, "test-cluster"), + OTelAttribute(sc::host::kHostId, "1020304050607080900"), + OTelAttribute(sc::cloud::kCloudAvailabilityZone, "us-central1-a"), })); } @@ -368,12 +368,15 @@ TEST(ResourceDetector, CloudFunctions) { EXPECT_THAT( attributes, IsSupersetOf({ - OTelAttribute(sc::kCloudProvider, "gcp"), - OTelAttribute(sc::kCloudAccountId, "test-project"), - OTelAttribute(sc::kCloudPlatform, "gcp_cloud_functions"), - OTelAttribute(sc::kFaasName, "test-service"), - OTelAttribute(sc::kFaasVersion, "test-version"), - OTelAttribute(sc::kFaasInstance, "1020304050607080900"), + OTelAttribute(sc::cloud::kCloudProvider, "gcp"), + OTelAttribute(sc::cloud::kCloudAccountId, + "test-project"), + OTelAttribute(sc::cloud::kCloudPlatform, + "gcp_cloud_functions"), + OTelAttribute(sc::faas::kFaasName, "test-service"), + OTelAttribute(sc::faas::kFaasVersion, "test-version"), + OTelAttribute(sc::faas::kFaasInstance, + "1020304050607080900"), })); } @@ -399,12 +402,15 @@ TEST(ResourceDetector, CloudRun) { EXPECT_THAT( attributes, IsSupersetOf({ - OTelAttribute(sc::kCloudProvider, "gcp"), - OTelAttribute(sc::kCloudAccountId, "test-project"), - OTelAttribute(sc::kCloudPlatform, "gcp_cloud_run"), - OTelAttribute(sc::kFaasName, "test-service"), - OTelAttribute(sc::kFaasVersion, "test-version"), - OTelAttribute(sc::kFaasInstance, "1020304050607080900"), + OTelAttribute(sc::cloud::kCloudProvider, "gcp"), + OTelAttribute(sc::cloud::kCloudAccountId, + "test-project"), + OTelAttribute(sc::cloud::kCloudPlatform, + "gcp_cloud_run"), + OTelAttribute(sc::faas::kFaasName, "test-service"), + OTelAttribute(sc::faas::kFaasVersion, "test-version"), + OTelAttribute(sc::faas::kFaasInstance, + "1020304050607080900"), })); } @@ -431,15 +437,17 @@ TEST(ResourceDetector, Gae) { EXPECT_THAT( attributes, IsSupersetOf({ - OTelAttribute(sc::kCloudProvider, "gcp"), - OTelAttribute(sc::kCloudAccountId, "test-project"), - OTelAttribute(sc::kCloudPlatform, "gcp_app_engine"), - OTelAttribute(sc::kFaasName, "test-service"), - OTelAttribute(sc::kFaasVersion, "test-version"), - OTelAttribute(sc::kFaasInstance, "test-instance"), - OTelAttribute(sc::kCloudAvailabilityZone, + OTelAttribute(sc::cloud::kCloudProvider, "gcp"), + OTelAttribute(sc::cloud::kCloudAccountId, + "test-project"), + OTelAttribute(sc::cloud::kCloudPlatform, + "gcp_app_engine"), + OTelAttribute(sc::faas::kFaasName, "test-service"), + OTelAttribute(sc::faas::kFaasVersion, "test-version"), + OTelAttribute(sc::faas::kFaasInstance, "test-instance"), + OTelAttribute(sc::cloud::kCloudAvailabilityZone, "us-central1-a"), - OTelAttribute(sc::kCloudRegion, "us-central1"), + OTelAttribute(sc::cloud::kCloudRegion, "us-central1"), })); } @@ -467,15 +475,17 @@ TEST(ResourceDetector, Gce) { EXPECT_THAT( attributes, IsSupersetOf({ - OTelAttribute(sc::kCloudProvider, "gcp"), - OTelAttribute(sc::kCloudAccountId, "test-project"), - OTelAttribute(sc::kCloudPlatform, "gcp_compute_engine"), - OTelAttribute(sc::kHostType, "c2d-standard-16"), - OTelAttribute(sc::kHostId, "1020304050607080900"), - OTelAttribute(sc::kHostName, "test-instance"), - OTelAttribute(sc::kCloudAvailabilityZone, + OTelAttribute(sc::cloud::kCloudProvider, "gcp"), + OTelAttribute(sc::cloud::kCloudAccountId, + "test-project"), + OTelAttribute(sc::cloud::kCloudPlatform, + "gcp_compute_engine"), + OTelAttribute(sc::host::kHostType, "c2d-standard-16"), + OTelAttribute(sc::host::kHostId, "1020304050607080900"), + OTelAttribute(sc::host::kHostName, "test-instance"), + OTelAttribute(sc::cloud::kCloudAvailabilityZone, "us-central1-a"), - OTelAttribute(sc::kCloudRegion, "us-central1"), + OTelAttribute(sc::cloud::kCloudRegion, "us-central1"), })); } @@ -507,4 +517,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace otel } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/opentelemetry/internal/time_series.cc b/google/cloud/opentelemetry/internal/time_series.cc index effd72a807b3d..5d829f3ab965d 100644 --- a/google/cloud/opentelemetry/internal/time_series.cc +++ b/google/cloud/opentelemetry/internal/time_series.cc @@ -20,8 +20,9 @@ #include #include #include -#include +#include #include +#include namespace google { namespace cloud { @@ -29,7 +30,7 @@ namespace otel_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; google::protobuf::Timestamp ToProtoTimestamp( opentelemetry::common::SystemTimestamp ts) { @@ -40,10 +41,10 @@ google::protobuf::Timestamp ToProtoTimestamp( google::monitoring::v3::TypedValue ToValue( opentelemetry::sdk::metrics::ValueType value) { google::monitoring::v3::TypedValue proto; - if (absl::holds_alternative(value)) { - proto.set_double_value(absl::get(value)); + if (std::holds_alternative(value)) { + proto.set_double_value(std::get(value)); } else { - proto.set_int64_value(absl::get(value)); + proto.set_int64_value(std::get(value)); } return proto; } @@ -62,9 +63,9 @@ google::api::MetricDescriptor::ValueType ToValueType( } double AsDouble(opentelemetry::sdk::metrics::ValueType const& v) { - return absl::holds_alternative(v) - ? absl::get(v) - : static_cast(absl::get(v)); + return std::holds_alternative(v) + ? std::get(v) + : static_cast(std::get(v)); } std::vector ToRequestsHelper( @@ -112,12 +113,21 @@ void ToTimeSeriesHelper( opentelemetry::sdk::metrics::HistogramPointData const& point) { return ToTimeSeries(metric_data, point); } +#if OPENTELEMETRY_VERSION_MAJOR > 1 || \ + (OPENTELEMETRY_VERSION_MAJOR == 1 && OPENTELEMETRY_VERSION_MINOR >= 21) + absl::optional operator()( + opentelemetry::sdk::metrics:: + Base2ExponentialHistogramPointData const&) { + // TODO(#xxxxx): Add support for exponential histograms. + return absl::nullopt; + } +#endif absl::optional operator()( opentelemetry::sdk::metrics::DropPointData const&) { return absl::nullopt; } }; - auto ts = absl::visit(Visitor{metric_data}, pda.point_data); + auto ts = std::visit(Visitor{metric_data}, pda.point_data); if (!ts) continue; ts->set_unit(metric_data.instrument_descriptor.unit_); ts_collector_fn(metric_data, pda, *std::move(ts)); @@ -164,9 +174,9 @@ google::api::Metric ToMetric( // service processes on a single GCE VM. auto const& ra = resource->GetAttributes().GetAttributes(); for (std::string key : { - sc::kServiceName, - sc::kServiceNamespace, - sc::kServiceInstanceId, + sc::service::kServiceName, + sc::service::kServiceNamespace, + sc::service::kServiceInstanceId, }) { auto it = ra.find(std::move(key)); if (it != ra.end()) add_label(labels, it->first, it->second); diff --git a/google/cloud/opentelemetry/internal/time_series.h b/google/cloud/opentelemetry/internal/time_series.h index 6dc40b375b8a1..92c21bc2969ad 100644 --- a/google/cloud/opentelemetry/internal/time_series.h +++ b/google/cloud/opentelemetry/internal/time_series.h @@ -18,9 +18,9 @@ #include "google/cloud/opentelemetry/internal/monitoring_exporter.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include -#include -#include +#include "google/api/metric.pb.h" +#include "google/api/monitored_resource.pb.h" +#include "google/monitoring/v3/metric_service.pb.h" #include #include #include diff --git a/google/cloud/opentelemetry/internal/time_series_test.cc b/google/cloud/opentelemetry/internal/time_series_test.cc index c436ea715466c..ef2df414ec630 100644 --- a/google/cloud/opentelemetry/internal/time_series_test.cc +++ b/google/cloud/opentelemetry/internal/time_series_test.cc @@ -23,7 +23,9 @@ #include #include #include -#include +#include +#include +#include #include #include @@ -33,7 +35,7 @@ namespace otel_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = opentelemetry::sdk::resource::SemanticConventions; +namespace sc = opentelemetry::semconv; using ::google::cloud::testing_util::IsProtoEqual; using ::google::protobuf::TextFormat; @@ -137,10 +139,10 @@ auto Interval(std::chrono::system_clock::time_point start, auto TestResource() { return opentelemetry::sdk::resource::Resource::Create({ - {sc::kCloudProvider, "gcp"}, - {sc::kCloudPlatform, "gcp_compute_engine"}, - {sc::kHostId, "1020304050607080900"}, - {sc::kCloudAvailabilityZone, "us-central1-a"}, + {sc::cloud::kCloudProvider, "gcp"}, + {sc::cloud::kCloudPlatform, "gcp_compute_engine"}, + {sc::host::kHostId, "1020304050607080900"}, + {sc::cloud::kCloudAvailabilityZone, "us-central1-a"}, }); } @@ -284,9 +286,9 @@ TEST(ToMetric, IncludesServiceLabelsFromResource) { opentelemetry::sdk::resource::ResourceAttributes resource_attributes = { {"unused", "unused"}, - {sc::kServiceName, "test-name"}, - {sc::kServiceNamespace, "test-namespace"}, - {sc::kServiceInstanceId, "test-instance"}, + {sc::service::kServiceName, "test-name"}, + {sc::service::kServiceNamespace, "test-namespace"}, + {sc::service::kServiceInstanceId, "test-instance"}, }; auto resource = opentelemetry::sdk::resource::Resource::Create(resource_attributes); @@ -310,9 +312,9 @@ TEST(ToMetric, PointAttributesOverServiceResourceAttributes) { }; opentelemetry::sdk::resource::ResourceAttributes resource_attributes = { - {sc::kServiceName, "resource-name"}, - {sc::kServiceNamespace, "resource-namespace"}, - {sc::kServiceInstanceId, "resource-instance"}, + {sc::service::kServiceName, "resource-name"}, + {sc::service::kServiceNamespace, "resource-namespace"}, + {sc::service::kServiceInstanceId, "resource-instance"}, }; auto resource = opentelemetry::sdk::resource::Resource::Create(resource_attributes); @@ -333,17 +335,17 @@ TEST(ToMetric, ResourceFilter) { {"service_name", "point-name"}, {"service_namespace", "point-namespace"}, {"service_instance_id", "point-instance"}, - {sc::kServiceName, "resource-name"}, - {sc::kServiceNamespace, "resource-namespace"}, - {sc::kServiceInstanceId, "resource-instance"}, + {sc::service::kServiceName, "resource-name"}, + {sc::service::kServiceNamespace, "resource-namespace"}, + {sc::service::kServiceInstanceId, "resource-instance"}, }; auto resource = opentelemetry::sdk::resource::Resource::Create({}); auto resource_filter_fn = [resource_labels = std::set{ - sc::kServiceName, sc::kServiceNamespace, - sc::kServiceInstanceId}](std::string const& l) { + sc::service::kServiceName, sc::service::kServiceNamespace, + sc::service::kServiceInstanceId}](std::string const& l) { return internal::Contains(resource_labels, l); }; diff --git a/google/cloud/opentelemetry/quickstart/.bazelrc b/google/cloud/opentelemetry/quickstart/.bazelrc index 0a6d8b05a5f4f..f31313cf406a4 100644 --- a/google/cloud/opentelemetry/quickstart/.bazelrc +++ b/google/cloud/opentelemetry/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -45,3 +45,4 @@ build --@google_cloud_cpp//:enable_opentelemetry #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/opentelemetry/trace_exporter_test.cc b/google/cloud/opentelemetry/trace_exporter_test.cc index 08802fb19f0f8..bc8cdf8695227 100644 --- a/google/cloud/opentelemetry/trace_exporter_test.cc +++ b/google/cloud/opentelemetry/trace_exporter_test.cc @@ -116,7 +116,6 @@ TEST(TraceExporter, LogsOnError) { HasSubstr("UNAVAILABLE"), HasSubstr("try again later")))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::ScopedEnvironment; using ::testing::IsEmpty; @@ -140,7 +139,6 @@ TEST(TraceExporter, NoInfiniteExportLoop14611) { // Verify that no spans were created. EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/optimization/BUILD.bazel b/google/cloud/optimization/BUILD.bazel index 6b91e836fc28e..4f0cfaa51adae 100644 --- a/google/cloud/optimization/BUILD.bazel +++ b/google/cloud/optimization/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/optimization/v1:optimization_cc_grpc", + "@googleapis//google/cloud/optimization/v1:optimization_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/optimization/quickstart/.bazelrc b/google/cloud/optimization/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/optimization/quickstart/.bazelrc +++ b/google/cloud/optimization/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/optimization/v1/fleet_routing_client.h b/google/cloud/optimization/v1/fleet_routing_client.h index b374e6fe177df..9fc8dbe636252 100644 --- a/google/cloud/optimization/v1/fleet_routing_client.h +++ b/google/cloud/optimization/v1/fleet_routing_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/optimization/v1/fleet_routing_connection.h b/google/cloud/optimization/v1/fleet_routing_connection.h index 9dd07af27bbb5..8c00cd1218900 100644 --- a/google/cloud/optimization/v1/fleet_routing_connection.h +++ b/google/cloud/optimization/v1/fleet_routing_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_V1_FLEET_ROUTING_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_V1_FLEET_ROUTING_CONNECTION_H +#include "google/cloud/optimization/v1/fleet_routing.pb.h" #include "google/cloud/optimization/v1/fleet_routing_connection_idempotency_policy.h" #include "google/cloud/optimization/v1/internal/fleet_routing_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -29,8 +30,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/optimization/v1/fleet_routing_connection_idempotency_policy.h b/google/cloud/optimization/v1/fleet_routing_connection_idempotency_policy.h index c9c74a6f95cb6..194d8e40e2632 100644 --- a/google/cloud/optimization/v1/fleet_routing_connection_idempotency_policy.h +++ b/google/cloud/optimization/v1/fleet_routing_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_V1_FLEET_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_V1_FLEET_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/optimization/v1/fleet_routing.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.cc b/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.cc index 70aa6517a53ce..4f365c04fba4d 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/optimization/v1/fleet_routing.proto #include "google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.h" -#include +#include "google/cloud/optimization/v1/fleet_routing.grpc.pb.h" #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.h b/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.h index ceca64c42b3ee..d448f8b001472 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/optimization/v1/internal/fleet_routing_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_connection_impl.h b/google/cloud/optimization/v1/internal/fleet_routing_connection_impl.h index 78d761dfb76d4..6ac00c51b9683 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_connection_impl.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.cc b/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.cc index 5f191dbd6189b..edb83879d6c5f 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/optimization/v1/fleet_routing.proto #include "google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.h" +#include "google/cloud/optimization/v1/fleet_routing.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.h b/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.h index 8b4858fbebb2b..2e4fcb1773c21 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/optimization/v1/internal/fleet_routing_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.cc b/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.cc index a4d8d4a19562a..5641fd3423340 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/optimization/v1/fleet_routing.proto #include "google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.h" +#include "google/cloud/optimization/v1/fleet_routing.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 #include #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.h b/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.h index e44f246dc6288..5913566047dc9 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/optimization/v1/internal/fleet_routing_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_stub.cc b/google/cloud/optimization/v1/internal/fleet_routing_stub.cc index 3bfd0d174006e..7f7642e5150f7 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_stub.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/optimization/v1/fleet_routing.proto #include "google/cloud/optimization/v1/internal/fleet_routing_stub.h" +#include "google/cloud/optimization/v1/fleet_routing.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_stub.h b/google/cloud/optimization/v1/internal/fleet_routing_stub.h index d0971aa7b2a11..21fcdc54109c5 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_stub.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_V1_INTERNAL_FLEET_ROUTING_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_V1_INTERNAL_FLEET_ROUTING_STUB_H +#include "google/cloud/optimization/v1/fleet_routing.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc b/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc index cbe797b6aae3f..0d94a8ec1c517 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/optimization/v1/fleet_routing.proto #include "google/cloud/optimization/v1/internal/fleet_routing_stub_factory.h" +#include "google/cloud/optimization/v1/fleet_routing.grpc.pb.h" #include "google/cloud/optimization/v1/internal/fleet_routing_auth_decorator.h" #include "google/cloud/optimization/v1/internal/fleet_routing_logging_decorator.h" #include "google/cloud/optimization/v1/internal/fleet_routing_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc b/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc index 431f8a34b7678..b7c690f185d7b 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace optimization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FleetRoutingTracingConnection::FleetRoutingTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -81,16 +79,12 @@ FleetRoutingTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFleetRoutingTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.h b/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.h index da337f4e74fbe..6ddd8154a1492 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace optimization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FleetRoutingTracingConnection : public optimization_v1::FleetRoutingConnection { public: @@ -64,8 +62,6 @@ class FleetRoutingTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc b/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc index ae3dfca5e7822..434ba64e296c0 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace optimization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FleetRoutingTracingStub::FleetRoutingTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -110,15 +108,9 @@ future FleetRoutingTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFleetRoutingTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.h b/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.h index 56d673ff901e9..1ef14ffae717b 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace optimization_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FleetRoutingTracingStub : public FleetRoutingStub { public: ~FleetRoutingTracingStub() override = default; @@ -77,8 +75,6 @@ class FleetRoutingTracingStub : public FleetRoutingStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/oracledatabase/BUILD.bazel b/google/cloud/oracledatabase/BUILD.bazel index 22323896ca295..96503ba64daee 100644 --- a/google/cloud/oracledatabase/BUILD.bazel +++ b/google/cloud/oracledatabase/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/oracledatabase/v1:oracledatabase_cc_grpc", + "@googleapis//google/cloud/oracledatabase/v1:oracledatabase_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.cc index 56cb5d2227334..1e03ede5393a2 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/oracledatabase/v1/oracledatabase.proto #include "google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.h" -#include +#include "google/cloud/oracledatabase/v1/oracledatabase.grpc.pb.h" #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.h b/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.h index 27c02e2708185..df55d277f9f6b 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/oracledatabase/v1/internal/oracle_database_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_connection_impl.h b/google/cloud/oracledatabase/v1/internal/oracle_database_connection_impl.h index 3b68553918a17..6bef3c2a44add 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_connection_impl.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.cc index 00023bafb8fef..8d8a8d28c2741 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/oracledatabase/v1/oracledatabase.proto #include "google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.h b/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.h index 5f771f08ff92f..84b8f50ee0a3b 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/oracledatabase/v1/internal/oracle_database_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.cc index 88035ed2f61ec..036913e45e964 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/oracledatabase/v1/oracledatabase.proto #include "google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.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 #include #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.h b/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.h index d472a6ace871b..6dac8e495e980 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/oracledatabase/v1/internal/oracle_database_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_stub.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_stub.cc index 77844450513d2..dff90a8e38afb 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_stub.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/oracledatabase/v1/oracledatabase.proto #include "google/cloud/oracledatabase/v1/internal/oracle_database_stub.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_stub.h b/google/cloud/oracledatabase/v1/internal/oracle_database_stub.h index d5073e12fae2e..f2e3c2f1873bd 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_stub.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORACLEDATABASE_V1_INTERNAL_ORACLE_DATABASE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORACLEDATABASE_V1_INTERNAL_ORACLE_DATABASE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_stub_factory.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_stub_factory.cc index c70f13b9909b9..ffaf085882e35 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_stub_factory.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/oracledatabase/v1/oracledatabase.proto #include "google/cloud/oracledatabase/v1/internal/oracle_database_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/oracledatabase/v1/internal/oracle_database_auth_decorator.h" #include "google/cloud/oracledatabase/v1/internal/oracle_database_logging_decorator.h" #include "google/cloud/oracledatabase/v1/internal/oracle_database_metadata_decorator.h" #include "google/cloud/oracledatabase/v1/internal/oracle_database_stub.h" #include "google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.cc index a88649d174aad..d5fcbd9ce827a 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace oracledatabase_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OracleDatabaseTracingConnection::OracleDatabaseTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1294,16 +1292,12 @@ Status OracleDatabaseTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOracleDatabaseTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.h b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.h index 71da61c6338eb..f4a44c88b0daf 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace oracledatabase_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OracleDatabaseTracingConnection : public oracledatabase_v1::OracleDatabaseConnection { public: @@ -552,8 +550,6 @@ class OracleDatabaseTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.cc b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.cc index dcf9a1bb8162d..336c10792563a 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.cc +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace oracledatabase_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OracleDatabaseTracingStub::OracleDatabaseTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1330,15 +1328,9 @@ future OracleDatabaseTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOracleDatabaseTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.h b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.h index c4c7afa12b9a9..bcf67877b0f4f 100644 --- a/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.h +++ b/google/cloud/oracledatabase/v1/internal/oracle_database_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace oracledatabase_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OracleDatabaseTracingStub : public OracleDatabaseStub { public: ~OracleDatabaseTracingStub() override = default; @@ -583,8 +581,6 @@ class OracleDatabaseTracingStub : public OracleDatabaseStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/oracledatabase/v1/oracle_database_client.h b/google/cloud/oracledatabase/v1/oracle_database_client.h index 3ce0e8f5dd506..12270b0d66c01 100644 --- a/google/cloud/oracledatabase/v1/oracle_database_client.h +++ b/google/cloud/oracledatabase/v1/oracle_database_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/oracledatabase/v1/oracle_database_connection.h b/google/cloud/oracledatabase/v1/oracle_database_connection.h index 470de8cf9c3aa..ba03b59bbe068 100644 --- a/google/cloud/oracledatabase/v1/oracle_database_connection.h +++ b/google/cloud/oracledatabase/v1/oracle_database_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/oracledatabase/v1/internal/oracle_database_retry_traits.h" #include "google/cloud/oracledatabase/v1/oracle_database_connection_idempotency_policy.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/oracledatabase/v1/oracle_database_connection_idempotency_policy.h b/google/cloud/oracledatabase/v1/oracle_database_connection_idempotency_policy.h index 3c38a367d2bdd..a696d8c00200c 100644 --- a/google/cloud/oracledatabase/v1/oracle_database_connection_idempotency_policy.h +++ b/google/cloud/oracledatabase/v1/oracle_database_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORACLEDATABASE_V1_ORACLE_DATABASE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORACLEDATABASE_V1_ORACLE_DATABASE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/oracledatabase/v1/oracledatabase.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/orgpolicy/BUILD.bazel b/google/cloud/orgpolicy/BUILD.bazel index 79d31c5db38c9..bb5923f1629d9 100644 --- a/google/cloud/orgpolicy/BUILD.bazel +++ b/google/cloud/orgpolicy/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/orgpolicy/v2:orgpolicy_cc_grpc", + "@googleapis//google/cloud/orgpolicy/v2:orgpolicy_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/orgpolicy/quickstart/.bazelrc b/google/cloud/orgpolicy/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/orgpolicy/quickstart/.bazelrc +++ b/google/cloud/orgpolicy/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_auth_decorator.cc b/google/cloud/orgpolicy/v2/internal/org_policy_auth_decorator.cc index 2a6d572c9932e..00659dc7d1fd9 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_auth_decorator.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/orgpolicy/v2/orgpolicy.proto #include "google/cloud/orgpolicy/v2/internal/org_policy_auth_decorator.h" -#include +#include "google/cloud/orgpolicy/v2/orgpolicy.grpc.pb.h" #include #include diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_logging_decorator.cc b/google/cloud/orgpolicy/v2/internal/org_policy_logging_decorator.cc index 54d3226c166c6..dc17aad0c64e0 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_logging_decorator.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/orgpolicy/v2/orgpolicy.proto #include "google/cloud/orgpolicy/v2/internal/org_policy_logging_decorator.h" +#include "google/cloud/orgpolicy/v2/orgpolicy.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_metadata_decorator.cc b/google/cloud/orgpolicy/v2/internal/org_policy_metadata_decorator.cc index e8a5330dc76f2..449e4f3db23fc 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_metadata_decorator.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/orgpolicy/v2/orgpolicy.proto #include "google/cloud/orgpolicy/v2/internal/org_policy_metadata_decorator.h" +#include "google/cloud/orgpolicy/v2/orgpolicy.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 #include #include #include diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_stub.cc b/google/cloud/orgpolicy/v2/internal/org_policy_stub.cc index 1a91af573ca15..b516d0bb29078 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_stub.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/orgpolicy/v2/orgpolicy.proto #include "google/cloud/orgpolicy/v2/internal/org_policy_stub.h" +#include "google/cloud/orgpolicy/v2/orgpolicy.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_stub.h b/google/cloud/orgpolicy/v2/internal/org_policy_stub.h index c089d85dcf08e..4c7923ea86b97 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_stub.h +++ b/google/cloud/orgpolicy/v2/internal/org_policy_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_V2_INTERNAL_ORG_POLICY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_V2_INTERNAL_ORG_POLICY_STUB_H +#include "google/cloud/orgpolicy/v2/orgpolicy.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_stub_factory.cc b/google/cloud/orgpolicy/v2/internal/org_policy_stub_factory.cc index be2ec41e8327b..025fae0657c24 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_stub_factory.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/orgpolicy/v2/internal/org_policy_metadata_decorator.h" #include "google/cloud/orgpolicy/v2/internal/org_policy_stub.h" #include "google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.h" +#include "google/cloud/orgpolicy/v2/orgpolicy.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 #include #include diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc index e41a671d65162..d80ddd7530205 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace orgpolicy_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OrgPolicyTracingConnection::OrgPolicyTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -149,16 +147,12 @@ Status OrgPolicyTracingConnection::DeleteCustomConstraint( return internal::EndSpan(*span, child_->DeleteCustomConstraint(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOrgPolicyTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.h b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.h index 196b4ae011c9a..7f1a7a81deb62 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.h +++ b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace orgpolicy_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OrgPolicyTracingConnection : public orgpolicy_v2::OrgPolicyConnection { public: ~OrgPolicyTracingConnection() override = default; @@ -90,8 +88,6 @@ class OrgPolicyTracingConnection : public orgpolicy_v2::OrgPolicyConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.cc b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.cc index 9bf09d7ea2887..6b96c387b9e71 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace orgpolicy_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OrgPolicyTracingStub::OrgPolicyTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -178,15 +176,9 @@ Status OrgPolicyTracingStub::DeleteCustomConstraint( child_->DeleteCustomConstraint(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOrgPolicyTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.h b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.h index 245dd5e51c597..c47b2135b3243 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.h +++ b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace orgpolicy_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OrgPolicyTracingStub : public OrgPolicyStub { public: ~OrgPolicyTracingStub() override = default; @@ -105,8 +103,6 @@ class OrgPolicyTracingStub : public OrgPolicyStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/orgpolicy/v2/org_policy_connection.h b/google/cloud/orgpolicy/v2/org_policy_connection.h index f6c52021ad106..906d72edea586 100644 --- a/google/cloud/orgpolicy/v2/org_policy_connection.h +++ b/google/cloud/orgpolicy/v2/org_policy_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/orgpolicy/v2/internal/org_policy_retry_traits.h" #include "google/cloud/orgpolicy/v2/org_policy_connection_idempotency_policy.h" +#include "google/cloud/orgpolicy/v2/orgpolicy.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/orgpolicy/v2/org_policy_connection_idempotency_policy.h b/google/cloud/orgpolicy/v2/org_policy_connection_idempotency_policy.h index 779e65c4bd0ae..2c9ece91ee114 100644 --- a/google/cloud/orgpolicy/v2/org_policy_connection_idempotency_policy.h +++ b/google/cloud/orgpolicy/v2/org_policy_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_V2_ORG_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_V2_ORG_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/orgpolicy/v2/orgpolicy.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/osconfig/BUILD.bazel b/google/cloud/osconfig/BUILD.bazel index 7e119ffd8ccf2..b98422aaa117b 100644 --- a/google/cloud/osconfig/BUILD.bazel +++ b/google/cloud/osconfig/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/osconfig/agentendpoint/v1:agentendpoint_cc_grpc", - "@com_google_googleapis//google/cloud/osconfig/v1:osconfig_cc_grpc", + "@googleapis//google/cloud/osconfig/agentendpoint/v1:agentendpoint_cc_grpc", + "@googleapis//google/cloud/osconfig/v1:osconfig_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection.h b/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection.h index 4089c9bf02e76..ce8207944d78a 100644 --- a/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection.h +++ b/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENTENDPOINT_V1_AGENT_ENDPOINT_CONNECTION_H #include "google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection_idempotency_policy.h" +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.pb.h" #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection_idempotency_policy.h b/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection_idempotency_policy.h index 102f859f5c8b4..7d91b8408e120 100644 --- a/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection_idempotency_policy.h +++ b/google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENTENDPOINT_V1_AGENT_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENTENDPOINT_V1_AGENT_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_auth_decorator.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_auth_decorator.cc index 36a5d49576806..2ae286335ed35 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_auth_decorator.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_auth_decorator.h" -#include +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.grpc.pb.h" #include #include diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_logging_decorator.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_logging_decorator.cc index 78f305a095866..9c31cb66f4773 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_logging_decorator.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_logging_decorator.h" +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_metadata_decorator.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_metadata_decorator.cc index 763f339dcd769..c30b24c1bdba7 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_metadata_decorator.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_metadata_decorator.h" +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.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 #include #include #include diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.cc index 41b263e609c08..edd0f8e499dfd 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.h" +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.h b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.h index 893ff70c64675..d6503ad00d37b 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.h +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENTENDPOINT_V1_INTERNAL_AGENT_ENDPOINT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENTENDPOINT_V1_INTERNAL_AGENT_ENDPOINT_STUB_H +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.grpc.pb.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub_factory.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub_factory.cc index 6774affbd4e41..d7cc0e9cd2b2b 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub_factory.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_stub_factory.h" +#include "google/cloud/osconfig/agentendpoint/v1/agentendpoint.grpc.pb.h" #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_auth_decorator.h" #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_logging_decorator.h" #include "google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc index b2d353774cd95..f7b4df0c687c2 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace osconfig_agentendpoint_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AgentEndpointServiceTracingConnection::AgentEndpointServiceTracingConnection( std::shared_ptr child) @@ -103,18 +101,14 @@ AgentEndpointServiceTracingConnection::ReportInventory( return internal::EndSpan(*span, child_->ReportInventory(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAgentEndpointServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.h b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.h index 5c6a7f01106a4..f25052841e53e 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.h +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace osconfig_agentendpoint_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AgentEndpointServiceTracingConnection : public osconfig_agentendpoint_v1::AgentEndpointServiceConnection { public: @@ -77,8 +75,6 @@ class AgentEndpointServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.cc index a845d5a040733..6e4d82342603d 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace osconfig_agentendpoint_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AgentEndpointServiceTracingStub::AgentEndpointServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -122,15 +120,9 @@ AgentEndpointServiceTracingStub::ReportInventory( child_->ReportInventory(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAgentEndpointServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.h b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.h index d5ed9499d2590..70796677559a3 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.h +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace osconfig_agentendpoint_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AgentEndpointServiceTracingStub : public AgentEndpointServiceStub { public: ~AgentEndpointServiceTracingStub() override = default; @@ -83,8 +81,6 @@ class AgentEndpointServiceTracingStub : public AgentEndpointServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/osconfig/quickstart/.bazelrc b/google/cloud/osconfig/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/osconfig/quickstart/.bazelrc +++ b/google/cloud/osconfig/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/osconfig/v1/internal/os_config_auth_decorator.cc b/google/cloud/osconfig/v1/internal/os_config_auth_decorator.cc index c53f5d84a5e07..192475a3badad 100644 --- a/google/cloud/osconfig/v1/internal/os_config_auth_decorator.cc +++ b/google/cloud/osconfig/v1/internal/os_config_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/osconfig/v1/osconfig_service.proto #include "google/cloud/osconfig/v1/internal/os_config_auth_decorator.h" -#include +#include "google/cloud/osconfig/v1/osconfig_service.grpc.pb.h" #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_logging_decorator.cc b/google/cloud/osconfig/v1/internal/os_config_logging_decorator.cc index 422bbd77dd0bc..70bf095da37c8 100644 --- a/google/cloud/osconfig/v1/internal/os_config_logging_decorator.cc +++ b/google/cloud/osconfig/v1/internal/os_config_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/osconfig/v1/osconfig_service.proto #include "google/cloud/osconfig/v1/internal/os_config_logging_decorator.h" +#include "google/cloud/osconfig/v1/osconfig_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_metadata_decorator.cc b/google/cloud/osconfig/v1/internal/os_config_metadata_decorator.cc index 10a01e4680942..0247d35e32a53 100644 --- a/google/cloud/osconfig/v1/internal/os_config_metadata_decorator.cc +++ b/google/cloud/osconfig/v1/internal/os_config_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/osconfig/v1/osconfig_service.proto #include "google/cloud/osconfig/v1/internal/os_config_metadata_decorator.h" +#include "google/cloud/osconfig/v1/osconfig_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 #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_stub.cc b/google/cloud/osconfig/v1/internal/os_config_stub.cc index 47a65a6cfe55a..11970ae6bfade 100644 --- a/google/cloud/osconfig/v1/internal/os_config_stub.cc +++ b/google/cloud/osconfig/v1/internal/os_config_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/osconfig/v1/osconfig_service.proto #include "google/cloud/osconfig/v1/internal/os_config_stub.h" +#include "google/cloud/osconfig/v1/osconfig_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_stub.h b/google/cloud/osconfig/v1/internal/os_config_stub.h index 6a647b2b8e24d..ccc12812b3d12 100644 --- a/google/cloud/osconfig/v1/internal/os_config_stub.h +++ b/google/cloud/osconfig/v1/internal/os_config_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_INTERNAL_OS_CONFIG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_INTERNAL_OS_CONFIG_STUB_H +#include "google/cloud/osconfig/v1/osconfig_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_stub_factory.cc b/google/cloud/osconfig/v1/internal/os_config_stub_factory.cc index 496336f622488..26632f4945130 100644 --- a/google/cloud/osconfig/v1/internal/os_config_stub_factory.cc +++ b/google/cloud/osconfig/v1/internal/os_config_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/osconfig/v1/internal/os_config_metadata_decorator.h" #include "google/cloud/osconfig/v1/internal/os_config_stub.h" #include "google/cloud/osconfig/v1/internal/os_config_tracing_stub.h" +#include "google/cloud/osconfig/v1/osconfig_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 #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc b/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc index 168ea2e62d9ff..4e31ef7667433 100644 --- a/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc +++ b/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OsConfigServiceTracingConnection::OsConfigServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -148,16 +146,12 @@ OsConfigServiceTracingConnection::ResumePatchDeployment( return internal::EndSpan(*span, child_->ResumePatchDeployment(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOsConfigServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/osconfig/v1/internal/os_config_tracing_connection.h b/google/cloud/osconfig/v1/internal/os_config_tracing_connection.h index 61353e6599ad2..33b4630405a29 100644 --- a/google/cloud/osconfig/v1/internal/os_config_tracing_connection.h +++ b/google/cloud/osconfig/v1/internal/os_config_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OsConfigServiceTracingConnection : public osconfig_v1::OsConfigServiceConnection { public: @@ -91,8 +89,6 @@ class OsConfigServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/osconfig/v1/internal/os_config_tracing_stub.cc b/google/cloud/osconfig/v1/internal/os_config_tracing_stub.cc index 0b870ca4dd953..156605e6e5b16 100644 --- a/google/cloud/osconfig/v1/internal/os_config_tracing_stub.cc +++ b/google/cloud/osconfig/v1/internal/os_config_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OsConfigServiceTracingStub::OsConfigServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -177,15 +175,9 @@ OsConfigServiceTracingStub::ResumePatchDeployment( context, *span, child_->ResumePatchDeployment(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOsConfigServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/osconfig/v1/internal/os_config_tracing_stub.h b/google/cloud/osconfig/v1/internal/os_config_tracing_stub.h index 245030ad4e253..03c9875540dfa 100644 --- a/google/cloud/osconfig/v1/internal/os_config_tracing_stub.h +++ b/google/cloud/osconfig/v1/internal/os_config_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OsConfigServiceTracingStub : public OsConfigServiceStub { public: ~OsConfigServiceTracingStub() override = default; @@ -106,8 +104,6 @@ class OsConfigServiceTracingStub : public OsConfigServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.cc index a6e2755ce6942..1f5ee8b8f2e17 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/osconfig/v1/osconfig_zonal_service.proto #include "google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.h" -#include +#include "google/cloud/osconfig/v1/osconfig_zonal_service.grpc.pb.h" #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.h b/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.h index c7f35361bbd70..4df7a48b57fc4 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/osconfig/v1/internal/os_config_zonal_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_connection_impl.h b/google/cloud/osconfig/v1/internal/os_config_zonal_connection_impl.h index 0f545c10f1407..117173c5e5a8d 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_connection_impl.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.cc index 175cb361bf851..4f5b13257d4f6 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/osconfig/v1/osconfig_zonal_service.proto #include "google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.h" +#include "google/cloud/osconfig/v1/osconfig_zonal_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.h b/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.h index df2f17014f766..d526e452fb296 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/osconfig/v1/internal/os_config_zonal_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.cc index 55ac47115b738..14c0b29a4033e 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/osconfig/v1/osconfig_zonal_service.proto #include "google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.h" +#include "google/cloud/osconfig/v1/osconfig_zonal_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 #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.h b/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.h index b2bf948eb6462..ac87c6b7a0a66 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/osconfig/v1/internal/os_config_zonal_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc index 741676222f571..4ba27f161489d 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/osconfig/v1/osconfig_zonal_service.proto #include "google/cloud/osconfig/v1/internal/os_config_zonal_stub.h" +#include "google/cloud/osconfig/v1/osconfig_zonal_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h index 66f2c896423dd..907f424a2ded3 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_INTERNAL_OS_CONFIG_ZONAL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_INTERNAL_OS_CONFIG_ZONAL_STUB_H +#include "google/cloud/osconfig/v1/osconfig_zonal_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_stub_factory.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_stub_factory.cc index b677224d56a6c..c4b87877a0882 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_stub_factory.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/osconfig/v1/internal/os_config_zonal_metadata_decorator.h" #include "google/cloud/osconfig/v1/internal/os_config_zonal_stub.h" #include "google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.h" +#include "google/cloud/osconfig/v1/osconfig_zonal_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 #include #include diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc index aacb9fba014b2..660cfcdc5384c 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OsConfigZonalServiceTracingConnection::OsConfigZonalServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -234,17 +232,13 @@ OsConfigZonalServiceTracingConnection::ListVulnerabilityReports( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOsConfigZonalServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.h b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.h index e4d7227fee80e..3552204efe11a 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OsConfigZonalServiceTracingConnection : public osconfig_v1::OsConfigZonalServiceConnection { public: @@ -129,8 +127,6 @@ class OsConfigZonalServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc index 2e764a524414d..3fbe0c3e391ba 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OsConfigZonalServiceTracingStub::OsConfigZonalServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -281,15 +279,9 @@ future OsConfigZonalServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOsConfigZonalServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.h b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.h index 2b5eb2f306c25..45eee6204b3e2 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace osconfig_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OsConfigZonalServiceTracingStub : public OsConfigZonalServiceStub { public: ~OsConfigZonalServiceTracingStub() override = default; @@ -147,8 +145,6 @@ class OsConfigZonalServiceTracingStub : public OsConfigZonalServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/osconfig/v1/os_config_connection.h b/google/cloud/osconfig/v1/os_config_connection.h index ad2751fbed287..125bd6f56b135 100644 --- a/google/cloud/osconfig/v1/os_config_connection.h +++ b/google/cloud/osconfig/v1/os_config_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/osconfig/v1/internal/os_config_retry_traits.h" #include "google/cloud/osconfig/v1/os_config_connection_idempotency_policy.h" +#include "google/cloud/osconfig/v1/osconfig_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/osconfig/v1/os_config_connection_idempotency_policy.h b/google/cloud/osconfig/v1/os_config_connection_idempotency_policy.h index d05042bf3a0e7..89a538214b01e 100644 --- a/google/cloud/osconfig/v1/os_config_connection_idempotency_policy.h +++ b/google/cloud/osconfig/v1/os_config_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_OS_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_OS_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/osconfig/v1/osconfig_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/osconfig/v1/os_config_zonal_client.h b/google/cloud/osconfig/v1/os_config_zonal_client.h index f19baca9cd1fc..f4e91c0c693e2 100644 --- a/google/cloud/osconfig/v1/os_config_zonal_client.h +++ b/google/cloud/osconfig/v1/os_config_zonal_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/osconfig/v1/os_config_zonal_connection.h b/google/cloud/osconfig/v1/os_config_zonal_connection.h index 90915160aa392..0b584de775804 100644 --- a/google/cloud/osconfig/v1/os_config_zonal_connection.h +++ b/google/cloud/osconfig/v1/os_config_zonal_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/osconfig/v1/internal/os_config_zonal_retry_traits.h" #include "google/cloud/osconfig/v1/os_config_zonal_connection_idempotency_policy.h" +#include "google/cloud/osconfig/v1/osconfig_zonal_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/osconfig/v1/os_config_zonal_connection_idempotency_policy.h b/google/cloud/osconfig/v1/os_config_zonal_connection_idempotency_policy.h index 512e3df51bd68..f9bb1aedcc737 100644 --- a/google/cloud/osconfig/v1/os_config_zonal_connection_idempotency_policy.h +++ b/google/cloud/osconfig/v1/os_config_zonal_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_OS_CONFIG_ZONAL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_V1_OS_CONFIG_ZONAL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/osconfig/v1/osconfig_zonal_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/oslogin/BUILD.bazel b/google/cloud/oslogin/BUILD.bazel index cc1dca8a5510e..39244a830b945 100644 --- a/google/cloud/oslogin/BUILD.bazel +++ b/google/cloud/oslogin/BUILD.bazel @@ -24,8 +24,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/oslogin/common:common_cc_grpc", - "@com_google_googleapis//google/cloud/oslogin/v1:oslogin_cc_grpc", + "@googleapis//google/cloud/oslogin/common:common_cc_grpc", + "@googleapis//google/cloud/oslogin/v1:oslogin_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/oslogin/quickstart/.bazelrc b/google/cloud/oslogin/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/oslogin/quickstart/.bazelrc +++ b/google/cloud/oslogin/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/oslogin/v1/internal/os_login_auth_decorator.cc b/google/cloud/oslogin/v1/internal/os_login_auth_decorator.cc index ab58fe59be4eb..771ab928d7fae 100644 --- a/google/cloud/oslogin/v1/internal/os_login_auth_decorator.cc +++ b/google/cloud/oslogin/v1/internal/os_login_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/oslogin/v1/oslogin.proto #include "google/cloud/oslogin/v1/internal/os_login_auth_decorator.h" -#include +#include "google/cloud/oslogin/v1/oslogin.grpc.pb.h" #include #include diff --git a/google/cloud/oslogin/v1/internal/os_login_logging_decorator.cc b/google/cloud/oslogin/v1/internal/os_login_logging_decorator.cc index d3ea1dc61ac08..4cb1c29b3359b 100644 --- a/google/cloud/oslogin/v1/internal/os_login_logging_decorator.cc +++ b/google/cloud/oslogin/v1/internal/os_login_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/oslogin/v1/oslogin.proto #include "google/cloud/oslogin/v1/internal/os_login_logging_decorator.h" +#include "google/cloud/oslogin/v1/oslogin.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/oslogin/v1/internal/os_login_metadata_decorator.cc b/google/cloud/oslogin/v1/internal/os_login_metadata_decorator.cc index 998260d1029d8..47e8eb56eba55 100644 --- a/google/cloud/oslogin/v1/internal/os_login_metadata_decorator.cc +++ b/google/cloud/oslogin/v1/internal/os_login_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/oslogin/v1/oslogin.proto #include "google/cloud/oslogin/v1/internal/os_login_metadata_decorator.h" +#include "google/cloud/oslogin/v1/oslogin.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 #include #include #include diff --git a/google/cloud/oslogin/v1/internal/os_login_stub.cc b/google/cloud/oslogin/v1/internal/os_login_stub.cc index 1194a94c4b69c..5fec3858336cb 100644 --- a/google/cloud/oslogin/v1/internal/os_login_stub.cc +++ b/google/cloud/oslogin/v1/internal/os_login_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/oslogin/v1/oslogin.proto #include "google/cloud/oslogin/v1/internal/os_login_stub.h" +#include "google/cloud/oslogin/v1/oslogin.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/oslogin/v1/internal/os_login_stub.h b/google/cloud/oslogin/v1/internal/os_login_stub.h index 23f4ca11fdf99..98926ae23d465 100644 --- a/google/cloud/oslogin/v1/internal/os_login_stub.h +++ b/google/cloud/oslogin/v1/internal/os_login_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_V1_INTERNAL_OS_LOGIN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_V1_INTERNAL_OS_LOGIN_STUB_H +#include "google/cloud/oslogin/v1/oslogin.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/oslogin/v1/internal/os_login_stub_factory.cc b/google/cloud/oslogin/v1/internal/os_login_stub_factory.cc index e1f81e9449447..19fdff06ded27 100644 --- a/google/cloud/oslogin/v1/internal/os_login_stub_factory.cc +++ b/google/cloud/oslogin/v1/internal/os_login_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/oslogin/v1/internal/os_login_metadata_decorator.h" #include "google/cloud/oslogin/v1/internal/os_login_stub.h" #include "google/cloud/oslogin/v1/internal/os_login_tracing_stub.h" +#include "google/cloud/oslogin/v1/oslogin.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 #include #include diff --git a/google/cloud/oslogin/v1/internal/os_login_tracing_connection.cc b/google/cloud/oslogin/v1/internal/os_login_tracing_connection.cc index 5112fd95a19d8..896a3c23ea27c 100644 --- a/google/cloud/oslogin/v1/internal/os_login_tracing_connection.cc +++ b/google/cloud/oslogin/v1/internal/os_login_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace oslogin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OsLoginServiceTracingConnection::OsLoginServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -93,16 +91,12 @@ OsLoginServiceTracingConnection::UpdateSshPublicKey( return internal::EndSpan(*span, child_->UpdateSshPublicKey(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOsLoginServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/oslogin/v1/internal/os_login_tracing_connection.h b/google/cloud/oslogin/v1/internal/os_login_tracing_connection.h index 27662d7a60bc7..e42043fa968ef 100644 --- a/google/cloud/oslogin/v1/internal/os_login_tracing_connection.h +++ b/google/cloud/oslogin/v1/internal/os_login_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace oslogin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OsLoginServiceTracingConnection : public oslogin_v1::OsLoginServiceConnection { public: @@ -73,8 +71,6 @@ class OsLoginServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/oslogin/v1/internal/os_login_tracing_stub.cc b/google/cloud/oslogin/v1/internal/os_login_tracing_stub.cc index 30a432b67bc6f..9ce3f32bc0acd 100644 --- a/google/cloud/oslogin/v1/internal/os_login_tracing_stub.cc +++ b/google/cloud/oslogin/v1/internal/os_login_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace oslogin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OsLoginServiceTracingStub::OsLoginServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -114,15 +112,9 @@ OsLoginServiceTracingStub::UpdateSshPublicKey( context, *span, child_->UpdateSshPublicKey(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOsLoginServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/oslogin/v1/internal/os_login_tracing_stub.h b/google/cloud/oslogin/v1/internal/os_login_tracing_stub.h index 7078dec71949f..cb88a0395848b 100644 --- a/google/cloud/oslogin/v1/internal/os_login_tracing_stub.h +++ b/google/cloud/oslogin/v1/internal/os_login_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace oslogin_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OsLoginServiceTracingStub : public OsLoginServiceStub { public: ~OsLoginServiceTracingStub() override = default; @@ -80,8 +78,6 @@ class OsLoginServiceTracingStub : public OsLoginServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/oslogin/v1/os_login_connection.h b/google/cloud/oslogin/v1/os_login_connection.h index daa53d7d945a3..f9553b921489d 100644 --- a/google/cloud/oslogin/v1/os_login_connection.h +++ b/google/cloud/oslogin/v1/os_login_connection.h @@ -21,12 +21,12 @@ #include "google/cloud/oslogin/v1/internal/os_login_retry_traits.h" #include "google/cloud/oslogin/v1/os_login_connection_idempotency_policy.h" +#include "google/cloud/oslogin/v1/oslogin.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/oslogin/v1/os_login_connection_idempotency_policy.h b/google/cloud/oslogin/v1/os_login_connection_idempotency_policy.h index 07687e3b18615..e30dadeb5bafe 100644 --- a/google/cloud/oslogin/v1/os_login_connection_idempotency_policy.h +++ b/google/cloud/oslogin/v1/os_login_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_V1_OS_LOGIN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_V1_OS_LOGIN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/oslogin/v1/oslogin.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/parallelstore/BUILD.bazel b/google/cloud/parallelstore/BUILD.bazel index 37007330e0294..38a1dd851820c 100644 --- a/google/cloud/parallelstore/BUILD.bazel +++ b/google/cloud/parallelstore/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/parallelstore/v1:parallelstore_cc_grpc", + "@googleapis//google/cloud/parallelstore/v1:parallelstore_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/parallelstore/quickstart/.bazelrc b/google/cloud/parallelstore/quickstart/.bazelrc index e676fbffccb52..d313ebed860ce 100644 --- a/google/cloud/parallelstore/quickstart/.bazelrc +++ b/google/cloud/parallelstore/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.cc b/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.cc index 10323642e0723..8e6f32443d278 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/parallelstore/v1/parallelstore.proto #include "google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.h" -#include +#include "google/cloud/parallelstore/v1/parallelstore.grpc.pb.h" #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.h b/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.h index 5362f8241c4b4..bc6dd7d3a1ee9 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/parallelstore/v1/internal/parallelstore_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_connection_impl.h b/google/cloud/parallelstore/v1/internal/parallelstore_connection_impl.h index 67df74ce9b456..f463a6b73622e 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_connection_impl.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.cc b/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.cc index 396c455d71842..dafd933db4125 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/parallelstore/v1/parallelstore.proto #include "google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.h" +#include "google/cloud/parallelstore/v1/parallelstore.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.h b/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.h index c4c0be22ea79f..d40318c9f4a48 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/parallelstore/v1/internal/parallelstore_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.cc b/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.cc index c24cd8f183469..180f39bf025f2 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/parallelstore/v1/parallelstore.proto #include "google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.h" +#include "google/cloud/parallelstore/v1/parallelstore.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 #include #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.h b/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.h index 054af407012ac..480986b34ef23 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/parallelstore/v1/internal/parallelstore_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc b/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc index 25fa1b96592bb..68976b4ad9a36 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/parallelstore/v1/parallelstore.proto #include "google/cloud/parallelstore/v1/internal/parallelstore_stub.h" +#include "google/cloud/parallelstore/v1/parallelstore.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_stub.h b/google/cloud/parallelstore/v1/internal/parallelstore_stub.h index 9a2c1b963d810..5c790f04d4962 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_stub.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARALLELSTORE_V1_INTERNAL_PARALLELSTORE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARALLELSTORE_V1_INTERNAL_PARALLELSTORE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/parallelstore/v1/parallelstore.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc b/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc index bbbd5d900fa7b..33833e51da42f 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/parallelstore/v1/parallelstore.proto #include "google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/parallelstore/v1/internal/parallelstore_auth_decorator.h" #include "google/cloud/parallelstore/v1/internal/parallelstore_logging_decorator.h" #include "google/cloud/parallelstore/v1/internal/parallelstore_metadata_decorator.h" #include "google/cloud/parallelstore/v1/internal/parallelstore_stub.h" #include "google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.h" +#include "google/cloud/parallelstore/v1/parallelstore.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.cc b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.cc index cdbbb7ab50c45..88eb156a80be4 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace parallelstore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ParallelstoreTracingConnection::ParallelstoreTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -253,16 +251,12 @@ Status ParallelstoreTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeParallelstoreTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.h b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.h index 8411ae6926808..7dec9301f92ef 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace parallelstore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ParallelstoreTracingConnection : public parallelstore_v1::ParallelstoreConnection { public: @@ -129,8 +127,6 @@ class ParallelstoreTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.cc b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.cc index e8d5fb98533eb..b442858ebd27b 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace parallelstore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ParallelstoreTracingStub::ParallelstoreTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -284,15 +282,9 @@ future ParallelstoreTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeParallelstoreTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.h b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.h index f47cc865e2ceb..0f5c252a4e0d1 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace parallelstore_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ParallelstoreTracingStub : public ParallelstoreStub { public: ~ParallelstoreTracingStub() override = default; @@ -150,8 +148,6 @@ class ParallelstoreTracingStub : public ParallelstoreStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/parallelstore/v1/parallelstore_client.h b/google/cloud/parallelstore/v1/parallelstore_client.h index d1a3d50b0ada5..85ec1d27e92a7 100644 --- a/google/cloud/parallelstore/v1/parallelstore_client.h +++ b/google/cloud/parallelstore/v1/parallelstore_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/parallelstore/v1/parallelstore_connection.h b/google/cloud/parallelstore/v1/parallelstore_connection.h index d6b0e08010e8e..952e66758afb9 100644 --- a/google/cloud/parallelstore/v1/parallelstore_connection.h +++ b/google/cloud/parallelstore/v1/parallelstore_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARALLELSTORE_V1_PARALLELSTORE_CONNECTION_H #include "google/cloud/parallelstore/v1/internal/parallelstore_retry_traits.h" +#include "google/cloud/parallelstore/v1/parallelstore.pb.h" #include "google/cloud/parallelstore/v1/parallelstore_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/parallelstore/v1/parallelstore_connection_idempotency_policy.h b/google/cloud/parallelstore/v1/parallelstore_connection_idempotency_policy.h index a65d6359719e9..9dfa77e3d7cea 100644 --- a/google/cloud/parallelstore/v1/parallelstore_connection_idempotency_policy.h +++ b/google/cloud/parallelstore/v1/parallelstore_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARALLELSTORE_V1_PARALLELSTORE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARALLELSTORE_V1_PARALLELSTORE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/parallelstore/v1/parallelstore.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/parametermanager/BUILD.bazel b/google/cloud/parametermanager/BUILD.bazel index 9d7ceed43bcca..18441f6fabc0a 100644 --- a/google/cloud/parametermanager/BUILD.bazel +++ b/google/cloud/parametermanager/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/parametermanager/v1:parametermanager_cc_grpc", + "@googleapis//google/cloud/parametermanager/v1:parametermanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/parametermanager/quickstart/.bazelrc b/google/cloud/parametermanager/quickstart/.bazelrc index 8431873b6fcba..e8b43211481f4 100644 --- a/google/cloud/parametermanager/quickstart/.bazelrc +++ b/google/cloud/parametermanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_auth_decorator.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_auth_decorator.cc index dc0527ce846db..3fd58f9f88faa 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_auth_decorator.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/parametermanager/v1/service.proto #include "google/cloud/parametermanager/v1/internal/parameter_manager_auth_decorator.h" -#include +#include "google/cloud/parametermanager/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_logging_decorator.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_logging_decorator.cc index 693219406dbf6..e8e5404723cfc 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_logging_decorator.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/parametermanager/v1/service.proto #include "google/cloud/parametermanager/v1/internal/parameter_manager_logging_decorator.h" +#include "google/cloud/parametermanager/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_metadata_decorator.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_metadata_decorator.cc index e692cd69ef901..5b109670bba4e 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_metadata_decorator.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/parametermanager/v1/service.proto #include "google/cloud/parametermanager/v1/internal/parameter_manager_metadata_decorator.h" +#include "google/cloud/parametermanager/v1/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 #include #include #include diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_stub.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_stub.cc index 517240ddaffda..049508ec3500e 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_stub.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/parametermanager/v1/service.proto #include "google/cloud/parametermanager/v1/internal/parameter_manager_stub.h" +#include "google/cloud/parametermanager/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_stub.h b/google/cloud/parametermanager/v1/internal/parameter_manager_stub.h index a649edc156d27..28b2dd79b7500 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_stub.h +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARAMETERMANAGER_V1_INTERNAL_PARAMETER_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARAMETERMANAGER_V1_INTERNAL_PARAMETER_MANAGER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/parametermanager/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_stub_factory.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_stub_factory.cc index 755efeffb1543..b6da0e89e841e 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_stub_factory.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_stub_factory.cc @@ -17,19 +17,19 @@ // source: google/cloud/parametermanager/v1/service.proto #include "google/cloud/parametermanager/v1/internal/parameter_manager_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/parametermanager/v1/internal/parameter_manager_auth_decorator.h" #include "google/cloud/parametermanager/v1/internal/parameter_manager_logging_decorator.h" #include "google/cloud/parametermanager/v1/internal/parameter_manager_metadata_decorator.h" #include "google/cloud/parametermanager/v1/internal/parameter_manager_stub.h" #include "google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.h" +#include "google/cloud/parametermanager/v1/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 -#include #include #include diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.cc index aaf5316a6703b..6b269ed460d97 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace parametermanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ParameterManagerTracingConnection::ParameterManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -168,16 +166,12 @@ ParameterManagerTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeParameterManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.h b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.h index ed341077689ea..a7ecdbbcf7aed 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.h +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace parametermanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ParameterManagerTracingConnection : public parametermanager_v1::ParameterManagerConnection { public: @@ -99,8 +97,6 @@ class ParameterManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.cc b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.cc index 9cc6a577be3ae..0604b5ea1cdf3 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.cc +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace parametermanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ParameterManagerTracingStub::ParameterManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -205,15 +203,9 @@ ParameterManagerTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeParameterManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.h b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.h index 99f4709dbeae8..aa4cbb9a5e99d 100644 --- a/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.h +++ b/google/cloud/parametermanager/v1/internal/parameter_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace parametermanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ParameterManagerTracingStub : public ParameterManagerStub { public: ~ParameterManagerTracingStub() override = default; @@ -114,8 +112,6 @@ class ParameterManagerTracingStub : public ParameterManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/parametermanager/v1/parameter_manager_connection.h b/google/cloud/parametermanager/v1/parameter_manager_connection.h index 49ca203b80986..482ce6079e204 100644 --- a/google/cloud/parametermanager/v1/parameter_manager_connection.h +++ b/google/cloud/parametermanager/v1/parameter_manager_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/parametermanager/v1/internal/parameter_manager_retry_traits.h" #include "google/cloud/parametermanager/v1/parameter_manager_connection_idempotency_policy.h" +#include "google/cloud/parametermanager/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/parametermanager/v1/parameter_manager_connection_idempotency_policy.h b/google/cloud/parametermanager/v1/parameter_manager_connection_idempotency_policy.h index 1d72f5be232cb..eeb0582057fb4 100644 --- a/google/cloud/parametermanager/v1/parameter_manager_connection_idempotency_policy.h +++ b/google/cloud/parametermanager/v1/parameter_manager_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARAMETERMANAGER_V1_PARAMETER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PARAMETERMANAGER_V1_PARAMETER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/parametermanager/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/policysimulator/BUILD.bazel b/google/cloud/policysimulator/BUILD.bazel index 1b54c1f505536..24b50c86b785a 100644 --- a/google/cloud/policysimulator/BUILD.bazel +++ b/google/cloud/policysimulator/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/policysimulator/v1:policysimulator_cc_grpc", + "@googleapis//google/cloud/policysimulator/v1:policysimulator_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/policysimulator/quickstart/.bazelrc b/google/cloud/policysimulator/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/policysimulator/quickstart/.bazelrc +++ b/google/cloud/policysimulator/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.cc b/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.cc index 2f71825d7b270..e3d25004f44ce 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/policysimulator/v1/simulator.proto #include "google/cloud/policysimulator/v1/internal/simulator_auth_decorator.h" -#include +#include "google/cloud/policysimulator/v1/simulator.grpc.pb.h" #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.h b/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.h index 78140ff2e06e1..c23254d4c2e13 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.h +++ b/google/cloud/policysimulator/v1/internal/simulator_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/policysimulator/v1/internal/simulator_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_connection_impl.h b/google/cloud/policysimulator/v1/internal/simulator_connection_impl.h index e0cd6f2675958..4d8107f16ccee 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_connection_impl.h +++ b/google/cloud/policysimulator/v1/internal/simulator_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.cc b/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.cc index 9ce155f886bff..5d350c6faf36b 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/policysimulator/v1/simulator.proto #include "google/cloud/policysimulator/v1/internal/simulator_logging_decorator.h" +#include "google/cloud/policysimulator/v1/simulator.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.h b/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.h index b0494a41d0994..a410679526085 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.h +++ b/google/cloud/policysimulator/v1/internal/simulator_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/policysimulator/v1/internal/simulator_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.cc b/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.cc index ff2ca6740160e..0f591d499da9d 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/policysimulator/v1/simulator.proto #include "google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.h" +#include "google/cloud/policysimulator/v1/simulator.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 #include #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.h b/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.h index 46115f514bdee..c60bc2951cc29 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.h +++ b/google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/policysimulator/v1/internal/simulator_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_stub.cc b/google/cloud/policysimulator/v1/internal/simulator_stub.cc index fee7824a6dad2..1bea4d61a86f3 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_stub.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/policysimulator/v1/simulator.proto #include "google/cloud/policysimulator/v1/internal/simulator_stub.h" +#include "google/cloud/policysimulator/v1/simulator.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_stub.h b/google/cloud/policysimulator/v1/internal/simulator_stub.h index 347ddd18739f3..6b27c7aa5ef17 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_stub.h +++ b/google/cloud/policysimulator/v1/internal/simulator_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYSIMULATOR_V1_INTERNAL_SIMULATOR_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYSIMULATOR_V1_INTERNAL_SIMULATOR_STUB_H +#include "google/cloud/policysimulator/v1/simulator.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc b/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc index dedaa069c5f4a..c0340933b5608 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/policysimulator/v1/internal/simulator_metadata_decorator.h" #include "google/cloud/policysimulator/v1/internal/simulator_stub.h" #include "google/cloud/policysimulator/v1/internal/simulator_tracing_stub.h" +#include "google/cloud/policysimulator/v1/simulator.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc b/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc index 60306974a00dc..3d863635b2239 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace policysimulator_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SimulatorTracingConnection::SimulatorTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -102,16 +100,12 @@ SimulatorTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSimulatorTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.h b/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.h index fa0fcc14beb4b..cc71ddf87faa4 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.h +++ b/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace policysimulator_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SimulatorTracingConnection : public policysimulator_v1::SimulatorConnection { public: @@ -70,8 +68,6 @@ class SimulatorTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc b/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc index 32437b26ba3fb..17dd7fb1b36fc 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace policysimulator_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SimulatorTracingStub::SimulatorTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -132,15 +130,9 @@ future SimulatorTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSimulatorTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.h b/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.h index c7ad1d2f86019..5a9499cbb42ff 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.h +++ b/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace policysimulator_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SimulatorTracingStub : public SimulatorStub { public: ~SimulatorTracingStub() override = default; @@ -87,8 +85,6 @@ class SimulatorTracingStub : public SimulatorStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/policysimulator/v1/simulator_client.h b/google/cloud/policysimulator/v1/simulator_client.h index f20e4302a9b07..146de6d4b3e8d 100644 --- a/google/cloud/policysimulator/v1/simulator_client.h +++ b/google/cloud/policysimulator/v1/simulator_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/policysimulator/v1/simulator_connection.h b/google/cloud/policysimulator/v1/simulator_connection.h index 33e8cb81d4f89..ce7be600c9ea4 100644 --- a/google/cloud/policysimulator/v1/simulator_connection.h +++ b/google/cloud/policysimulator/v1/simulator_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYSIMULATOR_V1_SIMULATOR_CONNECTION_H #include "google/cloud/policysimulator/v1/internal/simulator_retry_traits.h" +#include "google/cloud/policysimulator/v1/simulator.pb.h" #include "google/cloud/policysimulator/v1/simulator_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/policysimulator/v1/simulator_connection_idempotency_policy.h b/google/cloud/policysimulator/v1/simulator_connection_idempotency_policy.h index f67b9e67f5310..982a63e21f2b5 100644 --- a/google/cloud/policysimulator/v1/simulator_connection_idempotency_policy.h +++ b/google/cloud/policysimulator/v1/simulator_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYSIMULATOR_V1_SIMULATOR_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYSIMULATOR_V1_SIMULATOR_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/policysimulator/v1/simulator.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/policytroubleshooter/BUILD.bazel b/google/cloud/policytroubleshooter/BUILD.bazel index f316abc26b8a7..4b27b867d1063 100644 --- a/google/cloud/policytroubleshooter/BUILD.bazel +++ b/google/cloud/policytroubleshooter/BUILD.bazel @@ -25,9 +25,9 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/policytroubleshooter/iam/v3:iam_cc_grpc", - "@com_google_googleapis//google/cloud/policytroubleshooter/v1:policytroubleshooter_cc_grpc", - "@com_google_googleapis//google/iam/v2:iam_cc_grpc", + "@googleapis//google/cloud/policytroubleshooter/iam/v3:iam_cc_grpc", + "@googleapis//google/cloud/policytroubleshooter/v1:policytroubleshooter_cc_grpc", + "@googleapis//google/iam/v2:iam_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_auth_decorator.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_auth_decorator.cc index 294f70b52df6e..afcc59f444fb4 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_auth_decorator.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/policytroubleshooter/iam/v3/troubleshooter.proto #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_auth_decorator.h" -#include +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.grpc.pb.h" #include #include diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_logging_decorator.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_logging_decorator.cc index 9aeb907ba963d..4e791a90d083c 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_logging_decorator.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/policytroubleshooter/iam/v3/troubleshooter.proto #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_logging_decorator.h" +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_metadata_decorator.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_metadata_decorator.cc index 6729abc655d99..ad427078de445 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_metadata_decorator.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/policytroubleshooter/iam/v3/troubleshooter.proto #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_metadata_decorator.h" +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.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 #include #include #include diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.cc index e790fda7a785f..33539f64e9167 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/policytroubleshooter/iam/v3/troubleshooter.proto #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.h" +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.h b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.h index 2e4eb0707c959..43382d3a39d32 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.h +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_V3_INTERNAL_POLICY_TROUBLESHOOTER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_V3_INTERNAL_POLICY_TROUBLESHOOTER_STUB_H +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub_factory.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub_factory.cc index 46625b8766682..c8cf9ffdbfa06 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub_factory.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_metadata_decorator.h" #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_stub.h" #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.h" +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.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 #include #include diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.cc index 33dcb96ae29ad..4247ba3a24084 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace policytroubleshooter_iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyTroubleshooterTracingConnection::PolicyTroubleshooterTracingConnection( std::shared_ptr child) @@ -45,18 +43,14 @@ PolicyTroubleshooterTracingConnection::TroubleshootIamPolicy( return internal::EndSpan(*span, child_->TroubleshootIamPolicy(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyTroubleshooterTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.h b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.h index 6331a33018e7f..199e13bc5feb6 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.h +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace policytroubleshooter_iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyTroubleshooterTracingConnection : public policytroubleshooter_iam_v3::PolicyTroubleshooterConnection { public: @@ -53,8 +51,6 @@ class PolicyTroubleshooterTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.cc b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.cc index 73b037ce1df3b..78a8c64d714ed 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.cc +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace policytroubleshooter_iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PolicyTroubleshooterTracingStub::PolicyTroubleshooterTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -47,15 +45,9 @@ PolicyTroubleshooterTracingStub::TroubleshootIamPolicy( context, *span, child_->TroubleshootIamPolicy(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePolicyTroubleshooterTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.h b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.h index c86d3fb30ba3a..3ec22c7794274 100644 --- a/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.h +++ b/google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace policytroubleshooter_iam_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PolicyTroubleshooterTracingStub : public PolicyTroubleshooterStub { public: ~PolicyTroubleshooterTracingStub() override = default; @@ -52,8 +50,6 @@ class PolicyTroubleshooterTracingStub : public PolicyTroubleshooterStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection.h b/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection.h index c5ca4b7587b9e..a4a9f01733b9b 100644 --- a/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection.h +++ b/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection.h @@ -21,12 +21,12 @@ #include "google/cloud/policytroubleshooter/iam/v3/internal/policy_troubleshooter_retry_traits.h" #include "google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection_idempotency_policy.h" +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection_idempotency_policy.h b/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection_idempotency_policy.h index b62bc86a8d860..4615b06bce50f 100644 --- a/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection_idempotency_policy.h +++ b/google/cloud/policytroubleshooter/iam/v3/policy_troubleshooter_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_V3_POLICY_TROUBLESHOOTER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_V3_POLICY_TROUBLESHOOTER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/policytroubleshooter/iam/v3/troubleshooter.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/policytroubleshooter/quickstart/.bazelrc b/google/cloud/policytroubleshooter/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/policytroubleshooter/quickstart/.bazelrc +++ b/google/cloud/policytroubleshooter/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/policytroubleshooter/v1/iam_checker_connection.h b/google/cloud/policytroubleshooter/v1/iam_checker_connection.h index f51ebef4c44cd..20ccddf080947 100644 --- a/google/cloud/policytroubleshooter/v1/iam_checker_connection.h +++ b/google/cloud/policytroubleshooter/v1/iam_checker_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_V1_IAM_CHECKER_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_V1_IAM_CHECKER_CONNECTION_H +#include "google/cloud/policytroubleshooter/v1/checker.pb.h" #include "google/cloud/policytroubleshooter/v1/iam_checker_connection_idempotency_policy.h" #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/policytroubleshooter/v1/iam_checker_connection_idempotency_policy.h b/google/cloud/policytroubleshooter/v1/iam_checker_connection_idempotency_policy.h index cc7c82da4f8c6..a38d823260669 100644 --- a/google/cloud/policytroubleshooter/v1/iam_checker_connection_idempotency_policy.h +++ b/google/cloud/policytroubleshooter/v1/iam_checker_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_V1_IAM_CHECKER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_V1_IAM_CHECKER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/policytroubleshooter/v1/checker.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_auth_decorator.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_auth_decorator.cc index 4f444a2196c79..823c5cf9c14f9 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_auth_decorator.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/policytroubleshooter/v1/checker.proto #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_auth_decorator.h" -#include +#include "google/cloud/policytroubleshooter/v1/checker.grpc.pb.h" #include #include diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_logging_decorator.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_logging_decorator.cc index b5fd21d1b919d..3b405408dc61b 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_logging_decorator.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/policytroubleshooter/v1/checker.proto #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_logging_decorator.h" +#include "google/cloud/policytroubleshooter/v1/checker.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_metadata_decorator.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_metadata_decorator.cc index 5fa93dcfc1f47..6b82d0f498967 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_metadata_decorator.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/policytroubleshooter/v1/checker.proto #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_metadata_decorator.h" +#include "google/cloud/policytroubleshooter/v1/checker.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 #include #include #include diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.cc index a53b9ecc7492e..8f4445a39b344 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/policytroubleshooter/v1/checker.proto #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.h" +#include "google/cloud/policytroubleshooter/v1/checker.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.h b/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.h index d756713f69cf7..1912e5c114ccd 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.h +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_V1_INTERNAL_IAM_CHECKER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_V1_INTERNAL_IAM_CHECKER_STUB_H +#include "google/cloud/policytroubleshooter/v1/checker.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub_factory.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub_factory.cc index ec9c584fc1b1e..a399f7cbc165b 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub_factory.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/policytroubleshooter/v1/checker.proto #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_stub_factory.h" +#include "google/cloud/policytroubleshooter/v1/checker.grpc.pb.h" #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_auth_decorator.h" #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_logging_decorator.h" #include "google/cloud/policytroubleshooter/v1/internal/iam_checker_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.cc index f53c75b2215fa..78b08e51f5c70 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace policytroubleshooter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IamCheckerTracingConnection::IamCheckerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -42,16 +40,12 @@ IamCheckerTracingConnection::TroubleshootIamPolicy( return internal::EndSpan(*span, child_->TroubleshootIamPolicy(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIamCheckerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.h b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.h index 4bd2ba64d6052..fe05beaafa089 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.h +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace policytroubleshooter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IamCheckerTracingConnection : public policytroubleshooter_v1::IamCheckerConnection { public: @@ -50,8 +48,6 @@ class IamCheckerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.cc b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.cc index d52de3772f264..e35b77b86efc0 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.cc +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace policytroubleshooter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - IamCheckerTracingStub::IamCheckerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -46,15 +44,9 @@ IamCheckerTracingStub::TroubleshootIamPolicy( context, *span, child_->TroubleshootIamPolicy(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeIamCheckerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.h b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.h index 704cdd5a10450..d538486e70d7a 100644 --- a/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.h +++ b/google/cloud/policytroubleshooter/v1/internal/iam_checker_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace policytroubleshooter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class IamCheckerTracingStub : public IamCheckerStub { public: ~IamCheckerTracingStub() override = default; @@ -51,8 +49,6 @@ class IamCheckerTracingStub : public IamCheckerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/privateca/BUILD.bazel b/google/cloud/privateca/BUILD.bazel index 29cee95745b6e..1643b9a6e0b6a 100644 --- a/google/cloud/privateca/BUILD.bazel +++ b/google/cloud/privateca/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/security/privateca/v1:privateca_cc_grpc", + "@googleapis//google/cloud/security/privateca/v1:privateca_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/privateca/quickstart/.bazelrc b/google/cloud/privateca/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/privateca/quickstart/.bazelrc +++ b/google/cloud/privateca/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/privateca/v1/certificate_authority_client.h b/google/cloud/privateca/v1/certificate_authority_client.h index 929061c81a0e3..62155d3937a24 100644 --- a/google/cloud/privateca/v1/certificate_authority_client.h +++ b/google/cloud/privateca/v1/certificate_authority_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privateca/v1/certificate_authority_connection.h b/google/cloud/privateca/v1/certificate_authority_connection.h index 1a2c5cfa80b3e..af19ef51006ca 100644 --- a/google/cloud/privateca/v1/certificate_authority_connection.h +++ b/google/cloud/privateca/v1/certificate_authority_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/privateca/v1/certificate_authority_connection_idempotency_policy.h" #include "google/cloud/privateca/v1/internal/certificate_authority_retry_traits.h" +#include "google/cloud/security/privateca/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/privateca/v1/certificate_authority_connection_idempotency_policy.h b/google/cloud/privateca/v1/certificate_authority_connection_idempotency_policy.h index 3a04c0021de40..5fadcc300ca2b 100644 --- a/google/cloud/privateca/v1/certificate_authority_connection_idempotency_policy.h +++ b/google/cloud/privateca/v1/certificate_authority_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_V1_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_V1_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/security/privateca/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.cc b/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.cc index fe25633cd3c02..751c63f2e210c 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/security/privateca/v1/service.proto #include "google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.h" -#include +#include "google/cloud/security/privateca/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.h b/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.h index cd7dad2153119..6ed1acd19e704 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/privateca/v1/internal/certificate_authority_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_connection_impl.h b/google/cloud/privateca/v1/internal/certificate_authority_connection_impl.h index 9a6cc20097414..8396c0de3a0c6 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_connection_impl.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.cc b/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.cc index f0cb3dd30b154..e43fcf9e89793 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/security/privateca/v1/service.proto #include "google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.h" +#include "google/cloud/security/privateca/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.h b/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.h index 48c040ecd60b4..a92dff463ae88 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/privateca/v1/internal/certificate_authority_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.cc b/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.cc index 0c48c924d077d..7bf27f1f66814 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/security/privateca/v1/service.proto #include "google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.h" +#include "google/cloud/security/privateca/v1/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 #include #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.h b/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.h index 9610e87e8c6ec..698b038cab7bf 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/privateca/v1/internal/certificate_authority_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_stub.cc b/google/cloud/privateca/v1/internal/certificate_authority_stub.cc index 031ecf7f19179..4d961046f8088 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_stub.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/security/privateca/v1/service.proto #include "google/cloud/privateca/v1/internal/certificate_authority_stub.h" +#include "google/cloud/security/privateca/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_stub.h b/google/cloud/privateca/v1/internal/certificate_authority_stub.h index 0534b8d544347..ce0a9025d7eac 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_stub.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_V1_INTERNAL_CERTIFICATE_AUTHORITY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_V1_INTERNAL_CERTIFICATE_AUTHORITY_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/security/privateca/v1/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc b/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc index fa19f151038ef..2feb74fa50741 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/security/privateca/v1/service.proto #include "google/cloud/privateca/v1/internal/certificate_authority_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/privateca/v1/internal/certificate_authority_auth_decorator.h" #include "google/cloud/privateca/v1/internal/certificate_authority_logging_decorator.h" #include "google/cloud/privateca/v1/internal/certificate_authority_metadata_decorator.h" #include "google/cloud/privateca/v1/internal/certificate_authority_stub.h" #include "google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.h" +#include "google/cloud/security/privateca/v1/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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc b/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc index 789e9777ba9ef..9b861ce343796 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace privateca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CertificateAuthorityServiceTracingConnection:: CertificateAuthorityServiceTracingConnection( std::shared_ptr @@ -768,17 +766,13 @@ Status CertificateAuthorityServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCertificateAuthorityServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.h b/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.h index c8f798031b3b6..28f66f044d494 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace privateca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CertificateAuthorityServiceTracingConnection : public privateca_v1::CertificateAuthorityServiceConnection { public: @@ -335,8 +333,6 @@ class CertificateAuthorityServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc b/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc index f49dc0d4d4675..07545e954440d 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace privateca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CertificateAuthorityServiceTracingStub::CertificateAuthorityServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -836,17 +834,11 @@ future CertificateAuthorityServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCertificateAuthorityServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.h b/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.h index c2479ca20be69..29638342b9776 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace privateca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CertificateAuthorityServiceTracingStub : public CertificateAuthorityServiceStub { public: @@ -364,8 +362,6 @@ class CertificateAuthorityServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/privilegedaccessmanager/BUILD.bazel b/google/cloud/privilegedaccessmanager/BUILD.bazel index 1ffb42a150823..7365bc58b1b46 100644 --- a/google/cloud/privilegedaccessmanager/BUILD.bazel +++ b/google/cloud/privilegedaccessmanager/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/privilegedaccessmanager/v1:privilegedaccessmanager_cc_grpc", + "@googleapis//google/cloud/privilegedaccessmanager/v1:privilegedaccessmanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/privilegedaccessmanager/quickstart/.bazelrc b/google/cloud/privilegedaccessmanager/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/privilegedaccessmanager/quickstart/.bazelrc +++ b/google/cloud/privilegedaccessmanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.cc index d1a5a189b06e7..c2982ca5aa79b 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.proto #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.h" -#include +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.grpc.pb.h" #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.h index d2dfa06d860a4..461c810b96034 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_connection_impl.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_connection_impl.h index 957b820ee3cc1..2150324da044f 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_connection_impl.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.cc index cc6ea775e3e64..e1968c92395ae 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.proto #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.h index 9f2bac0bb432d..0dcd268d0b777 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.cc index 833e70f44c21a..811e782feb1c3 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.proto #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.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 #include #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.h index 2b1cfaf0bee83..f12839f95ff1b 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc index 2c5cc608e4ab2..867da8a0612f0 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.proto #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h index e55f83bbec289..f0cae083b43df 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVILEGEDACCESSMANAGER_V1_INTERNAL_PRIVILEGED_ACCESS_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVILEGEDACCESSMANAGER_V1_INTERNAL_PRIVILEGED_ACCESS_MANAGER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc index d91388269d307..5e3c19d5250bd 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.proto #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_auth_decorator.h" #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_logging_decorator.h" #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_metadata_decorator.h" #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h" #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.cc index 380bda1a82332..eb646dabf3b43 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace privilegedaccessmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PrivilegedAccessManagerTracingConnection:: PrivilegedAccessManagerTracingConnection( std::shared_ptr< @@ -348,19 +346,15 @@ Status PrivilegedAccessManagerTracingConnection::DeleteOperation( return internal::EndSpan(*span, child_->DeleteOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePrivilegedAccessManagerTracingConnection( std::shared_ptr< privilegedaccessmanager_v1::PrivilegedAccessManagerConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.h index 7ada0382aee46..d646fadeef0fd 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace privilegedaccessmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PrivilegedAccessManagerTracingConnection : public privilegedaccessmanager_v1::PrivilegedAccessManagerConnection { public: @@ -153,8 +151,6 @@ class PrivilegedAccessManagerTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.cc index 5e55b66fcb6d2..02e07134016a9 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace privilegedaccessmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PrivilegedAccessManagerTracingStub::PrivilegedAccessManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -388,16 +386,10 @@ future PrivilegedAccessManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePrivilegedAccessManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.h index 5dae464e45898..d4eddc645fd1b 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace privilegedaccessmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PrivilegedAccessManagerTracingStub : public PrivilegedAccessManagerStub { public: ~PrivilegedAccessManagerTracingStub() override = default; @@ -182,8 +180,6 @@ class PrivilegedAccessManagerTracingStub : public PrivilegedAccessManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_client.h b/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_client.h index c673e86ffd07c..e4ee8797618dd 100644 --- a/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_client.h +++ b/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection.h b/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection.h index cfe6186289f05..6ee60a56f0056 100644 --- a/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection.h +++ b/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_retry_traits.h" #include "google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection_idempotency_policy.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection_idempotency_policy.h b/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection_idempotency_policy.h index b660bb80371ca..fdc39dc336632 100644 --- a/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection_idempotency_policy.h +++ b/google/cloud/privilegedaccessmanager/v1/privileged_access_manager_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVILEGEDACCESSMANAGER_V1_PRIVILEGED_ACCESS_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVILEGEDACCESSMANAGER_V1_PRIVILEGED_ACCESS_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/privilegedaccessmanager/v1/privilegedaccessmanager.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/profiler/BUILD.bazel b/google/cloud/profiler/BUILD.bazel index 119caf92bff1f..1341b1e63d526 100644 --- a/google/cloud/profiler/BUILD.bazel +++ b/google/cloud/profiler/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/cloudprofiler/v2:cloudprofiler_cc_grpc", + "@googleapis//google/devtools/cloudprofiler/v2:cloudprofiler_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/profiler/quickstart/.bazelrc b/google/cloud/profiler/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/profiler/quickstart/.bazelrc +++ b/google/cloud/profiler/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/profiler/v2/export_connection.h b/google/cloud/profiler/v2/export_connection.h index aa81ec7c35a7d..930d1f7e2fa30 100644 --- a/google/cloud/profiler/v2/export_connection.h +++ b/google/cloud/profiler/v2/export_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.pb.h" #include namespace google { diff --git a/google/cloud/profiler/v2/export_connection_idempotency_policy.h b/google/cloud/profiler/v2/export_connection_idempotency_policy.h index 48ee6b7590bb1..69b451070b4b5 100644 --- a/google/cloud/profiler/v2/export_connection_idempotency_policy.h +++ b/google/cloud/profiler/v2/export_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include namespace google { diff --git a/google/cloud/profiler/v2/internal/export_auth_decorator.cc b/google/cloud/profiler/v2/internal/export_auth_decorator.cc index a1465e9a237f0..d2fb8a77f3fe6 100644 --- a/google/cloud/profiler/v2/internal/export_auth_decorator.cc +++ b/google/cloud/profiler/v2/internal/export_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/cloudprofiler/v2/profiler.proto #include "google/cloud/profiler/v2/internal/export_auth_decorator.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/export_logging_decorator.cc b/google/cloud/profiler/v2/internal/export_logging_decorator.cc index 4808c9227811d..3cd772b367a31 100644 --- a/google/cloud/profiler/v2/internal/export_logging_decorator.cc +++ b/google/cloud/profiler/v2/internal/export_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/profiler/v2/internal/export_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include #include diff --git a/google/cloud/profiler/v2/internal/export_metadata_decorator.cc b/google/cloud/profiler/v2/internal/export_metadata_decorator.cc index 7dae9d3a09406..90708ed514e16 100644 --- a/google/cloud/profiler/v2/internal/export_metadata_decorator.cc +++ b/google/cloud/profiler/v2/internal/export_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include #include diff --git a/google/cloud/profiler/v2/internal/export_stub.cc b/google/cloud/profiler/v2/internal/export_stub.cc index 724684790e81f..f314edbdd1a05 100644 --- a/google/cloud/profiler/v2/internal/export_stub.cc +++ b/google/cloud/profiler/v2/internal/export_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/profiler/v2/internal/export_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/export_stub.h b/google/cloud/profiler/v2/internal/export_stub.h index 89b858f46e05a..0086e84951a14 100644 --- a/google/cloud/profiler/v2/internal/export_stub.h +++ b/google/cloud/profiler/v2/internal/export_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/export_stub_factory.cc b/google/cloud/profiler/v2/internal/export_stub_factory.cc index e7f2c71e7cc09..233027a58fb7a 100644 --- a/google/cloud/profiler/v2/internal/export_stub_factory.cc +++ b/google/cloud/profiler/v2/internal/export_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/export_tracing_connection.cc b/google/cloud/profiler/v2/internal/export_tracing_connection.cc index 65fc2ebaa49bd..56222497df3d2 100644 --- a/google/cloud/profiler/v2/internal/export_tracing_connection.cc +++ b/google/cloud/profiler/v2/internal/export_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExportServiceTracingConnection::ExportServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -45,16 +43,12 @@ ExportServiceTracingConnection::ListProfiles( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExportServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/profiler/v2/internal/export_tracing_connection.h b/google/cloud/profiler/v2/internal/export_tracing_connection.h index af7212699f4af..c292d0c71c36b 100644 --- a/google/cloud/profiler/v2/internal/export_tracing_connection.h +++ b/google/cloud/profiler/v2/internal/export_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExportServiceTracingConnection : public profiler_v2::ExportServiceConnection { public: @@ -48,8 +46,6 @@ class ExportServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/profiler/v2/internal/export_tracing_stub.cc b/google/cloud/profiler/v2/internal/export_tracing_stub.cc index d1edbe0c2118c..b0f7f01dedcec 100644 --- a/google/cloud/profiler/v2/internal/export_tracing_stub.cc +++ b/google/cloud/profiler/v2/internal/export_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExportServiceTracingStub::ExportServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ ExportServiceTracingStub::ListProfiles( child_->ListProfiles(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExportServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/profiler/v2/internal/export_tracing_stub.h b/google/cloud/profiler/v2/internal/export_tracing_stub.h index 59792230f938f..069f0de5e0f29 100644 --- a/google/cloud/profiler/v2/internal/export_tracing_stub.h +++ b/google/cloud/profiler/v2/internal/export_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExportServiceTracingStub : public ExportServiceStub { public: ~ExportServiceTracingStub() override = default; @@ -49,8 +47,6 @@ class ExportServiceTracingStub : public ExportServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/profiler/v2/internal/profiler_auth_decorator.cc b/google/cloud/profiler/v2/internal/profiler_auth_decorator.cc index 1d6eea2504051..cf4def83b4a62 100644 --- a/google/cloud/profiler/v2/internal/profiler_auth_decorator.cc +++ b/google/cloud/profiler/v2/internal/profiler_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/cloudprofiler/v2/profiler.proto #include "google/cloud/profiler/v2/internal/profiler_auth_decorator.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/profiler_logging_decorator.cc b/google/cloud/profiler/v2/internal/profiler_logging_decorator.cc index 5569df508c192..ecfcc576990a9 100644 --- a/google/cloud/profiler/v2/internal/profiler_logging_decorator.cc +++ b/google/cloud/profiler/v2/internal/profiler_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/profiler/v2/internal/profiler_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include #include diff --git a/google/cloud/profiler/v2/internal/profiler_metadata_decorator.cc b/google/cloud/profiler/v2/internal/profiler_metadata_decorator.cc index 87df10a9c56b0..f2dd30e8ecece 100644 --- a/google/cloud/profiler/v2/internal/profiler_metadata_decorator.cc +++ b/google/cloud/profiler/v2/internal/profiler_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include #include diff --git a/google/cloud/profiler/v2/internal/profiler_stub.cc b/google/cloud/profiler/v2/internal/profiler_stub.cc index 77ca3dc904e79..eceed6251bafc 100644 --- a/google/cloud/profiler/v2/internal/profiler_stub.cc +++ b/google/cloud/profiler/v2/internal/profiler_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/profiler/v2/internal/profiler_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/profiler_stub.h b/google/cloud/profiler/v2/internal/profiler_stub.h index f60c004e5b1a6..6b9c4ce572484 100644 --- a/google/cloud/profiler/v2/internal/profiler_stub.h +++ b/google/cloud/profiler/v2/internal/profiler_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/profiler_stub_factory.cc b/google/cloud/profiler/v2/internal/profiler_stub_factory.cc index 08542ec358b07..7f9f45adcd89c 100644 --- a/google/cloud/profiler/v2/internal/profiler_stub_factory.cc +++ b/google/cloud/profiler/v2/internal/profiler_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include #include diff --git a/google/cloud/profiler/v2/internal/profiler_tracing_connection.cc b/google/cloud/profiler/v2/internal/profiler_tracing_connection.cc index 90430a5973c22..e42f85d51ad67 100644 --- a/google/cloud/profiler/v2/internal/profiler_tracing_connection.cc +++ b/google/cloud/profiler/v2/internal/profiler_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProfilerServiceTracingConnection::ProfilerServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -60,16 +58,12 @@ ProfilerServiceTracingConnection::UpdateProfile( return internal::EndSpan(*span, child_->UpdateProfile(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProfilerServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/profiler/v2/internal/profiler_tracing_connection.h b/google/cloud/profiler/v2/internal/profiler_tracing_connection.h index 189d70e0359e9..e013b577b88b8 100644 --- a/google/cloud/profiler/v2/internal/profiler_tracing_connection.h +++ b/google/cloud/profiler/v2/internal/profiler_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProfilerServiceTracingConnection : public profiler_v2::ProfilerServiceConnection { public: @@ -56,8 +54,6 @@ class ProfilerServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/profiler/v2/internal/profiler_tracing_stub.cc b/google/cloud/profiler/v2/internal/profiler_tracing_stub.cc index 1aadc0b02880b..1f26fc32952c3 100644 --- a/google/cloud/profiler/v2/internal/profiler_tracing_stub.cc +++ b/google/cloud/profiler/v2/internal/profiler_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProfilerServiceTracingStub::ProfilerServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -70,15 +68,9 @@ ProfilerServiceTracingStub::UpdateProfile( child_->UpdateProfile(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProfilerServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/profiler/v2/internal/profiler_tracing_stub.h b/google/cloud/profiler/v2/internal/profiler_tracing_stub.h index c74f7bfa965a2..595e88f962cfb 100644 --- a/google/cloud/profiler/v2/internal/profiler_tracing_stub.h +++ b/google/cloud/profiler/v2/internal/profiler_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace profiler_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProfilerServiceTracingStub : public ProfilerServiceStub { public: ~ProfilerServiceTracingStub() override = default; @@ -60,8 +58,6 @@ class ProfilerServiceTracingStub : public ProfilerServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/profiler/v2/profiler_connection.h b/google/cloud/profiler/v2/profiler_connection.h index 9b4402c3a95c4..3ff353e3a391a 100644 --- a/google/cloud/profiler/v2/profiler_connection.h +++ b/google/cloud/profiler/v2/profiler_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.pb.h" #include namespace google { diff --git a/google/cloud/profiler/v2/profiler_connection_idempotency_policy.h b/google/cloud/profiler/v2/profiler_connection_idempotency_policy.h index 475fc5436916d..ccd85154a77e1 100644 --- a/google/cloud/profiler/v2/profiler_connection_idempotency_policy.h +++ b/google/cloud/profiler/v2/profiler_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudprofiler/v2/profiler.grpc.pb.h" #include namespace google { diff --git a/google/cloud/publicca/BUILD.bazel b/google/cloud/publicca/BUILD.bazel index 32479ebc68d17..2a3337344d785 100644 --- a/google/cloud/publicca/BUILD.bazel +++ b/google/cloud/publicca/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/security/publicca/v1:publicca_cc_grpc", + "@googleapis//google/cloud/security/publicca/v1:publicca_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/publicca/quickstart/.bazelrc b/google/cloud/publicca/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/publicca/quickstart/.bazelrc +++ b/google/cloud/publicca/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_auth_decorator.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_auth_decorator.cc index 3893a17114a49..8482b39ee8794 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_auth_decorator.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/security/publicca/v1/service.proto #include "google/cloud/publicca/v1/internal/public_certificate_authority_auth_decorator.h" -#include +#include "google/cloud/security/publicca/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_logging_decorator.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_logging_decorator.cc index 50379e7db35b7..8ad09f28f6f4e 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_logging_decorator.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/security/publicca/v1/service.proto #include "google/cloud/publicca/v1/internal/public_certificate_authority_logging_decorator.h" +#include "google/cloud/security/publicca/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_metadata_decorator.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_metadata_decorator.cc index 89697b2676186..7f6beccd3aa50 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_metadata_decorator.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/security/publicca/v1/service.proto #include "google/cloud/publicca/v1/internal/public_certificate_authority_metadata_decorator.h" +#include "google/cloud/security/publicca/v1/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 #include #include #include diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_stub.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_stub.cc index 9253c976428bf..3811d858dff74 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_stub.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/security/publicca/v1/service.proto #include "google/cloud/publicca/v1/internal/public_certificate_authority_stub.h" +#include "google/cloud/security/publicca/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_stub.h b/google/cloud/publicca/v1/internal/public_certificate_authority_stub.h index ca54dba2bec1e..56ae32822720c 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_stub.h +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBLICCA_V1_INTERNAL_PUBLIC_CERTIFICATE_AUTHORITY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBLICCA_V1_INTERNAL_PUBLIC_CERTIFICATE_AUTHORITY_STUB_H +#include "google/cloud/security/publicca/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_stub_factory.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_stub_factory.cc index b9787a1075d39..84fd7ca96961d 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_stub_factory.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/publicca/v1/internal/public_certificate_authority_metadata_decorator.h" #include "google/cloud/publicca/v1/internal/public_certificate_authority_stub.h" #include "google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.h" +#include "google/cloud/security/publicca/v1/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 #include #include diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.cc index 690d612870fda..4e896887ff389 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace publicca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublicCertificateAuthorityServiceTracingConnection:: PublicCertificateAuthorityServiceTracingConnection( std::shared_ptr< @@ -46,18 +44,14 @@ PublicCertificateAuthorityServiceTracingConnection::CreateExternalAccountKey( return internal::EndSpan(*span, child_->CreateExternalAccountKey(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePublicCertificateAuthorityServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.h b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.h index 7b90b3caa72f4..f764a9d5ddc59 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.h +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace publicca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublicCertificateAuthorityServiceTracingConnection : public publicca_v1::PublicCertificateAuthorityServiceConnection { public: @@ -51,8 +49,6 @@ class PublicCertificateAuthorityServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.cc b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.cc index f12cb0f124f7f..761df3aae8768 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.cc +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace publicca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublicCertificateAuthorityServiceTracingStub:: PublicCertificateAuthorityServiceTracingStub( std::shared_ptr child) @@ -48,17 +46,11 @@ PublicCertificateAuthorityServiceTracingStub::CreateExternalAccountKey( child_->CreateExternalAccountKey(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePublicCertificateAuthorityServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.h b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.h index 5a9f442b8e5e9..fd74d06f411c5 100644 --- a/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.h +++ b/google/cloud/publicca/v1/internal/public_certificate_authority_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace publicca_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublicCertificateAuthorityServiceTracingStub : public PublicCertificateAuthorityServiceStub { public: @@ -52,8 +50,6 @@ class PublicCertificateAuthorityServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/publicca/v1/public_certificate_authority_connection.h b/google/cloud/publicca/v1/public_certificate_authority_connection.h index eb46074793e50..80d53de84d8b5 100644 --- a/google/cloud/publicca/v1/public_certificate_authority_connection.h +++ b/google/cloud/publicca/v1/public_certificate_authority_connection.h @@ -21,12 +21,12 @@ #include "google/cloud/publicca/v1/internal/public_certificate_authority_retry_traits.h" #include "google/cloud/publicca/v1/public_certificate_authority_connection_idempotency_policy.h" +#include "google/cloud/security/publicca/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/publicca/v1/public_certificate_authority_connection_idempotency_policy.h b/google/cloud/publicca/v1/public_certificate_authority_connection_idempotency_policy.h index 93f9a8d51878f..12682b8db6af9 100644 --- a/google/cloud/publicca/v1/public_certificate_authority_connection_idempotency_policy.h +++ b/google/cloud/publicca/v1/public_certificate_authority_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBLICCA_V1_PUBLIC_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBLICCA_V1_PUBLIC_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/security/publicca/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/pubsub/BUILD.bazel b/google/cloud/pubsub/BUILD.bazel index 59bc8b0f07d40..d1366c18b3762 100644 --- a/google/cloud/pubsub/BUILD.bazel +++ b/google/cloud/pubsub/BUILD.bazel @@ -38,9 +38,9 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_google_googleapis//google/pubsub/v1:pubsub_cc_grpc", + "@googleapis//google/pubsub/v1:pubsub_cc_grpc", # Do not sort: grpc++ must come last - "@com_github_grpc_grpc//:grpc++", + "@grpc//:grpc++", ], ) @@ -56,7 +56,7 @@ cc_library( ":google_cloud_cpp_pubsub", "//:common", "//:grpc_utils", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -90,7 +90,7 @@ cc_library( ], deps = [ ":google_cloud_cpp_pubsub", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -104,7 +104,7 @@ cc_library( "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/strings:str_format", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings:str_format", + "@googletest//:gtest_main", ], ) for test in pubsub_client_unit_tests] diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_auth_decorator.cc b/google/cloud/pubsub/admin/internal/subscription_admin_auth_decorator.cc index 184344bbff929..0f518592bdb10 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_auth_decorator.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/pubsub/v1/pubsub.proto #include "google/cloud/pubsub/admin/internal/subscription_admin_auth_decorator.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_logging_decorator.cc b/google/cloud/pubsub/admin/internal/subscription_admin_logging_decorator.cc index 72e778d09d05f..ee1e8234074b9 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_logging_decorator.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/admin/internal/subscription_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_metadata_decorator.cc b/google/cloud/pubsub/admin/internal/subscription_admin_metadata_decorator.cc index fd6e0ee727023..62f279099d43d 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_metadata_decorator.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_stub.cc b/google/cloud/pubsub/admin/internal/subscription_admin_stub.cc index ba709c67c220b..3cf3ea56a2b34 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_stub.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/admin/internal/subscription_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_stub.h b/google/cloud/pubsub/admin/internal/subscription_admin_stub.h index 1be96564ed9c7..04594a11ff951 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_stub.h +++ b/google/cloud/pubsub/admin/internal/subscription_admin_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_stub_factory.cc b/google/cloud/pubsub/admin/internal/subscription_admin_stub_factory.cc index 2a7d85d22a410..6d8d014439939 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_stub_factory.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.cc b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.cc index 208bbd7040924..28ca763f1406e 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SubscriptionAdminTracingConnection::SubscriptionAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -169,17 +167,13 @@ SubscriptionAdminTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSubscriptionAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.h b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.h index 0fd9bb8bc6631..93de1fbfb2ee6 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.h +++ b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SubscriptionAdminTracingConnection : public pubsub_admin::SubscriptionAdminConnection { public: @@ -89,8 +87,6 @@ class SubscriptionAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.cc b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.cc index fbd7ae20f5a31..59a2dcbb7853a 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.cc +++ b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SubscriptionAdminTracingStub::SubscriptionAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -205,15 +203,9 @@ SubscriptionAdminTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSubscriptionAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.h b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.h index 146a6a68e9b6b..82c4f6732fdb1 100644 --- a/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.h +++ b/google/cloud/pubsub/admin/internal/subscription_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SubscriptionAdminTracingStub : public SubscriptionAdminStub { public: ~SubscriptionAdminTracingStub() override = default; @@ -105,8 +103,6 @@ class SubscriptionAdminTracingStub : public SubscriptionAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsub/admin/internal/topic_admin_auth_decorator.cc b/google/cloud/pubsub/admin/internal/topic_admin_auth_decorator.cc index 56ba11efcc87e..3975d39ac3beb 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_auth_decorator.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/pubsub/v1/pubsub.proto #include "google/cloud/pubsub/admin/internal/topic_admin_auth_decorator.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/topic_admin_logging_decorator.cc b/google/cloud/pubsub/admin/internal/topic_admin_logging_decorator.cc index 15e61c2bf2a4a..f6b30dff45e46 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_logging_decorator.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/admin/internal/topic_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/admin/internal/topic_admin_metadata_decorator.cc b/google/cloud/pubsub/admin/internal/topic_admin_metadata_decorator.cc index 703979521b35c..5770368049b08 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_metadata_decorator.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/admin/internal/topic_admin_stub.cc b/google/cloud/pubsub/admin/internal/topic_admin_stub.cc index 7ea8f1dc71c84..626b834fa5390 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_stub.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/admin/internal/topic_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/topic_admin_stub.h b/google/cloud/pubsub/admin/internal/topic_admin_stub.h index 6ba2e4031baab..1f0516936cf43 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_stub.h +++ b/google/cloud/pubsub/admin/internal/topic_admin_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/topic_admin_stub_factory.cc b/google/cloud/pubsub/admin/internal/topic_admin_stub_factory.cc index 4d005f6edcecb..388f138ec9fe4 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_stub_factory.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.cc b/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.cc index fb18f165597a6..e18f9659af0ae 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TopicAdminTracingConnection::TopicAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -129,16 +127,12 @@ TopicAdminTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTopicAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.h b/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.h index 4ddd86cb69b66..65cdc4f852eaf 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.h +++ b/google/cloud/pubsub/admin/internal/topic_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TopicAdminTracingConnection : public pubsub_admin::TopicAdminConnection { public: ~TopicAdminTracingConnection() override = default; @@ -76,8 +74,6 @@ class TopicAdminTracingConnection : public pubsub_admin::TopicAdminConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.cc b/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.cc index 0bfd00a1850e5..43b6525090e4c 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.cc +++ b/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TopicAdminTracingStub::TopicAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -158,15 +156,9 @@ TopicAdminTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTopicAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.h b/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.h index 6828e27c6e41d..0fcda24c9d3ee 100644 --- a/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.h +++ b/google/cloud/pubsub/admin/internal/topic_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsub_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TopicAdminTracingStub : public TopicAdminStub { public: ~TopicAdminTracingStub() override = default; @@ -90,8 +88,6 @@ class TopicAdminTracingStub : public TopicAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsub/admin/subscription_admin_connection.h b/google/cloud/pubsub/admin/subscription_admin_connection.h index e6d67032eff6d..dbbad7e66ba28 100644 --- a/google/cloud/pubsub/admin/subscription_admin_connection.h +++ b/google/cloud/pubsub/admin/subscription_admin_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/subscription_admin_connection_idempotency_policy.h b/google/cloud/pubsub/admin/subscription_admin_connection_idempotency_policy.h index d722d63b00fab..473c519767e0c 100644 --- a/google/cloud/pubsub/admin/subscription_admin_connection_idempotency_policy.h +++ b/google/cloud/pubsub/admin/subscription_admin_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/admin/topic_admin_connection.h b/google/cloud/pubsub/admin/topic_admin_connection.h index 81836bc33efd1..c9bacf524be05 100644 --- a/google/cloud/pubsub/admin/topic_admin_connection.h +++ b/google/cloud/pubsub/admin/topic_admin_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include diff --git a/google/cloud/pubsub/admin/topic_admin_connection_idempotency_policy.h b/google/cloud/pubsub/admin/topic_admin_connection_idempotency_policy.h index 33ef2aecc27d8..d2c9e2ef9aad3 100644 --- a/google/cloud/pubsub/admin/topic_admin_connection_idempotency_policy.h +++ b/google/cloud/pubsub/admin/topic_admin_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/benchmarks/BUILD.bazel b/google/cloud/pubsub/benchmarks/BUILD.bazel index 64fe4dfaa70cc..520850ae67ec0 100644 --- a/google/cloud/pubsub/benchmarks/BUILD.bazel +++ b/google/cloud/pubsub/benchmarks/BUILD.bazel @@ -30,9 +30,9 @@ licenses(["notice"]) # Apache 2.0 "//:pubsub", "//google/cloud/pubsub:pubsub_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/base", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", ], ) for program in pubsub_client_benchmark_programs] diff --git a/google/cloud/pubsub/integration_tests/BUILD.bazel b/google/cloud/pubsub/integration_tests/BUILD.bazel index cfbc7503aa0ce..06abad4ebc691 100644 --- a/google/cloud/pubsub/integration_tests/BUILD.bazel +++ b/google/cloud/pubsub/integration_tests/BUILD.bazel @@ -31,6 +31,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/pubsub:pubsub_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsub_client_integration_tests] diff --git a/google/cloud/pubsub/integration_tests/blocking_publisher_integration_test.cc b/google/cloud/pubsub/integration_tests/blocking_publisher_integration_test.cc index 8b35712edec5b..750011f6b5513 100644 --- a/google/cloud/pubsub/integration_tests/blocking_publisher_integration_test.cc +++ b/google/cloud/pubsub/integration_tests/blocking_publisher_integration_test.cc @@ -71,7 +71,6 @@ TEST_F(BlockingPublisherIntegrationTest, Basic) { ASSERT_STATUS_OK(publish); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; @@ -90,7 +89,6 @@ TEST_F(BlockingPublisherIntegrationTest, TracingDisabled) { publisher.Publish(topic_, MessageBuilder().SetData("test data").Build()); ASSERT_STATUS_OK(publish); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/internal/batch_callback.h b/google/cloud/pubsub/internal/batch_callback.h index c750ae5e29dfd..c415b5a91e12f 100644 --- a/google/cloud/pubsub/internal/batch_callback.h +++ b/google/cloud/pubsub/internal/batch_callback.h @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/span.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/internal/batch_callback_wrapper.h b/google/cloud/pubsub/internal/batch_callback_wrapper.h index 437057f7227e9..f316850a1a144 100644 --- a/google/cloud/pubsub/internal/batch_callback_wrapper.h +++ b/google/cloud/pubsub/internal/batch_callback_wrapper.h @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/message_callback.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/pubsub/internal/batch_sink.h b/google/cloud/pubsub/internal/batch_sink.h index 0dc7f8a010eb4..47ea6faf12e8e 100644 --- a/google/cloud/pubsub/internal/batch_sink.h +++ b/google/cloud/pubsub/internal/batch_sink.h @@ -20,7 +20,7 @@ #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/internal/batching_publisher_tracing_connection.cc b/google/cloud/pubsub/internal/batching_publisher_tracing_connection.cc index b947776f699e8..eb2f14eb39ba3 100644 --- a/google/cloud/pubsub/internal/batching_publisher_tracing_connection.cc +++ b/google/cloud/pubsub/internal/batching_publisher_tracing_connection.cc @@ -15,16 +15,13 @@ #include "google/cloud/pubsub/internal/batching_publisher_tracing_connection.h" #include "google/cloud/pubsub/publisher_connection.h" #include "google/cloud/internal/opentelemetry.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace { class BatchingPublisherTracingConnection : public pubsub::PublisherConnection { @@ -36,10 +33,11 @@ class BatchingPublisherTracingConnection : public pubsub::PublisherConnection { ~BatchingPublisherTracingConnection() override = default; future> Publish(PublishParams p) override { - namespace sc = opentelemetry::trace::SemanticConventions; - auto span = internal::MakeSpan( - "publisher batching", - {{sc::kCodeFunction, "pubsub::BatchingPublisherConnection::Publish"}}); + namespace sc = opentelemetry::semconv; + auto span = + internal::MakeSpan("publisher batching", + {{sc::code::kCodeFunctionName, + "pubsub::BatchingPublisherConnection::Publish"}}); auto result = child_->Publish(std::move(p)); internal::EndSpan(*span); return result; @@ -72,16 +70,6 @@ MakeBatchingPublisherTracingConnection( std::move(connection)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr -MakeBatchingPublisherTracingConnection( - std::shared_ptr connection) { - return connection; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/batching_publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/batching_publisher_tracing_connection_test.cc index 5705d858de404..9e5159a35829b 100644 --- a/google/cloud/pubsub/internal/batching_publisher_tracing_connection_test.cc +++ b/google/cloud/pubsub/internal/batching_publisher_tracing_connection_test.cc @@ -22,7 +22,7 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include namespace google { namespace cloud { @@ -45,7 +45,7 @@ using ::testing::ElementsAre; using ::testing::SizeIs; TEST(BatchingPublisherTracingConnectionTest, PublishSpan) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, Publish) @@ -72,7 +72,7 @@ TEST(BatchingPublisherTracingConnectionTest, PublishSpan) { SpanWithStatus(opentelemetry::trace::StatusCode::kOk), SpanHasAttributes( OTelAttribute( - sc::kCodeFunction, + sc::code::kCodeFunctionName, "pubsub::BatchingPublisherConnection::Publish"), OTelAttribute("gl-cpp.status_code", "OK"))))); } diff --git a/google/cloud/pubsub/internal/blocking_publisher_tracing_connection.cc b/google/cloud/pubsub/internal/blocking_publisher_tracing_connection.cc index 603d98b58776b..ef3e98e115654 100644 --- a/google/cloud/pubsub/internal/blocking_publisher_tracing_connection.cc +++ b/google/cloud/pubsub/internal/blocking_publisher_tracing_connection.cc @@ -13,39 +13,39 @@ // limitations under the License. #include "google/cloud/pubsub/internal/blocking_publisher_tracing_connection.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/pubsub/message.h" #include "google/cloud/pubsub/topic.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/status_or.h" #include +#include +#include #include -#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace { opentelemetry::nostd::shared_ptr StartPublishSpan( pubsub::Topic const& topic, pubsub::Message const& m) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kProducer; auto span = internal::MakeSpan( topic.topic_id() + " create", - {{sc::kMessagingSystem, "gcp_pubsub"}, - {sc::kMessagingDestinationName, topic.topic_id()}, + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {sc::messaging::kMessagingDestinationName, topic.topic_id()}, {"gcp.project_id", topic.project_id()}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", "create"}, - {/*sc::kMessagingMessageEnvelopeSize=*/"messaging.message.envelope.size", + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "create"}, + {/*sc::messaging::kMessagingMessageEnvelopeSize=*/"messaging.message." + "envelope.size", static_cast(MessageSize(m))}, - {sc::kCodeFunction, "pubsub::BlockingPublisher::Publish"}}, + {sc::code::kCodeFunctionName, "pubsub::BlockingPublisher::Publish"}}, options); if (!m.ordering_key().empty()) { span->SetAttribute("messaging.gcp_pubsub.message.ordering_key", @@ -92,16 +92,6 @@ MakeBlockingPublisherTracingConnection( std::move(connection)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr -MakeBlockingPublisherTracingConnection( - std::shared_ptr connection) { - return connection; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/blocking_publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/blocking_publisher_tracing_connection_test.cc index ce29cb4022765..62eafd27b7528 100644 --- a/google/cloud/pubsub/internal/blocking_publisher_tracing_connection_test.cc +++ b/google/cloud/pubsub/internal/blocking_publisher_tracing_connection_test.cc @@ -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 "google/cloud/pubsub/internal/blocking_publisher_tracing_connection.h" #include "google/cloud/pubsub/blocking_publisher_connection.h" #include "google/cloud/pubsub/message.h" @@ -25,7 +23,8 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include +#include namespace google { namespace cloud { @@ -53,7 +52,7 @@ using ::testing::ElementsAre; using ::testing::Not; TEST(BlockingPublisherTracingConnectionTest, PublishSpanOnSuccess) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, Publish) @@ -79,24 +78,27 @@ TEST(BlockingPublisherTracingConnectionTest, PublishSpanOnSuccess) { SpanNamed("test-topic create"), SpanWithStatus(opentelemetry::trace::StatusCode::kOk), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), - OTelAttribute(sc::kMessagingDestinationName, - "test-topic"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-topic"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( "messaging.gcp_pubsub.message.ordering_key", "ordering-key-0"), OTelAttribute("gl-cpp.status_code", "OK"), - OTelAttribute(/*sc::kMessagingMessageEnvelopeSize=*/ - "messaging.message.envelope.size", - 45), + OTelAttribute< + std:: + int64_t>(/*sc::messaging::kMessagingMessageEnvelopeSize=*/ + "messaging.message.envelope.size", 45), OTelAttribute("messaging.message_id", "test-id-0"), OTelAttribute( - sc::kCodeFunction, "pubsub::BlockingPublisher::Publish"))))); + sc::code::kCodeFunctionName, + "pubsub::BlockingPublisher::Publish"))))); } TEST(BlockingPublisherTracingConnectionTest, PublishSpanOnError) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, Publish) @@ -122,17 +124,19 @@ TEST(BlockingPublisherTracingConnectionTest, PublishSpanOnError) { SpanNamed("test-topic create"), SpanWithStatus(opentelemetry::trace::StatusCode::kError), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), - OTelAttribute(sc::kMessagingDestinationName, - "test-topic"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-topic"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( "messaging.gcp_pubsub.message.ordering_key", "ordering-key-0"), OTelAttribute("gl-cpp.status_code", kErrorCode), - OTelAttribute(/*sc::kMessagingMessageEnvelopeSize=*/ - "messaging.message.envelope.size", - 45))))); + OTelAttribute< + std:: + int64_t>(/*sc::messaging::kMessagingMessageEnvelopeSize=*/ + "messaging.message.envelope.size", 45))))); } TEST(BlockingPublisherTracingConnectionTest, PublishSpanOmitsOrderingKey) { @@ -187,5 +191,3 @@ TEST(MakeBlockingPublisherTracingConnectionTest, CreateTracingConnection) { } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/default_batch_callback.h b/google/cloud/pubsub/internal/default_batch_callback.h index 4b387a0973f72..eb3a330ff9fc4 100644 --- a/google/cloud/pubsub/internal/default_batch_callback.h +++ b/google/cloud/pubsub/internal/default_batch_callback.h @@ -18,7 +18,7 @@ #include "google/cloud/pubsub/internal/batch_callback.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/pubsub/internal/default_message_callback.h b/google/cloud/pubsub/internal/default_message_callback.h index 3d44f5928d374..11c35f6fdfd76 100644 --- a/google/cloud/pubsub/internal/default_message_callback.h +++ b/google/cloud/pubsub/internal/default_message_callback.h @@ -17,7 +17,7 @@ #include "google/cloud/pubsub/internal/message_callback.h" #include "google/cloud/pubsub/version.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/pubsub/internal/default_pull_ack_handler.cc b/google/cloud/pubsub/internal/default_pull_ack_handler.cc index 2185d67b5f4e8..1654de0cfbb42 100644 --- a/google/cloud/pubsub/internal/default_pull_ack_handler.cc +++ b/google/cloud/pubsub/internal/default_pull_ack_handler.cc @@ -18,7 +18,7 @@ #include "google/cloud/pubsub/options.h" #include "google/cloud/internal/async_retry_loop.h" #include "google/cloud/internal/make_status.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/internal/extend_leases_with_retry.cc b/google/cloud/pubsub/internal/extend_leases_with_retry.cc index 94d12aab022a2..0caa2dbaf47a8 100644 --- a/google/cloud/pubsub/internal/extend_leases_with_retry.cc +++ b/google/cloud/pubsub/internal/extend_leases_with_retry.cc @@ -185,8 +185,6 @@ class ExtendLeasesHandle int attempts_ = 0; }; -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TracingLeaseManagement : public LeaseManagement { public: TracingLeaseManagement(std::shared_ptr child, @@ -221,15 +219,6 @@ std::shared_ptr MakeTracingLeaseManagement( std::move(batch_callback)); } -#else // #ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakeTracingLeaseManagement( - std::shared_ptr impl, std::shared_ptr) { - return impl; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace future ExtendLeasesWithRetry( diff --git a/google/cloud/pubsub/internal/extend_leases_with_retry.h b/google/cloud/pubsub/internal/extend_leases_with_retry.h index 1140cc5d3f58a..a89eaba22130f 100644 --- a/google/cloud/pubsub/internal/extend_leases_with_retry.h +++ b/google/cloud/pubsub/internal/extend_leases_with_retry.h @@ -22,7 +22,7 @@ #include "google/cloud/future.h" #include "google/cloud/status.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/pubsub/internal/extend_leases_with_retry_test.cc b/google/cloud/pubsub/internal/extend_leases_with_retry_test.cc index 3d06e67ee356b..d5fbd92ea69b3 100644 --- a/google/cloud/pubsub/internal/extend_leases_with_retry_test.cc +++ b/google/cloud/pubsub/internal/extend_leases_with_retry_test.cc @@ -190,8 +190,6 @@ TEST(ExtendLeasesWithRetry, FailureTooManyTransients) { EXPECT_THAT(log_lines, Contains(HasSubstr("ack_id=test-003"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TEST(ExtendLeasesWithRetry, SuccessWithOtelEnabled) { auto mock = std::make_shared(); auto mock_cq = std::make_shared(); @@ -231,8 +229,6 @@ TEST(ExtendLeasesWithRetry, SuccessWithOtelEnabled) { EXPECT_STATUS_OK(result.get()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.cc b/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.cc index 2c70c8d1dc975..c60bde49a69ad 100644 --- a/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.cc +++ b/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.cc @@ -14,19 +14,15 @@ #include "google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.h" #include "google/cloud/pubsub/publisher_connection.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/opentelemetry.h" +#include #include -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { class FlowControlledPublisherTracingConnection : public pubsub::PublisherConnection { @@ -38,10 +34,10 @@ class FlowControlledPublisherTracingConnection ~FlowControlledPublisherTracingConnection() override = default; future> Publish(PublishParams p) override { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span = internal::MakeSpan( "publisher flow control", - {{sc::kCodeFunction, + {{sc::code::kCodeFunctionName, "pubsub::FlowControlledPublisherConnection::Publish"}}); auto result = child_->Publish(std::move(p)); internal::EndSpan(*span); @@ -75,16 +71,6 @@ MakeFlowControlledPublisherTracingConnection( std::move(connection)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr -MakeFlowControlledPublisherTracingConnection( - std::shared_ptr connection) { - return connection; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection_test.cc index cb6b8942c7426..c9c55d415c516 100644 --- a/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection_test.cc +++ b/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection_test.cc @@ -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 "google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.h" #include "google/cloud/pubsub/mocks/mock_publisher_connection.h" #include "google/cloud/pubsub/publisher_connection.h" @@ -22,7 +20,7 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include namespace google { namespace cloud { @@ -47,7 +45,7 @@ using ::testing::ElementsAre; using ::testing::SizeIs; TEST(FlowControlledPublisherTracingConnectionTest, PublishSpan) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, Publish) @@ -75,7 +73,7 @@ TEST(FlowControlledPublisherTracingConnectionTest, PublishSpan) { SpanWithStatus(opentelemetry::trace::StatusCode::kOk), SpanHasAttributes( OTelAttribute( - sc::kCodeFunction, + sc::code::kCodeFunctionName, "pubsub::FlowControlledPublisherConnection::Publish"), OTelAttribute("gl-cpp.status_code", "OK"))))); } @@ -139,5 +137,3 @@ TEST(MakeFlowControlledPublisherTracingConnectionTest, } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/message_callback.h b/google/cloud/pubsub/internal/message_callback.h index b595683383c32..bdf0cbbe0bfee 100644 --- a/google/cloud/pubsub/internal/message_callback.h +++ b/google/cloud/pubsub/internal/message_callback.h @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/span.h" #include "google/cloud/pubsub/message.h" #include "google/cloud/pubsub/version.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/internal/message_carrier.cc b/google/cloud/pubsub/internal/message_carrier.cc index 74e6e7b226231..c3efd005dd22d 100644 --- a/google/cloud/pubsub/internal/message_carrier.cc +++ b/google/cloud/pubsub/internal/message_carrier.cc @@ -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 "google/cloud/pubsub/internal/message_carrier.h" #include "google/cloud/pubsub/message.h" #include "google/cloud/internal/absl_str_cat_quiet.h" @@ -52,5 +50,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/message_carrier.h b/google/cloud/pubsub/internal/message_carrier.h index 9e8e9d48d4423..f48744484ad24 100644 --- a/google/cloud/pubsub/internal/message_carrier.h +++ b/google/cloud/pubsub/internal/message_carrier.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_MESSAGE_CARRIER_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_MESSAGE_CARRIER_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/pubsub/message.h" #include "google/cloud/version.h" #include @@ -60,6 +58,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_MESSAGE_CARRIER_H diff --git a/google/cloud/pubsub/internal/message_carrier_test.cc b/google/cloud/pubsub/internal/message_carrier_test.cc index 621e0f11df190..d212013d047d7 100644 --- a/google/cloud/pubsub/internal/message_carrier_test.cc +++ b/google/cloud/pubsub/internal/message_carrier_test.cc @@ -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 "google/cloud/pubsub/internal/message_carrier.h" #include "google/cloud/pubsub/message.h" #include @@ -71,5 +69,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/message_propagator.cc b/google/cloud/pubsub/internal/message_propagator.cc index d433d8301bf28..2b032a4c455f5 100644 --- a/google/cloud/pubsub/internal/message_propagator.cc +++ b/google/cloud/pubsub/internal/message_propagator.cc @@ -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 "google/cloud/pubsub/internal/message_propagator.h" #include "google/cloud/pubsub/internal/message_carrier.h" #include "google/cloud/pubsub/message.h" @@ -45,5 +43,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/message_propagator.h b/google/cloud/pubsub/internal/message_propagator.h index a04176c5fed0b..1bbd10c71574c 100644 --- a/google/cloud/pubsub/internal/message_propagator.h +++ b/google/cloud/pubsub/internal/message_propagator.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_MESSAGE_PROPAGATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_MESSAGE_PROPAGATOR_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/pubsub/internal/message_carrier.h" #include "google/cloud/pubsub/message.h" #include @@ -48,6 +46,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_MESSAGE_PROPAGATOR_H diff --git a/google/cloud/pubsub/internal/message_propagator_test.cc b/google/cloud/pubsub/internal/message_propagator_test.cc index d948369b02a50..f9584343eb575 100644 --- a/google/cloud/pubsub/internal/message_propagator_test.cc +++ b/google/cloud/pubsub/internal/message_propagator_test.cc @@ -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 "google/cloud/pubsub/internal/message_propagator.h" #include "google/cloud/pubsub/internal/message_carrier.h" #include "google/cloud/pubsub/message.h" @@ -77,5 +75,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/publisher_auth_decorator.cc b/google/cloud/pubsub/internal/publisher_auth_decorator.cc index d38f7de840f73..977d88bf5c9c8 100644 --- a/google/cloud/pubsub/internal/publisher_auth_decorator.cc +++ b/google/cloud/pubsub/internal/publisher_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/pubsub/v1/pubsub.proto #include "google/cloud/pubsub/internal/publisher_auth_decorator.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/publisher_logging_decorator.cc b/google/cloud/pubsub/internal/publisher_logging_decorator.cc index 441eb3e7072f2..650d9a16d8384 100644 --- a/google/cloud/pubsub/internal/publisher_logging_decorator.cc +++ b/google/cloud/pubsub/internal/publisher_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/publisher_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/publisher_metadata_decorator.cc b/google/cloud/pubsub/internal/publisher_metadata_decorator.cc index 2eb9e3771b152..22de7aefcf9b3 100644 --- a/google/cloud/pubsub/internal/publisher_metadata_decorator.cc +++ b/google/cloud/pubsub/internal/publisher_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/publisher_stub.cc b/google/cloud/pubsub/internal/publisher_stub.cc index 8b6401ee66bdd..26cfae1ef01de 100644 --- a/google/cloud/pubsub/internal/publisher_stub.cc +++ b/google/cloud/pubsub/internal/publisher_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/publisher_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/publisher_stub.h b/google/cloud/pubsub/internal/publisher_stub.h index 0345b4472e658..28cc4aab92430 100644 --- a/google/cloud/pubsub/internal/publisher_stub.h +++ b/google/cloud/pubsub/internal/publisher_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/publisher_stub_factory.cc b/google/cloud/pubsub/internal/publisher_stub_factory.cc index eb6c9d5cd7b7c..32ade81bd0324 100644 --- a/google/cloud/pubsub/internal/publisher_stub_factory.cc +++ b/google/cloud/pubsub/internal/publisher_stub_factory.cc @@ -25,8 +25,8 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/pubsub/internal/publisher_stub_factory_test.cc b/google/cloud/pubsub/internal/publisher_stub_factory_test.cc index 3619fb4da450b..3c6eb462cbba9 100644 --- a/google/cloud/pubsub/internal/publisher_stub_factory_test.cc +++ b/google/cloud/pubsub/internal/publisher_stub_factory_test.cc @@ -205,7 +205,6 @@ TEST_F(PublisherStubFactory, Logging) { EXPECT_THAT(log.ExtractLines(), Contains(HasSubstr("CreateTopic"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -284,7 +283,6 @@ TEST_F(PublisherStubFactory, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY // The following tests are for all the rpcs on the stub. TEST_F(PublisherStubFactory, CreateTopic) { diff --git a/google/cloud/pubsub/internal/publisher_tracing_connection.cc b/google/cloud/pubsub/internal/publisher_tracing_connection.cc index d0156ec3c2a68..e64ecddca409f 100644 --- a/google/cloud/pubsub/internal/publisher_tracing_connection.cc +++ b/google/cloud/pubsub/internal/publisher_tracing_connection.cc @@ -13,49 +13,49 @@ // limitations under the License. #include "google/cloud/pubsub/internal/publisher_tracing_connection.h" +#include "google/cloud/pubsub/internal/message_propagator.h" #include "google/cloud/pubsub/message.h" #include "google/cloud/pubsub/publisher_connection.h" #include "google/cloud/future.h" -#include "google/cloud/status.h" -#include "google/cloud/version.h" -#include -#include -#include -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include "google/cloud/pubsub/internal/message_propagator.h" #include "google/cloud/internal/opentelemetry.h" +#include "google/cloud/status.h" #include "google/cloud/status_or.h" +#include "google/cloud/version.h" #include #include +#include +#include #include #include -#include #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include +#include +#include namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace { opentelemetry::nostd::shared_ptr StartPublishSpan( pubsub::Topic const& topic, pubsub::Message const& m) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kProducer; auto span = internal::MakeSpan( topic.topic_id() + " create", - {{sc::kMessagingSystem, "gcp_pubsub"}, - {sc::kMessagingDestinationName, topic.topic_id()}, + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {sc::messaging::kMessagingDestinationName, topic.topic_id()}, {"gcp.project_id", topic.project_id()}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", "create"}, - {/*sc::kMessagingMessageEnvelopeSize=*/"messaging.message.envelope.size", + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "create"}, + {/*sc::messaging::kMessagingMessageEnvelopeSize=*/"messaging.message." + "envelope.size", static_cast(MessageSize(m))}, - {sc::kCodeFunction, "pubsub::PublisherConnection::Publish"}}, + {sc::code::kCodeFunctionName, "pubsub::PublisherConnection::Publish"}}, options); if (!m.ordering_key().empty()) { span->SetAttribute("messaging.gcp_pubsub.message.ordering_key", @@ -67,10 +67,11 @@ opentelemetry::nostd::shared_ptr StartPublishSpan( future> EndPublishSpan( opentelemetry::nostd::shared_ptr span, future> f) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; return f.then([span = std::move(span)](auto fut) { auto message_id = fut.get(); - if (message_id) span->SetAttribute(sc::kMessagingMessageId, *message_id); + if (message_id) + span->SetAttribute(sc::messaging::kMessagingMessageId, *message_id); return internal::EndSpan(*span, std::move(message_id)); }); } @@ -128,16 +129,6 @@ std::shared_ptr MakePublisherTracingConnection( std::move(connection)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakePublisherTracingConnection( - pubsub::Topic, // NOLINT(performance-unnecessary-value-param) - std::shared_ptr connection) { - return connection; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/publisher_tracing_connection_test.cc index e5ef264bbc191..a86ffe4313c42 100644 --- a/google/cloud/pubsub/internal/publisher_tracing_connection_test.cc +++ b/google/cloud/pubsub/internal/publisher_tracing_connection_test.cc @@ -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 "google/cloud/pubsub/internal/publisher_tracing_connection.h" #include "google/cloud/pubsub/message.h" #include "google/cloud/pubsub/mocks/mock_publisher_connection.h" @@ -26,7 +24,8 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include +#include namespace google { namespace cloud { @@ -58,7 +57,7 @@ using ::testing::Pair; using ::testing::StartsWith; TEST(PublisherTracingConnectionTest, PublishSpanOnSuccess) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, Publish) @@ -84,28 +83,31 @@ TEST(PublisherTracingConnectionTest, PublishSpanOnSuccess) { SpanNamed("test-topic create"), SpanWithStatus(opentelemetry::trace::StatusCode::kOk), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), - OTelAttribute(sc::kMessagingDestinationName, - "test-topic"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-topic"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( "messaging.gcp_pubsub.message.ordering_key", "ordering-key-0"), OTelAttribute("gl-cpp.status_code", "OK"), - OTelAttribute(/*sc::kMessagingMessageEnvelopeSize=*/ - "messaging.message.envelope.size", - 45), + OTelAttribute< + std:: + int64_t>(/*sc::messaging::kMessagingMessageEnvelopeSize=*/ + "messaging.message.envelope.size", 45), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "create"), - OTelAttribute(sc::kMessagingMessageId, "test-id-0"), + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "create"), + OTelAttribute(sc::messaging::kMessagingMessageId, + "test-id-0"), OTelAttribute( - sc::kCodeFunction, + sc::code::kCodeFunctionName, "pubsub::PublisherConnection::Publish"))))); } TEST(PublisherTracingConnectionTest, PublishSpanOnError) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, Publish) @@ -132,20 +134,22 @@ TEST(PublisherTracingConnectionTest, PublishSpanOnError) { SpanNamed("test-topic create"), SpanWithStatus(opentelemetry::trace::StatusCode::kError), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), - OTelAttribute(sc::kMessagingDestinationName, - "test-topic"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-topic"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( "messaging.gcp_pubsub.message.ordering_key", "ordering-key-0"), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "create"), + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "create"), OTelAttribute("gl-cpp.status_code", kErrorCode), - OTelAttribute(/*sc::kMessagingMessageEnvelopeSize=*/ - "messaging.message.envelope.size", - 45))))); + OTelAttribute< + std:: + int64_t>(/*sc::messaging::kMessagingMessageEnvelopeSize=*/ + "messaging.message.envelope.size", 45))))); } TEST(PublisherTracingConnectionTest, PublishInjectsTraceContext) { @@ -251,5 +255,3 @@ TEST(MakePublisherTracingConnectionTest, CreateTracingConnection) { } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/publisher_tracing_stub.cc b/google/cloud/pubsub/internal/publisher_tracing_stub.cc index 6c9790e0a7048..7e9fe5c215f36 100644 --- a/google/cloud/pubsub/internal/publisher_tracing_stub.cc +++ b/google/cloud/pubsub/internal/publisher_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublisherTracingStub::PublisherTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -180,15 +178,9 @@ PublisherTracingStub::AsyncPublish( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePublisherTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/internal/publisher_tracing_stub.h b/google/cloud/pubsub/internal/publisher_tracing_stub.h index 9423dee21cc8d..bea43495a67b0 100644 --- a/google/cloud/pubsub/internal/publisher_tracing_stub.h +++ b/google/cloud/pubsub/internal/publisher_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublisherTracingStub : public PublisherStub { public: ~PublisherTracingStub() override = default; @@ -100,8 +98,6 @@ class PublisherTracingStub : public PublisherStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsub/internal/pull_ack_handler_factory_test.cc b/google/cloud/pubsub/internal/pull_ack_handler_factory_test.cc index 1116d12b78e99..0d5aa2a3c0467 100644 --- a/google/cloud/pubsub/internal/pull_ack_handler_factory_test.cc +++ b/google/cloud/pubsub/internal/pull_ack_handler_factory_test.cc @@ -93,7 +93,6 @@ TEST(PullAckHandlerTest, AckSimple) { pending.first.set_value(false); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanHasInstrumentationScope; @@ -177,8 +176,6 @@ TEST(PullAckHandlerTest, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal diff --git a/google/cloud/pubsub/internal/pull_lease_manager_factory_test.cc b/google/cloud/pubsub/internal/pull_lease_manager_factory_test.cc index 49d8797c620e1..112b6cf13b088 100644 --- a/google/cloud/pubsub/internal/pull_lease_manager_factory_test.cc +++ b/google/cloud/pubsub/internal/pull_lease_manager_factory_test.cc @@ -89,7 +89,6 @@ TEST(DefaultPullLeaseManager, ExtendLeaseDeadlineSimple) { EXPECT_STATUS_OK(status.get()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanHasInstrumentationScope; @@ -168,8 +167,6 @@ TEST(DefaultPullLeaseManager, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal diff --git a/google/cloud/pubsub/internal/schema_auth_decorator.cc b/google/cloud/pubsub/internal/schema_auth_decorator.cc index 2e17b6289d56f..0700eafd4b8c0 100644 --- a/google/cloud/pubsub/internal/schema_auth_decorator.cc +++ b/google/cloud/pubsub/internal/schema_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/pubsub/v1/schema.proto #include "google/cloud/pubsub/internal/schema_auth_decorator.h" -#include +#include "google/pubsub/v1/schema.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/schema_logging_decorator.cc b/google/cloud/pubsub/internal/schema_logging_decorator.cc index 83da27a9d0e2a..cd9887ff2c6a6 100644 --- a/google/cloud/pubsub/internal/schema_logging_decorator.cc +++ b/google/cloud/pubsub/internal/schema_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/schema_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/schema.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/schema_metadata_decorator.cc b/google/cloud/pubsub/internal/schema_metadata_decorator.cc index 92a4d78dad6da..08d816cb71bd6 100644 --- a/google/cloud/pubsub/internal/schema_metadata_decorator.cc +++ b/google/cloud/pubsub/internal/schema_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/schema.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/schema_stub.cc b/google/cloud/pubsub/internal/schema_stub.cc index 39fb5f991eed5..69d2e0dec486c 100644 --- a/google/cloud/pubsub/internal/schema_stub.cc +++ b/google/cloud/pubsub/internal/schema_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/internal/schema_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/schema.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/schema_stub.h b/google/cloud/pubsub/internal/schema_stub.h index 1e67e671655fe..da63b127b7ac6 100644 --- a/google/cloud/pubsub/internal/schema_stub.h +++ b/google/cloud/pubsub/internal/schema_stub.h @@ -22,8 +22,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/schema.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/schema_stub_factory.cc b/google/cloud/pubsub/internal/schema_stub_factory.cc index 1cb81f0e3fe16..1c24c501788cd 100644 --- a/google/cloud/pubsub/internal/schema_stub_factory.cc +++ b/google/cloud/pubsub/internal/schema_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/schema.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/schema_tracing_connection.cc b/google/cloud/pubsub/internal/schema_tracing_connection.cc index 798355ca8a6dc..3d8152963a4a8 100644 --- a/google/cloud/pubsub/internal/schema_tracing_connection.cc +++ b/google/cloud/pubsub/internal/schema_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SchemaServiceTracingConnection::SchemaServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -149,16 +147,12 @@ SchemaServiceTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSchemaServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/pubsub/internal/schema_tracing_connection.h b/google/cloud/pubsub/internal/schema_tracing_connection.h index ca2e5ef987a8b..2d7121a7bd2f3 100644 --- a/google/cloud/pubsub/internal/schema_tracing_connection.h +++ b/google/cloud/pubsub/internal/schema_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SchemaServiceTracingConnection : public pubsub::SchemaServiceConnection { public: ~SchemaServiceTracingConnection() override = default; @@ -82,8 +80,6 @@ class SchemaServiceTracingConnection : public pubsub::SchemaServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/pubsub/internal/schema_tracing_stub.cc b/google/cloud/pubsub/internal/schema_tracing_stub.cc index 1594242ac3273..164b4f305224b 100644 --- a/google/cloud/pubsub/internal/schema_tracing_stub.cc +++ b/google/cloud/pubsub/internal/schema_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SchemaServiceTracingStub::SchemaServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -181,15 +179,9 @@ SchemaServiceTracingStub::TestIamPermissions( context, *span, child_->TestIamPermissions(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSchemaServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/internal/schema_tracing_stub.h b/google/cloud/pubsub/internal/schema_tracing_stub.h index ee9f863191947..db2409b2c3bd1 100644 --- a/google/cloud/pubsub/internal/schema_tracing_stub.h +++ b/google/cloud/pubsub/internal/schema_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SchemaServiceTracingStub : public SchemaServiceStub { public: ~SchemaServiceTracingStub() override = default; @@ -96,8 +94,6 @@ class SchemaServiceTracingStub : public SchemaServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsub/internal/span.h b/google/cloud/pubsub/internal/span.h index c32e925117d8c..9ff2298df6a7e 100644 --- a/google/cloud/pubsub/internal/span.h +++ b/google/cloud/pubsub/internal/span.h @@ -16,9 +16,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_SPAN_H #include "google/cloud/pubsub/version.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include namespace google { @@ -28,12 +26,10 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /** * Span class stores an OpenTelemetery span which can only be accessed by code - * compiled with GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY. + * compiled with Opentelemetry. */ struct Span { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY opentelemetry::nostd::shared_ptr span; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/internal/streaming_subscription_batch_source.h b/google/cloud/pubsub/internal/streaming_subscription_batch_source.h index f55568e4cd19e..5c5c64f54756e 100644 --- a/google/cloud/pubsub/internal/streaming_subscription_batch_source.h +++ b/google/cloud/pubsub/internal/streaming_subscription_batch_source.h @@ -26,7 +26,7 @@ #include "google/cloud/future.h" #include "google/cloud/status.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/subscriber_auth_decorator.cc b/google/cloud/pubsub/internal/subscriber_auth_decorator.cc index d9c0b49ad1347..e17ed88a50c20 100644 --- a/google/cloud/pubsub/internal/subscriber_auth_decorator.cc +++ b/google/cloud/pubsub/internal/subscriber_auth_decorator.cc @@ -18,7 +18,7 @@ #include "google/cloud/pubsub/internal/subscriber_auth_decorator.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/subscriber_logging_decorator.cc b/google/cloud/pubsub/internal/subscriber_logging_decorator.cc index 8fddcaa502212..5e1ce8506a7e3 100644 --- a/google/cloud/pubsub/internal/subscriber_logging_decorator.cc +++ b/google/cloud/pubsub/internal/subscriber_logging_decorator.cc @@ -20,7 +20,7 @@ #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/subscriber_metadata_decorator.cc b/google/cloud/pubsub/internal/subscriber_metadata_decorator.cc index 3b73e6f47a358..9eddc64b7d334 100644 --- a/google/cloud/pubsub/internal/subscriber_metadata_decorator.cc +++ b/google/cloud/pubsub/internal/subscriber_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/subscriber_stub.cc b/google/cloud/pubsub/internal/subscriber_stub.cc index 5f59d6a634817..57d1eaf4b051d 100644 --- a/google/cloud/pubsub/internal/subscriber_stub.cc +++ b/google/cloud/pubsub/internal/subscriber_stub.cc @@ -20,7 +20,7 @@ #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/subscriber_stub.h b/google/cloud/pubsub/internal/subscriber_stub.h index 0da1146a79dd5..05a88d82be26b 100644 --- a/google/cloud/pubsub/internal/subscriber_stub.h +++ b/google/cloud/pubsub/internal/subscriber_stub.h @@ -25,8 +25,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/subscriber_stub_factory.cc b/google/cloud/pubsub/internal/subscriber_stub_factory.cc index 1d068a884b5fd..fe1661eadd139 100644 --- a/google/cloud/pubsub/internal/subscriber_stub_factory.cc +++ b/google/cloud/pubsub/internal/subscriber_stub_factory.cc @@ -25,8 +25,8 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/pubsub.grpc.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/pubsub/internal/subscriber_stub_factory_test.cc b/google/cloud/pubsub/internal/subscriber_stub_factory_test.cc index 9b0b62ca719d7..e29af3adbc8e5 100644 --- a/google/cloud/pubsub/internal/subscriber_stub_factory_test.cc +++ b/google/cloud/pubsub/internal/subscriber_stub_factory_test.cc @@ -206,7 +206,6 @@ TEST_F(SubscriberStubFactory, Logging) { EXPECT_THAT(log.ExtractLines(), Contains(HasSubstr("CreateSubscription"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -286,7 +285,6 @@ TEST_F(SubscriberStubFactory, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/internal/subscriber_tracing_connection.cc b/google/cloud/pubsub/internal/subscriber_tracing_connection.cc index dfb9e592d7b8c..5b9e0b193ce48 100644 --- a/google/cloud/pubsub/internal/subscriber_tracing_connection.cc +++ b/google/cloud/pubsub/internal/subscriber_tracing_connection.cc @@ -17,35 +17,34 @@ #include "google/cloud/pubsub/options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/opentelemetry.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include +#include +#include #include -#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { opentelemetry::nostd::shared_ptr StartPullSpan() { auto const& current = internal::CurrentOptions(); auto const& subscription = current.get(); - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kConsumer; auto span = internal::MakeSpan( subscription.subscription_id() + " receive", - {{sc::kMessagingSystem, "gcp_pubsub"}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", "receive"}, - {sc::kCodeFunction, "pubsub::SubscriberConnection::Pull"}, + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "receive"}, + {sc::code::kCodeFunctionName, "pubsub::SubscriberConnection::Pull"}, {"gcp.project_id", subscription.project_id()}, - {sc::kMessagingDestinationName, subscription.subscription_id()}}, + {sc::messaging::kMessagingDestinationName, + subscription.subscription_id()}}, options); return span; } @@ -56,16 +55,18 @@ StatusOr EndPullSpan( opentelemetry::context::propagation::TextMapPropagator> const& propagator, StatusOr response) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; if (response.ok()) { auto message = response.value().message; - span->SetAttribute(sc::kMessagingMessageId, message.message_id()); + span->SetAttribute(sc::messaging::kMessagingMessageId, + message.message_id()); if (!message.ordering_key().empty()) { span->SetAttribute("messaging.gcp_pubsub.message.ordering_key", message.ordering_key()); } span->SetAttribute( - /*sc::kMessagingMessageEnvelopeSize=*/"messaging.message.envelope.size", + /*sc::messaging::kMessagingMessageEnvelopeSize=*/ + "messaging.message.envelope.size", static_cast(MessageSize(message))); auto current = opentelemetry::context::RuntimeContext::GetCurrent(); @@ -128,15 +129,6 @@ std::shared_ptr MakeSubscriberTracingConnection( return std::make_shared(std::move(connection)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakeSubscriberTracingConnection( - std::shared_ptr connection) { - return connection; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc b/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc index e4766d3667435..1ebf2feb8a2b6 100644 --- a/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc +++ b/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc @@ -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 "google/cloud/pubsub/internal/subscriber_tracing_connection.h" #include "google/cloud/pubsub/ack_handler.h" #include "google/cloud/pubsub/exactly_once_ack_handler.h" @@ -32,8 +30,9 @@ #include "google/cloud/testing_util/status_matchers.h" #include #include +#include +#include #include -#include namespace google { namespace cloud { @@ -127,7 +126,7 @@ TEST(SubscriberTracingConnectionTest, PullOnError) { } TEST(SubscriberTracingConnectionTest, PullAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, options); @@ -143,25 +142,24 @@ TEST(SubscriberTracingConnectionTest, PullAttributes) { auto response = connection->Pull(); EXPECT_STATUS_OK(response); auto spans = span_catcher->GetSpans(); + EXPECT_THAT(spans, Contains(AllOf( + SpanNamed("test-subscription receive"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription receive"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); + sc::code::kCodeFunctionName, + "pubsub::SubscriberConnection::Pull"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription receive"), SpanHasAttributes(OTelAttribute( - sc::kCodeFunction, - "pubsub::SubscriberConnection::Pull"))))); - EXPECT_THAT( - spans, Contains(AllOf( - SpanNamed("test-subscription receive"), - SpanHasAttributes(OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "receive"))))); + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "receive"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription receive"), SpanHasAttributes(OTelAttribute( - sc::kMessagingDestinationName, + sc::messaging::kMessagingDestinationName, TestSubscription().subscription_id()))))); EXPECT_THAT( spans, @@ -171,12 +169,12 @@ TEST(SubscriberTracingConnectionTest, PullAttributes) { EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription receive"), SpanHasAttributes(OTelAttribute( - sc::kMessagingMessageId, _))))); - EXPECT_THAT(spans, - Contains(AllOf(SpanNamed("test-subscription receive"), - SpanHasAttributes(OTelAttribute( - /*sc::kMessagingMessageEnvelopeSize=*/ - "messaging.message.envelope.size", 108))))); + sc::messaging::kMessagingMessageId, _))))); + EXPECT_THAT(spans, Contains(AllOf( + SpanNamed("test-subscription receive"), + SpanHasAttributes(OTelAttribute( + /*sc::messaging::kMessagingMessageEnvelopeSize=*/ + "messaging.message.envelope.size", 108))))); } TEST(SubscriberTracingConnectionTest, PullSetsOrderingKeyAttributeIfExists) { @@ -346,5 +344,3 @@ TEST(SubscriberTracingConnectionTest, options) { } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/subscriber_tracing_stub.cc b/google/cloud/pubsub/internal/subscriber_tracing_stub.cc index d7aeab4ac18c8..f36e4097abfbf 100644 --- a/google/cloud/pubsub/internal/subscriber_tracing_stub.cc +++ b/google/cloud/pubsub/internal/subscriber_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SubscriberTracingStub::SubscriberTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -257,15 +255,9 @@ future SubscriberTracingStub::AsyncAcknowledge( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSubscriberTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/internal/subscriber_tracing_stub.h b/google/cloud/pubsub/internal/subscriber_tracing_stub.h index c5ba84e088eff..1768e98df1547 100644 --- a/google/cloud/pubsub/internal/subscriber_tracing_stub.h +++ b/google/cloud/pubsub/internal/subscriber_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SubscriberTracingStub : public SubscriberStub { public: ~SubscriberTracingStub() override = default; @@ -128,8 +126,6 @@ class SubscriberTracingStub : public SubscriberStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsub/internal/subscription_batch_source.h b/google/cloud/pubsub/internal/subscription_batch_source.h index 31acd8bdbc836..d088d28d8b869 100644 --- a/google/cloud/pubsub/internal/subscription_batch_source.h +++ b/google/cloud/pubsub/internal/subscription_batch_source.h @@ -20,7 +20,7 @@ #include "google/cloud/future.h" #include "google/cloud/status.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/subscription_message_queue.h b/google/cloud/pubsub/internal/subscription_message_queue.h index bf0e76609d136..a98da1ba085f3 100644 --- a/google/cloud/pubsub/internal/subscription_message_queue.h +++ b/google/cloud/pubsub/internal/subscription_message_queue.h @@ -22,7 +22,7 @@ #include "google/cloud/future.h" #include "google/cloud/internal/random.h" #include "google/cloud/status.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include #include diff --git a/google/cloud/pubsub/internal/subscription_message_source.h b/google/cloud/pubsub/internal/subscription_message_source.h index 4c8112c6a0079..15245a0199741 100644 --- a/google/cloud/pubsub/internal/subscription_message_source.h +++ b/google/cloud/pubsub/internal/subscription_message_source.h @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/version.h" #include "google/cloud/future.h" #include "google/cloud/status.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include diff --git a/google/cloud/pubsub/internal/subscription_session_test.cc b/google/cloud/pubsub/internal/subscription_session_test.cc index 25ed8030d26d9..584c95aebfb3d 100644 --- a/google/cloud/pubsub/internal/subscription_session_test.cc +++ b/google/cloud/pubsub/internal/subscription_session_test.cc @@ -28,13 +28,11 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include #include +#include #include #include -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include #include #include #include @@ -203,8 +201,6 @@ TEST(SubscriptionSessionTest, ScheduleCallbacks) { ScheduleCallbacks(/*ack_count=*/100, /*enable_open_telemetry=*/false); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; using ::google::cloud::testing_util::SpanHasAttributes; @@ -218,7 +214,7 @@ using ::testing::SizeIs; /// @test Verify callbacks are scheduled in the background threads with Open /// Telemetry enabled. TEST(SubscriptionSessionTest, ScheduleCallbacksWithOtelEnabled) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto constexpr kAckCount = 100; ScheduleCallbacks(kAckCount, /*enable_open_telemetry=*/true); @@ -227,15 +223,13 @@ TEST(SubscriptionSessionTest, ScheduleCallbacksWithOtelEnabled) { // There should be a process and ack span for each message. EXPECT_THAT(spans, SizeIs(Ge(static_cast(2 * kAckCount)))); // Verify there is at least one process span. - EXPECT_THAT( - spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsInternal(), - SpanNamed("test-subscription process"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); + EXPECT_THAT(spans, Contains(AllOf( + SpanHasInstrumentationScope(), SpanKindIsInternal(), + SpanNamed("test-subscription process"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /// @test Verify callbacks are scheduled in the background threads. TEST(SubscriptionSessionTest, ScheduleCallbacksExactlyOnce) { auto mock = std::make_shared(); diff --git a/google/cloud/pubsub/internal/tracing_batch_callback.cc b/google/cloud/pubsub/internal/tracing_batch_callback.cc index f97e06070c39f..8196fcc6fea00 100644 --- a/google/cloud/pubsub/internal/tracing_batch_callback.cc +++ b/google/cloud/pubsub/internal/tracing_batch_callback.cc @@ -17,21 +17,17 @@ #include "google/cloud/pubsub/subscription.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/opentelemetry.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include +#include "google/pubsub/v1/pubsub.pb.h" #include +#include #include -#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { opentelemetry::nostd::shared_ptr StartSubscribeSpan( @@ -41,7 +37,7 @@ opentelemetry::nostd::shared_ptr StartSubscribeSpan( opentelemetry::context::propagation::TextMapPropagator> const& propagator, bool exactly_once_delivery_enabled) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kConsumer; auto m = pubsub_internal::FromProto(message.message()); @@ -54,14 +50,16 @@ opentelemetry::nostd::shared_ptr StartSubscribeSpan( auto span = internal::MakeSpan( subscription.subscription_id() + " subscribe", - {{sc::kMessagingSystem, "gcp_pubsub"}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", "subscribe"}, {"gcp.project_id", subscription.project_id()}, - {sc::kMessagingDestinationName, subscription.subscription_id()}, - {sc::kMessagingMessageId, m.message_id()}, - {/*sc::kMessagingMessageEnvelopeSize=*/"messaging.message.envelope." - "size", + {sc::messaging::kMessagingDestinationName, + subscription.subscription_id()}, + {sc::messaging::kMessagingMessageId, m.message_id()}, + {/*sc::messaging::kMessagingMessageEnvelopeSize=*/"messaging.message." + "envelope." + "size", static_cast(MessageSize(m))}, {"messaging.gcp_pubsub.message.ack_id", message.ack_id()}, {"messaging.gcp_pubsub.subscription.exactly_once_delivery", @@ -136,7 +134,7 @@ class TracingBatchCallback : public BatchCallback { } void StartConcurrencyControl(std::string const& ack_id) override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; std::lock_guard lk(mu_); auto it = spans_by_ack_id_.find(ack_id); if (it == spans_by_ack_id_.end()) return; @@ -144,9 +142,9 @@ class TracingBatchCallback : public BatchCallback { if (!subscribe_span) return; opentelemetry::trace::StartSpanOptions options; options.parent = subscribe_span->GetContext(); - it->second.concurrency_control_span = - internal::MakeSpan("subscriber concurrency control", - {{sc::kMessagingSystem, "gcp_pubsub"}}, options); + it->second.concurrency_control_span = internal::MakeSpan( + "subscriber concurrency control", + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}}, options); } void EndConcurrencyControl(std::string const& ack_id) override { @@ -162,7 +160,7 @@ class TracingBatchCallback : public BatchCallback { } void StartScheduler(std::string const& ack_id) override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; std::lock_guard lk(mu_); auto spans = spans_by_ack_id_.find(ack_id); if (spans == spans_by_ack_id_.end()) return; @@ -170,9 +168,9 @@ class TracingBatchCallback : public BatchCallback { if (!subscribe_span) return; opentelemetry::trace::StartSpanOptions options; options.parent = subscribe_span->GetContext(); - spans->second.scheduler_span = - internal::MakeSpan("subscriber scheduler", - {{sc::kMessagingSystem, "gcp_pubsub"}}, options); + spans->second.scheduler_span = internal::MakeSpan( + "subscriber scheduler", + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}}, options); } void EndScheduler(std::string const& ack_id) override { @@ -185,7 +183,7 @@ class TracingBatchCallback : public BatchCallback { Span StartModackSpan( google::pubsub::v1::ModifyAckDeadlineRequest const& request) override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; using Attributes = std::vector>; @@ -207,13 +205,15 @@ class TracingBatchCallback : public BatchCallback { options.kind = opentelemetry::trace::SpanKind::kClient; auto span = internal::MakeSpan( subscription_.subscription_id() + " modack", - {{sc::kMessagingSystem, "gcp_pubsub"}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", "extend"}, - {sc::kMessagingBatchMessageCount, + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "extend"}, + {sc::messaging::kMessagingBatchMessageCount, static_cast(request.ack_ids().size())}, {"messaging.gcp_pubsub.message.ack_deadline_seconds", static_cast(request.ack_deadline_seconds())}, - {sc::kMessagingDestinationName, subscription_.subscription_id()}, + {sc::messaging::kMessagingDestinationName, + subscription_.subscription_id()}, {"gcp.project_id", subscription_.project_id()}}, std::move(links), options); @@ -294,16 +294,6 @@ std::shared_ptr MakeTracingBatchCallback( subscription); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakeTracingBatchCallback( - std::shared_ptr batch_callback, - pubsub::Subscription const&) { - return batch_callback; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/tracing_batch_callback_test.cc b/google/cloud/pubsub/internal/tracing_batch_callback_test.cc index 92ecacb68167e..36034f7f5ca44 100644 --- a/google/cloud/pubsub/internal/tracing_batch_callback_test.cc +++ b/google/cloud/pubsub/internal/tracing_batch_callback_test.cc @@ -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 "google/cloud/pubsub/internal/tracing_batch_callback.h" #include "google/cloud/pubsub/internal/message_propagator.h" #include "google/cloud/pubsub/message.h" @@ -28,9 +26,9 @@ #include "google/cloud/testing_util/status_matchers.h" #include #include +#include #include #include -#include namespace google { namespace cloud { @@ -135,7 +133,7 @@ TEST(TracingBatchCallback, VerifySpanIsSetInUserCallback) { } TEST(TracingBatchCallback, StartAndEndModackSpanForOneMessage) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, callback).Times(1); @@ -157,21 +155,23 @@ TEST(TracingBatchCallback, StartAndEndModackSpanForOneMessage) { SpanHasInstrumentationScope(), SpanKindIsClient(), SpanNamed("test-sub modack"), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "extend"), - OTelAttribute(sc::kMessagingBatchMessageCount, 1), + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "extend"), + OTelAttribute(sc::messaging::kMessagingBatchMessageCount, + 1), OTelAttribute( "messaging.gcp_pubsub.message.ack_deadline_seconds", 10), - OTelAttribute(sc::kMessagingDestinationName, - "test-sub")), + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-sub")), SpanLinksSizeIs(1)))); } TEST(TracingBatchCallback, StartAndEndModackSpanForMultipleMessages) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, callback).Times(1); @@ -195,16 +195,18 @@ TEST(TracingBatchCallback, StartAndEndModackSpanForMultipleMessages) { SpanHasInstrumentationScope(), SpanKindIsClient(), SpanNamed("test-sub modack"), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "extend"), - OTelAttribute(sc::kMessagingBatchMessageCount, 2), + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "extend"), + OTelAttribute(sc::messaging::kMessagingBatchMessageCount, + 2), OTelAttribute( "messaging.gcp_pubsub.message.ack_deadline_seconds", 10), - OTelAttribute(sc::kMessagingDestinationName, - "test-sub")), + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-sub")), SpanLinksSizeIs(2)))); } @@ -233,7 +235,7 @@ TEST(TracingBatchCallback, VerifyModackSpansAreEndedInDestructor) { } TEST(TracingBatchCallback, SubscribeAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, callback).Times(1); @@ -248,17 +250,19 @@ TEST(TracingBatchCallback, SubscribeAttributes) { Contains(AllOf( SpanNamed("test-sub subscribe"), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "subscribe"), - OTelAttribute(sc::kMessagingMessageId, "id-0"), + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "subscribe"), + OTelAttribute(sc::messaging::kMessagingMessageId, + "id-0"), OTelAttribute("messaging.gcp_pubsub.message.ack_id", "ack-id-0"), OTelAttribute("messaging.message.envelope.size", 101), - OTelAttribute(sc::kMessagingDestinationName, - "test-sub"))))); + OTelAttribute( + sc::messaging::kMessagingDestinationName, "test-sub"))))); } TEST(TracingBatchCallback, SubscribeAttributesForOrderingKey) { @@ -331,7 +335,7 @@ TEST(TracingBatchCallback, SubscribeAttributesForExactlyOnce) { } TEST(TracingBatchCallback, StartAndEndConcurrencyControlSpan) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, callback).Times(1); @@ -343,15 +347,15 @@ TEST(TracingBatchCallback, StartAndEndConcurrencyControlSpan) { batch_callback->AckEnd("ack-id-0"); auto spans = span_catcher->GetSpans(); - EXPECT_THAT( - spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsInternal(), - SpanNamed("subscriber concurrency control"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); + EXPECT_THAT(spans, Contains(AllOf( + SpanHasInstrumentationScope(), SpanKindIsInternal(), + SpanNamed("subscriber concurrency control"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); } TEST(TracingBatchCallback, StartAndEndSchedulerSpan) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, callback).Times(1); @@ -363,11 +367,11 @@ TEST(TracingBatchCallback, StartAndEndSchedulerSpan) { batch_callback->AckEnd("ack-id-0"); auto spans = span_catcher->GetSpans(); - EXPECT_THAT( - spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsInternal(), - SpanNamed("subscriber scheduler"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); + EXPECT_THAT(spans, Contains(AllOf( + SpanHasInstrumentationScope(), SpanKindIsInternal(), + SpanNamed("subscriber scheduler"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); } TEST(TracingBatchCallback, VerifyDestructorEndsAllSpans) { @@ -518,5 +522,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/tracing_batch_sink.cc b/google/cloud/pubsub/internal/tracing_batch_sink.cc index a4782985e09d1..962f628cfe7d4 100644 --- a/google/cloud/pubsub/internal/tracing_batch_sink.cc +++ b/google/cloud/pubsub/internal/tracing_batch_sink.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/pubsub/internal/tracing_batch_sink.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/pubsub/internal/publisher_stub.h" #include "google/cloud/pubsub/internal/tracing_helpers.h" #include "google/cloud/pubsub/options.h" @@ -21,20 +20,19 @@ #include "google/cloud/future.h" #include "google/cloud/internal/opentelemetry.h" #include +#include +#include +#include #include -#include #include #include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { using Spans = std::vector>; @@ -60,23 +58,23 @@ auto MakeLinks(Spans::const_iterator begin, Spans::const_iterator end) { auto MakeParent(Links const& links, Spans const& message_spans, pubsub::Topic const& topic, std::string const& endpoint) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto options = RootStartSpanOptions(); options.kind = opentelemetry::trace::SpanKind::kClient; - auto batch_sink_parent = - internal::MakeSpan(topic.topic_id() + " publish", - /*attributes=*/ - {{sc::kMessagingBatchMessageCount, - static_cast(message_spans.size())}, - {sc::kCodeFunction, "BatchSink::AsyncPublish"}, - {/*sc::kMessagingOperationType=*/ - "messaging.operation.type", "publish"}, - {sc::kThreadId, internal::CurrentThreadId()}, - {sc::kMessagingSystem, "gcp_pubsub"}, - {/*sc::kServerAddress=*/"server.address", endpoint}, - {"gcp.project_id", topic.project_id()}, - {sc::kMessagingDestinationName, topic.topic_id()}}, - /*links*/ std::move(links), options); + auto batch_sink_parent = internal::MakeSpan( + topic.topic_id() + " publish", + /*attributes=*/ + {{sc::messaging::kMessagingBatchMessageCount, + static_cast(message_spans.size())}, + {sc::code::kCodeFunctionName, "BatchSink::AsyncPublish"}, + {/*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "publish"}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, + {sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {/*sc::kServerAddress=*/"server.address", endpoint}, + {"gcp.project_id", topic.project_id()}, + {sc::messaging::kMessagingDestinationName, topic.topic_id()}}, + /*links*/ std::move(links), options); auto context = batch_sink_parent->GetContext(); auto trace_id = internal::ToString(context.trace_id()); @@ -211,15 +209,6 @@ std::shared_ptr MakeTracingBatchSink( std::move(topic), std::move(batch_sink), std::move(opts)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakeTracingBatchSink( - pubsub::Topic, std::shared_ptr batch_sink, Options) { - return batch_sink; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/tracing_batch_sink_test.cc b/google/cloud/pubsub/internal/tracing_batch_sink_test.cc index 80c56e6d506a2..f7641c9cd0c3d 100644 --- a/google/cloud/pubsub/internal/tracing_batch_sink_test.cc +++ b/google/cloud/pubsub/internal/tracing_batch_sink_test.cc @@ -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 "google/cloud/pubsub/internal/tracing_batch_sink.h" #include "google/cloud/pubsub/message.h" #include "google/cloud/pubsub/options.h" @@ -25,7 +23,9 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include +#include +#include namespace google { namespace cloud { @@ -149,7 +149,7 @@ TEST(TracingBatchSink, AddMessageAddsEvent) { } TEST(TracingBatchSink, AsyncPublish) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto message_span = MakeSpan("test span"); auto mock = std::make_unique(); @@ -169,17 +169,17 @@ TEST(TracingBatchSink, AsyncPublish) { EXPECT_THAT(response, IsOk()); auto spans = span_catcher->GetSpans(); - EXPECT_THAT(spans, - Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingBatchMessageCount, 1)), - SpanHasLinks(AllOf(LinkHasSpanContext( - message_span->GetContext())))))); + EXPECT_THAT( + spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, 1)), + SpanHasLinks(AllOf(LinkHasSpanContext( + message_span->GetContext())))))); } TEST(TracingBatchSink, PublishSpanHasAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto message_span = MakeSpan("test span"); auto mock = std::make_unique(); @@ -200,21 +200,21 @@ TEST(TracingBatchSink, PublishSpanHasAttributes) { EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-topic publish"), SpanHasAttributes(OTelAttribute( - sc::kThreadId, _))))); - EXPECT_THAT(spans, Contains(AllOf( - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kCodeFunction, "BatchSink::AsyncPublish"))))); - EXPECT_THAT( - spans, Contains(AllOf( - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "publish"))))); + sc::thread::kThreadId, _))))); + EXPECT_THAT(spans, + Contains(AllOf(SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::code::kCodeFunctionName, + "BatchSink::AsyncPublish"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-topic publish"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "publish"))))); + EXPECT_THAT(spans, Contains(AllOf( + SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); EXPECT_THAT( spans, Contains(AllOf(SpanNamed("test-topic publish"), SpanHasAttributes(OTelAttribute( @@ -223,11 +223,11 @@ TEST(TracingBatchSink, PublishSpanHasAttributes) { Contains(AllOf(SpanNamed("test-topic publish"), SpanHasAttributes(OTelAttribute( "server.address", kDefaultEndpoint))))); - EXPECT_THAT( - spans, Contains(AllOf( - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingDestinationName, TestTopic().topic_id()))))); + EXPECT_THAT(spans, + Contains(AllOf(SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingDestinationName, + TestTopic().topic_id()))))); } #if OPENTELEMETRY_VERSION_MAJOR >= 2 || \ @@ -257,7 +257,7 @@ TEST(TracingBatchSink, PublishSpanIsRoot) { #endif TEST(TracingBatchSink, AsyncPublishOnlyIncludeSampledLink) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; // Create span before the span catcher so it is not sampled. auto unsampled_span = MakeSpan("test skipped span"); auto span_catcher = InstallSpanCatcher(); @@ -277,17 +277,17 @@ TEST(TracingBatchSink, AsyncPublishOnlyIncludeSampledLink) { EXPECT_THAT(response, IsOk()); auto spans = span_catcher->GetSpans(); - EXPECT_THAT(spans, - Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingBatchMessageCount, 2)), - SpanLinksAre(AllOf(LinkHasSpanContext( - message_span->GetContext())))))); + EXPECT_THAT( + spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, 2)), + SpanLinksAre(AllOf(LinkHasSpanContext( + message_span->GetContext())))))); } TEST(TracingBatchSink, AsyncPublishSmallBatch) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto message_span1 = MakeSpan("test span 1"); auto message_span2 = MakeSpan("test span 2"); @@ -310,14 +310,14 @@ TEST(TracingBatchSink, AsyncPublishSmallBatch) { Contains(AllOf( SpanHasInstrumentationScope(), SpanKindIsClient(), SpanNamed("test-topic publish"), - SpanHasAttributes( - OTelAttribute(sc::kMessagingBatchMessageCount, 2)), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, 2)), SpanHasLinks(LinkHasSpanContext(message_span1->GetContext()), LinkHasSpanContext(message_span2->GetContext()))))); } TEST(TracingBatchSink, AsyncPublishBatchWithOtelLimit) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto mock = std::make_unique(); EXPECT_CALL(*mock, AddMessage(_)).Times(kDefaultMaxLinks); EXPECT_CALL(*mock, AsyncPublish) @@ -332,17 +332,17 @@ TEST(TracingBatchSink, AsyncPublishBatchWithOtelLimit) { EXPECT_THAT(response, IsOk()); auto spans = span_catcher->GetSpans(); - EXPECT_THAT( - spans, - Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingBatchMessageCount, kDefaultMaxLinks)), - SpanLinksSizeIs(kDefaultMaxLinks)))); + EXPECT_THAT(spans, + Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, + kDefaultMaxLinks)), + SpanLinksSizeIs(kDefaultMaxLinks)))); } TEST(TracingBatchSink, AsyncPublishLargeBatch) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto const batch_size = kDefaultMaxLinks + 1; auto mock = std::make_shared(); EXPECT_CALL(*mock, AddMessage(_)).Times(batch_size); @@ -359,10 +359,11 @@ TEST(TracingBatchSink, AsyncPublishLargeBatch) { EXPECT_THAT(response, IsOk()); auto spans = span_catcher->GetSpans(); - EXPECT_THAT(spans, Contains(AllOf( - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingBatchMessageCount, batch_size))))); + EXPECT_THAT(spans, + Contains(AllOf(SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, + batch_size))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("publish #0"), SpanKindIsClient(), SpanLinksSizeIs(kDefaultMaxLinks)))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("publish #1"), SpanKindIsClient(), @@ -370,7 +371,7 @@ TEST(TracingBatchSink, AsyncPublishLargeBatch) { } TEST(TracingBatchSink, AsyncPublishBatchWithCustomLimit) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto constexpr kMaxLinks = 5; auto constexpr kBatchSize = 6; auto mock = std::make_unique(); @@ -390,11 +391,12 @@ TEST(TracingBatchSink, AsyncPublishBatchWithCustomLimit) { EXPECT_THAT(response, IsOk()); auto spans = span_catcher->GetSpans(); - EXPECT_THAT(spans, Contains(AllOf( - SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingBatchMessageCount, kBatchSize))))); + EXPECT_THAT(spans, + Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, + kBatchSize))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("publish #0"), SpanKindIsClient(), SpanLinksSizeIs(kMaxLinks)))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("publish #1"), SpanKindIsClient(), @@ -455,7 +457,7 @@ TEST(TracingBatchSink, AsyncPublishAddsEventForMultipleMessages) { } TEST(TracingBatchSink, Scope) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto message_span = MakeSpan("test span"); auto mock = std::make_unique(); @@ -483,13 +485,13 @@ TEST(TracingBatchSink, Scope) { EXPECT_THAT(response, IsOk()); auto spans = span_catcher->GetSpans(); - EXPECT_THAT(spans, - Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanNamed("test-topic publish"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingBatchMessageCount, 1)), - SpanHasLinks(AllOf(LinkHasSpanContext( - message_span->GetContext())))))); + EXPECT_THAT( + spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanNamed("test-topic publish"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingBatchMessageCount, 1)), + SpanHasLinks(AllOf(LinkHasSpanContext( + message_span->GetContext())))))); } TEST(TracingBatchSink, ResumePublish) { @@ -564,5 +566,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.cc b/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.cc index 26071c91811c9..9f5b0d4f75d93 100644 --- a/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.cc +++ b/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.cc @@ -18,12 +18,11 @@ #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/status.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include +#include +#include #include -#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include #include @@ -33,8 +32,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { class TracingExactlyOnceAckHandler @@ -61,21 +58,21 @@ class TracingExactlyOnceAckHandler links.emplace_back( std::make_pair(subscribe_span_->GetContext(), Attributes{})); } - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options = RootStartSpanOptions(); options.kind = opentelemetry::trace::SpanKind::kInternal; auto sub = subscription(); auto span = internal::MakeSpan( sub.subscription_id() + " ack", - {{sc::kCodeFunction, "pubsub::AckHandler::ack"}, - {sc::kMessagingSystem, "gcp_pubsub"}, + {{sc::code::kCodeFunctionName, "pubsub::AckHandler::ack"}, + {sc::messaging::kMessagingSystem, "gcp_pubsub"}, {"messaging.gcp_pubsub.message.ack_id", ack_id()}, {"messaging.gcp_pubsub.subscription.template", sub.FullName()}, {"gcp.project_id", sub.project_id()}, - {sc::kMessagingDestinationName, sub.subscription_id()}, + {sc::messaging::kMessagingDestinationName, sub.subscription_id()}, {"messaging.gcp_pubsub.message.delivery_attempt", static_cast(delivery_attempt())}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", "settle"}}, std::move(links), options); auto scope = internal::OTelScope(span); @@ -91,21 +88,21 @@ class TracingExactlyOnceAckHandler links.emplace_back( std::make_pair(subscribe_span_->GetContext(), Attributes{})); } - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options = RootStartSpanOptions(); options.kind = opentelemetry::trace::SpanKind::kInternal; auto sub = subscription(); auto span = internal::MakeSpan( sub.subscription_id() + " nack", - {{sc::kCodeFunction, "pubsub::AckHandler::nack"}, - {sc::kMessagingSystem, "gcp_pubsub"}, + {{sc::code::kCodeFunctionName, "pubsub::AckHandler::nack"}, + {sc::messaging::kMessagingSystem, "gcp_pubsub"}, {"messaging.gcp_pubsub.message.ack_id", ack_id()}, {"messaging.gcp_pubsub.subscription.template", sub.FullName()}, {"gcp.project_id", sub.project_id()}, - {sc::kMessagingDestinationName, sub.subscription_id()}, + {sc::messaging::kMessagingDestinationName, sub.subscription_id()}, {"messaging.gcp_pubsub.message.delivery_attempt", static_cast(delivery_attempt())}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", "settle"}}, std::move(links), options); @@ -138,15 +135,6 @@ MakeTracingExactlyOnceAckHandler( span.span); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::unique_ptr -MakeTracingExactlyOnceAckHandler( - std::unique_ptr handler, Span const&) { - return handler; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler_test.cc b/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler_test.cc index 402bfc831f77e..8deaff80d2216 100644 --- a/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler_test.cc +++ b/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler_test.cc @@ -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 "google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.h" #include "google/cloud/pubsub/subscription.h" #include "google/cloud/pubsub/testing/mock_exactly_once_ack_handler_impl.h" @@ -22,7 +20,8 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include +#include namespace google { namespace cloud { @@ -147,7 +146,7 @@ TEST(TracingExactlyOnceAckHandlerTest, AckError) { } TEST(TracingAckHandlerTest, AckAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_unique(); EXPECT_CALL(*mock, ack()) @@ -162,17 +161,19 @@ TEST(TracingAckHandlerTest, AckAttributes) { ElementsAre(AllOf( SpanNamed("test-subscription ack"), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "settle"), - OTelAttribute(sc::kCodeFunction, + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "settle"), + OTelAttribute(sc::code::kCodeFunctionName, "pubsub::AckHandler::ack"), OTelAttribute( "messaging.gcp_pubsub.message.delivery_attempt", 42), - OTelAttribute(sc::kMessagingDestinationName, - "test-subscription"))))); + OTelAttribute( + sc::messaging::kMessagingDestinationName, + "test-subscription"))))); } TEST(TracingExactlyOnceAckHandlerTest, NackSuccess) { @@ -255,7 +256,7 @@ TEST(TracingExactlyOnceAckHandlerTest, NackSuccessWithNoSubscribeSpan) { } TEST(TracingAckHandlerTest, NackAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_unique(); EXPECT_CALL(*mock, nack()) @@ -270,17 +271,19 @@ TEST(TracingAckHandlerTest, NackAttributes) { ElementsAre(AllOf( SpanNamed("test-subscription nack"), SpanHasAttributes( - OTelAttribute(sc::kMessagingSystem, "gcp_pubsub"), + OTelAttribute(sc::messaging::kMessagingSystem, + "gcp_pubsub"), OTelAttribute("gcp.project_id", "test-project"), OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "settle"), - OTelAttribute(sc::kCodeFunction, + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "settle"), + OTelAttribute(sc::code::kCodeFunctionName, "pubsub::AckHandler::nack"), OTelAttribute( "messaging.gcp_pubsub.message.delivery_attempt", 42), - OTelAttribute(sc::kMessagingDestinationName, - "test-subscription"))))); + OTelAttribute( + sc::messaging::kMessagingDestinationName, + "test-subscription"))))); } TEST(TracingAckHandlerTest, DeliveryAttempt) { @@ -312,5 +315,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/tracing_helpers.cc b/google/cloud/pubsub/internal/tracing_helpers.cc index a03bab767f426..ead3529441452 100644 --- a/google/cloud/pubsub/internal/tracing_helpers.cc +++ b/google/cloud/pubsub/internal/tracing_helpers.cc @@ -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 "google/cloud/pubsub/internal/tracing_helpers.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/opentelemetry.h" @@ -70,5 +68,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/tracing_helpers.h b/google/cloud/pubsub/internal/tracing_helpers.h index 0e867ff4359d7..eaee01ab1143c 100644 --- a/google/cloud/pubsub/internal/tracing_helpers.h +++ b/google/cloud/pubsub/internal/tracing_helpers.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_TRACING_HELPERS_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_TRACING_HELPERS_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/pubsub/pull_ack_handler.h" #include "google/cloud/pubsub/version.h" #include @@ -53,6 +51,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_TRACING_HELPERS_H diff --git a/google/cloud/pubsub/internal/tracing_helpers_test.cc b/google/cloud/pubsub/internal/tracing_helpers_test.cc index 018e0e0c7cc9c..57bed72c2e48c 100644 --- a/google/cloud/pubsub/internal/tracing_helpers_test.cc +++ b/google/cloud/pubsub/internal/tracing_helpers_test.cc @@ -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 "google/cloud/pubsub/internal/tracing_helpers.h" #include "google/cloud/pubsub/options.h" #include "google/cloud/internal/opentelemetry.h" @@ -185,5 +183,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/tracing_message_callback.cc b/google/cloud/pubsub/internal/tracing_message_callback.cc index 18eb90315671b..663cecf0b0dfa 100644 --- a/google/cloud/pubsub/internal/tracing_message_callback.cc +++ b/google/cloud/pubsub/internal/tracing_message_callback.cc @@ -18,18 +18,14 @@ #include "google/cloud/pubsub/subscription.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/opentelemetry.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include +#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { class TracingMessageCallback : public MessageCallback { @@ -43,14 +39,14 @@ class TracingMessageCallback : public MessageCallback { ~TracingMessageCallback() override = default; void user_callback(MessageAndHandler m) override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; if (m.subscribe_span.span) { options.parent = m.subscribe_span.span->GetContext(); } - auto span = - internal::MakeSpan(subscription_id_ + " process", - {{sc::kMessagingSystem, "gcp_pubsub"}}, options); + auto span = internal::MakeSpan( + subscription_id_ + " process", + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}}, options); m.ack_handler = MakeTracingExactlyOnceAckHandler(std::move(m.ack_handler), m.subscribe_span); child_->user_callback(std::move(m)); @@ -70,15 +66,6 @@ std::shared_ptr MakeTracingMessageCallback( opts); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakeTracingMessageCallback( - std::shared_ptr message_callback, Options const&) { - return message_callback; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/tracing_message_callback_test.cc b/google/cloud/pubsub/internal/tracing_message_callback_test.cc index b1455afbc2e21..d2154d94171ed 100644 --- a/google/cloud/pubsub/internal/tracing_message_callback_test.cc +++ b/google/cloud/pubsub/internal/tracing_message_callback_test.cc @@ -24,13 +24,11 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include #include +#include #include #include -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include namespace google { namespace cloud { @@ -38,7 +36,6 @@ namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; using ::google::cloud::testing_util::SpanHasAttributes; @@ -63,7 +60,7 @@ std::shared_ptr MakeTestMessageCallback( } TEST(TracingMessageCallback, UserCallback) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, user_callback).Times(1); @@ -83,12 +80,12 @@ TEST(TracingMessageCallback, UserCallback) { spans, Contains(AllOf(SpanHasInstrumentationScope(), SpanKindIsInternal(), SpanNamed("test-sub process"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub")), + sc::messaging::kMessagingSystem, "gcp_pubsub")), SpanWithParent(span)))); } TEST(TracingMessageCallback, AddTracingAckHandler) { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock_handler = std::make_unique(); @@ -125,35 +122,11 @@ TEST(TracingMessageCallback, AddTracingAckHandler) { AllOf(SpanHasInstrumentationScope(), SpanKindIsInternal(), SpanNamed("test-sub process"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub")), + sc::messaging::kMessagingSystem, "gcp_pubsub")), SpanWithParent(span)), SpanNamed("test-sub ack"))); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -using ::testing::IsNull; -using ::testing::Not; - -TEST(TracingMessageCallback, - VerifyMessageCallbackIsNotNullWhenOTelIsNotCompiled) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, user_callback).Times(1); - auto message_callback = MakeTracingMessageCallback( - std::move(mock), Options{}.set( - pubsub::Subscription("test-project", "test-sub"))); - - EXPECT_THAT(message_callback, Not(IsNull())); - - message_callback->user_callback(MessageCallback::MessageAndHandler{ - pubsub::MessageBuilder().Build(), - std::make_unique(), - "ack-id", - {}}); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal diff --git a/google/cloud/pubsub/internal/tracing_pull_ack_handler.cc b/google/cloud/pubsub/internal/tracing_pull_ack_handler.cc index ec174057ff4d5..3e4720c5564c1 100644 --- a/google/cloud/pubsub/internal/tracing_pull_ack_handler.cc +++ b/google/cloud/pubsub/internal/tracing_pull_ack_handler.cc @@ -17,12 +17,11 @@ #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/status.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include +#include +#include #include -#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include #include @@ -32,8 +31,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TracingPullAckHandler : public pubsub::PullAckHandler::Impl { public: explicit TracingPullAckHandler( @@ -48,27 +45,28 @@ class TracingPullAckHandler : public pubsub::PullAckHandler::Impl { TracingAttributes MakeSharedAttributes( std::string const& ack_id, pubsub::Subscription const& subscription) { - namespace sc = opentelemetry::trace::SemanticConventions; - return TracingAttributes{ - {sc::kMessagingSystem, "gcp_pubsub"}, - {"messaging.gcp_pubsub.message.ack_id", ack_id}, - {"messaging.gcp_pubsub.message.delivery_attempt", - child_->delivery_attempt()}, - {"gcp.project_id", subscription.project_id()}, - {sc::kMessagingDestinationName, subscription.subscription_id()}}; + namespace sc = opentelemetry::semconv; + return TracingAttributes{{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {"messaging.gcp_pubsub.message.ack_id", ack_id}, + {"messaging.gcp_pubsub.message.delivery_attempt", + child_->delivery_attempt()}, + {"gcp.project_id", subscription.project_id()}, + {sc::messaging::kMessagingDestinationName, + subscription.subscription_id()}}; } future ack() override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kClient; auto const ack_id = child_->ack_id(); auto const subscription = child_->subscription(); TracingAttributes attributes = MakeSharedAttributes(ack_id, subscription); - attributes.emplace_back( - std::make_pair(sc::kCodeFunction, "pubsub::PullAckHandler::ack")); + attributes.emplace_back(std::make_pair(sc::code::kCodeFunctionName, + "pubsub::PullAckHandler::ack")); attributes.emplace_back(std::make_pair( - /*sc::kMessagingOperationType=*/"messaging.operation.type", "ack")); + /*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "ack")); auto span = internal::MakeSpan(subscription.subscription_id() + " ack", attributes, CreateLinks(consumer_span_context_), options); @@ -85,16 +83,17 @@ class TracingPullAckHandler : public pubsub::PullAckHandler::Impl { } future nack() override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions options; options.kind = opentelemetry::trace::SpanKind::kClient; auto const ack_id = child_->ack_id(); auto const subscription = child_->subscription(); TracingAttributes attributes = MakeSharedAttributes(ack_id, subscription); - attributes.emplace_back( - std::make_pair(sc::kCodeFunction, "pubsub::PullAckHandler::nack")); + attributes.emplace_back(std::make_pair(sc::code::kCodeFunctionName, + "pubsub::PullAckHandler::nack")); attributes.emplace_back(std::make_pair( - /*sc::kMessagingOperationType=*/"messaging.operation.type", "nack")); + /*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "nack")); auto span = internal::MakeSpan(subscription.subscription_id() + " nack", attributes, CreateLinks(consumer_span_context_), options); @@ -131,15 +130,6 @@ std::unique_ptr MakeTracingPullAckHandler( return std::make_unique(std::move(handler)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::unique_ptr MakeTracingPullAckHandler( - std::unique_ptr handler) { - return handler; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/tracing_pull_ack_handler_test.cc b/google/cloud/pubsub/internal/tracing_pull_ack_handler_test.cc index 52a485588bab2..4b613566f222a 100644 --- a/google/cloud/pubsub/internal/tracing_pull_ack_handler_test.cc +++ b/google/cloud/pubsub/internal/tracing_pull_ack_handler_test.cc @@ -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 "google/cloud/pubsub/internal/tracing_pull_ack_handler.h" #include "google/cloud/pubsub/mocks/mock_pull_ack_handler.h" #include "google/cloud/pubsub/subscription.h" @@ -22,7 +20,8 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include +#include namespace google { namespace cloud { @@ -94,7 +93,7 @@ TEST(TracingAckHandlerTest, AckError) { } TEST(TracingAckHandlerTest, AckAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_unique(); EXPECT_CALL(*mock, ack()) @@ -104,35 +103,34 @@ TEST(TracingAckHandlerTest, AckAttributes) { EXPECT_THAT(std::move(handler->ack()).get(), StatusIs(StatusCode::kOk)); auto spans = span_catcher->GetSpans(); + EXPECT_THAT(spans, Contains(AllOf( + SpanNamed("test-subscription ack"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription ack"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); + "gcp.project_id", "test-project"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription ack"), SpanHasAttributes(OTelAttribute( - "gcp.project_id", "test-project"))))); - EXPECT_THAT( - spans, Contains(AllOf( - SpanNamed("test-subscription ack"), - SpanHasAttributes(OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "ack"))))); - EXPECT_THAT( - spans, - Contains(AllOf(SpanNamed("test-subscription ack"), - SpanHasAttributes(OTelAttribute( - sc::kCodeFunction, "pubsub::PullAckHandler::ack"))))); + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "ack"))))); + EXPECT_THAT(spans, + Contains(AllOf(SpanNamed("test-subscription ack"), + SpanHasAttributes(OTelAttribute( + sc::code::kCodeFunctionName, + "pubsub::PullAckHandler::ack"))))); EXPECT_THAT(spans, Contains(AllOf( SpanNamed("test-subscription ack"), SpanHasAttributes(OTelAttribute( "messaging.gcp_pubsub.message.delivery_attempt", 42))))); EXPECT_THAT(spans, - Contains(AllOf( - SpanNamed("test-subscription ack"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingDestinationName, "test-subscription"))))); + Contains(AllOf(SpanNamed("test-subscription ack"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingDestinationName, + "test-subscription"))))); } TEST(TracingAckHandlerTest, NackSuccess) { @@ -170,7 +168,7 @@ TEST(TracingAckHandlerTest, NackError) { } TEST(TracingAckHandlerTest, NackAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_unique(); EXPECT_CALL(*mock, nack()) @@ -180,35 +178,34 @@ TEST(TracingAckHandlerTest, NackAttributes) { EXPECT_THAT(std::move(handler->nack()).get(), StatusIs(StatusCode::kOk)); auto spans = span_catcher->GetSpans(); + EXPECT_THAT(spans, Contains(AllOf( + SpanNamed("test-subscription nack"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription nack"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); - EXPECT_THAT( - spans, Contains(AllOf( - SpanNamed("test-subscription nack"), - SpanHasAttributes(OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "nack"))))); + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "nack"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription nack"), SpanHasAttributes(OTelAttribute( "gcp.project_id", "test-project"))))); - EXPECT_THAT( - spans, - Contains(AllOf(SpanNamed("test-subscription nack"), - SpanHasAttributes(OTelAttribute( - sc::kCodeFunction, "pubsub::PullAckHandler::nack"))))); + EXPECT_THAT(spans, + Contains(AllOf(SpanNamed("test-subscription nack"), + SpanHasAttributes(OTelAttribute( + sc::code::kCodeFunctionName, + "pubsub::PullAckHandler::nack"))))); EXPECT_THAT(spans, Contains(AllOf( SpanNamed("test-subscription nack"), SpanHasAttributes(OTelAttribute( "messaging.gcp_pubsub.message.delivery_attempt", 42))))); EXPECT_THAT(spans, - Contains(AllOf( - SpanNamed("test-subscription nack"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingDestinationName, "test-subscription"))))); + Contains(AllOf(SpanNamed("test-subscription nack"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingDestinationName, + "test-subscription"))))); } TEST(TracingAckHandlerTest, DeliveryAttemptNoSpans) { @@ -314,5 +311,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/internal/tracing_pull_lease_manager.cc b/google/cloud/pubsub/internal/tracing_pull_lease_manager.cc index bfe610b4e92f9..b9b39ac47d59d 100644 --- a/google/cloud/pubsub/internal/tracing_pull_lease_manager.cc +++ b/google/cloud/pubsub/internal/tracing_pull_lease_manager.cc @@ -19,10 +19,9 @@ #include "google/cloud/internal/async_retry_loop.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/status.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include +#include +#include #include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include #include @@ -31,8 +30,6 @@ namespace cloud { namespace pubsub_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TracingPullLeaseManagerImpl : public PullLeaseManagerImpl { public: explicit TracingPullLeaseManagerImpl( @@ -51,20 +48,22 @@ class TracingPullLeaseManagerImpl : public PullLeaseManagerImpl { std::shared_ptr context, google::cloud::internal::ImmutableOptions options, google::pubsub::v1::ModifyAckDeadlineRequest const& request) override { - namespace sc = opentelemetry::trace::SemanticConventions; + namespace sc = opentelemetry::semconv; opentelemetry::trace::StartSpanOptions start_span_options = RootStartSpanOptions(); start_span_options.kind = opentelemetry::trace::SpanKind::kClient; auto span = internal::MakeSpan( subscription_.subscription_id() + " modack", - {{sc::kMessagingSystem, "gcp_pubsub"}, - {/*sc::kMessagingOperationType=*/"messaging.operation.type", "modack"}, - {sc::kCodeFunction, "pubsub::PullLeaseManager::ExtendLease"}, + {{sc::messaging::kMessagingSystem, "gcp_pubsub"}, + {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type", + "modack"}, + {sc::code::kCodeFunctionName, "pubsub::PullLeaseManager::ExtendLease"}, {"messaging.gcp_pubsub.message.ack_id", ack_id_}, {"messaging.gcp_pubsub.message.ack_deadline_seconds", static_cast(request.ack_deadline_seconds())}, {"gcp.project_id", subscription_.project_id()}, - {sc::kMessagingDestinationName, subscription_.subscription_id()}}, + {sc::messaging::kMessagingDestinationName, + subscription_.subscription_id()}}, CreateLinks(consumer_span_context_), start_span_options); auto scope = internal::OTelScope(span); MaybeAddLinkAttributes(*span, consumer_span_context_, "receive"); @@ -91,16 +90,6 @@ std::shared_ptr MakeTracingPullLeaseManagerImpl( std::move(manager), std::move(ack_id), std::move(subscription)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::shared_ptr MakeTracingPullLeaseManagerImpl( - std::shared_ptr manager, std::string, - pubsub::Subscription) { - return manager; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud diff --git a/google/cloud/pubsub/internal/tracing_pull_lease_manager_test.cc b/google/cloud/pubsub/internal/tracing_pull_lease_manager_test.cc index 2fd5da3302ade..aee9b815276c9 100644 --- a/google/cloud/pubsub/internal/tracing_pull_lease_manager_test.cc +++ b/google/cloud/pubsub/internal/tracing_pull_lease_manager_test.cc @@ -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 "google/cloud/pubsub/internal/tracing_pull_lease_manager.h" #include "google/cloud/pubsub/subscription.h" #include "google/cloud/pubsub/testing/mock_pull_lease_manager.h" @@ -25,7 +23,8 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include +#include namespace google { namespace cloud { @@ -146,7 +145,7 @@ TEST(TracingPullLeaseManagerImplTest, AsyncModifyAckDeadlineError) { } TEST(TracingPullLeaseManagerImplTest, AsyncModifyAckDeadlineAttributes) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_shared(); EXPECT_CALL(*mock, AsyncModifyAckDeadline(_, _, _, _, _)) @@ -168,20 +167,19 @@ TEST(TracingPullLeaseManagerImplTest, AsyncModifyAckDeadlineAttributes) { EXPECT_STATUS_OK(status.get()); auto spans = span_catcher->GetSpans(); + EXPECT_THAT(spans, Contains(AllOf( + SpanNamed("test-subscription modack"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingSystem, "gcp_pubsub"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription modack"), SpanHasAttributes(OTelAttribute( - sc::kMessagingSystem, "gcp_pubsub"))))); - EXPECT_THAT( - spans, Contains(AllOf( - SpanNamed("test-subscription modack"), - SpanHasAttributes(OTelAttribute( - /*sc::kMessagingOperationType=*/"messaging.operation.type", - "modack"))))); + /*sc::messaging::kMessagingOperationType=*/ + "messaging.operation.type", "modack"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription modack"), SpanHasAttributes(OTelAttribute( - sc::kCodeFunction, + sc::code::kCodeFunctionName, "pubsub::PullLeaseManager::ExtendLease"))))); EXPECT_THAT( spans, @@ -195,10 +193,10 @@ TEST(TracingPullLeaseManagerImplTest, AsyncModifyAckDeadlineAttributes) { SpanHasAttributes(OTelAttribute( "messaging.gcp_pubsub.message.ack_id", "test-ack-id"))))); EXPECT_THAT(spans, - Contains(AllOf( - SpanNamed("test-subscription modack"), - SpanHasAttributes(OTelAttribute( - sc::kMessagingDestinationName, "test-subscription"))))); + Contains(AllOf(SpanNamed("test-subscription modack"), + SpanHasAttributes(OTelAttribute( + sc::messaging::kMessagingDestinationName, + "test-subscription"))))); EXPECT_THAT(spans, Contains(AllOf(SpanNamed("test-subscription modack"), SpanHasAttributes(OTelAttribute( @@ -281,5 +279,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/pubsub/message.h b/google/cloud/pubsub/message.h index 51c0571e0ece9..e002e3b995e1f 100644 --- a/google/cloud/pubsub/message.h +++ b/google/cloud/pubsub/message.h @@ -17,7 +17,7 @@ #include "google/cloud/pubsub/version.h" #include "absl/strings/string_view.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include #include diff --git a/google/cloud/pubsub/publisher_connection_test.cc b/google/cloud/pubsub/publisher_connection_test.cc index 0d6ab900ed5a5..bcccf0574fa6c 100644 --- a/google/cloud/pubsub/publisher_connection_test.cc +++ b/google/cloud/pubsub/publisher_connection_test.cc @@ -340,7 +340,6 @@ TEST(PublisherConnectionTest, HandleTransientEnabledRetry) { EXPECT_EQ("test-message-id-0", *response); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; @@ -402,7 +401,6 @@ TEST(MakePublisherConnectionTest, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsub/quickstart/.bazelrc b/google/cloud/pubsub/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/pubsub/quickstart/.bazelrc +++ b/google/cloud/pubsub/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/pubsub/samples/BUILD.bazel b/google/cloud/pubsub/samples/BUILD.bazel index 7586994429215..e7c3be6bb688e 100644 --- a/google/cloud/pubsub/samples/BUILD.bazel +++ b/google/cloud/pubsub/samples/BUILD.bazel @@ -14,6 +14,8 @@ """Examples for the Cloud Pub/Sub C++ client library.""" +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") load(":pubsub_client_integration_samples.bzl", "pubsub_client_integration_samples") load(":pubsub_client_unit_samples.bzl", "pubsub_client_unit_samples") load(":pubsub_samples_common.bzl", "pubsub_samples_common_hdrs", "pubsub_samples_common_srcs") @@ -45,7 +47,7 @@ cc_library( "//:common", "//:pubsub", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsub_samples_unit_tests] @@ -89,6 +91,6 @@ cc_proto_library( "//:pubsub", "//:pubsub_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsub_client_unit_samples] diff --git a/google/cloud/pubsub/samples/samples.cc b/google/cloud/pubsub/samples/samples.cc index 6b934ff630cc7..1ea969288fd8c 100644 --- a/google/cloud/pubsub/samples/samples.cc +++ b/google/cloud/pubsub/samples/samples.cc @@ -15,6 +15,7 @@ #include "google/cloud/pubsub/admin/subscription_admin_client.h" #include "google/cloud/pubsub/admin/topic_admin_client.h" #include "google/cloud/pubsub/samples/pubsub_samples_common.h" +#include "google/cloud/pubsub/samples/testdata/schema.pb.h" #include "google/cloud/pubsub/schema.h" #include "google/cloud/pubsub/schema_client.h" #include "google/cloud/pubsub/subscriber.h" @@ -24,7 +25,6 @@ #include "google/cloud/project.h" #include "google/cloud/status.h" #include "google/cloud/testing_util/example_driver.h" -#include #include #include #include diff --git a/google/cloud/pubsub/samples/topic_admin_samples.cc b/google/cloud/pubsub/samples/topic_admin_samples.cc index 9ffd2b58c22c4..05c1ba7414927 100644 --- a/google/cloud/pubsub/samples/topic_admin_samples.cc +++ b/google/cloud/pubsub/samples/topic_admin_samples.cc @@ -23,7 +23,7 @@ #include "google/cloud/project.h" #include "google/cloud/testing_util/example_driver.h" #include "absl/strings/match.h" -#include +#include "google/protobuf/timestamp.pb.h" #include #include diff --git a/google/cloud/pubsub/schema_connection.h b/google/cloud/pubsub/schema_connection.h index 2e47406a0d49c..50bb541b42aa4 100644 --- a/google/cloud/pubsub/schema_connection.h +++ b/google/cloud/pubsub/schema_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/pubsub/v1/schema.pb.h" #include #include diff --git a/google/cloud/pubsub/schema_connection_idempotency_policy.h b/google/cloud/pubsub/schema_connection_idempotency_policy.h index d1b046d2b7acc..c94e4bcaa7c66 100644 --- a/google/cloud/pubsub/schema_connection_idempotency_policy.h +++ b/google/cloud/pubsub/schema_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/pubsub/v1/schema.grpc.pb.h" #include namespace google { diff --git a/google/cloud/pubsub/snapshot_builder.h b/google/cloud/pubsub/snapshot_builder.h index 58d89a36fcf34..5f7ef806212ec 100644 --- a/google/cloud/pubsub/snapshot_builder.h +++ b/google/cloud/pubsub/snapshot_builder.h @@ -19,8 +19,8 @@ #include "google/cloud/pubsub/subscription.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/time_utils.h" +#include "google/pubsub/v1/pubsub.pb.h" #include -#include #include #include diff --git a/google/cloud/pubsub/subscriber_connection_test.cc b/google/cloud/pubsub/subscriber_connection_test.cc index 299e2afa72504..364b4a5431b77 100644 --- a/google/cloud/pubsub/subscriber_connection_test.cc +++ b/google/cloud/pubsub/subscriber_connection_test.cc @@ -164,7 +164,6 @@ TEST(SubscriberConnectionTest, MakeSubscriberConnectionSetupsMetadata) { ASSERT_STATUS_OK(response.get()); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; @@ -271,8 +270,6 @@ TEST(MakeSubscriberConnectionTest, TracingDisabledForUnaryPull) { EXPECT_THAT(spans, IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace pubsub diff --git a/google/cloud/pubsub/subscription_admin_connection.h b/google/cloud/pubsub/subscription_admin_connection.h index cecb6d0d307b5..9db060f8ad607 100644 --- a/google/cloud/pubsub/subscription_admin_connection.h +++ b/google/cloud/pubsub/subscription_admin_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/internal/non_constructible.h" #include "google/cloud/internal/pagination_range.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include #include diff --git a/google/cloud/pubsub/subscription_builder.h b/google/cloud/pubsub/subscription_builder.h index 94d0372ac6a98..02f770fc352e9 100644 --- a/google/cloud/pubsub/subscription_builder.h +++ b/google/cloud/pubsub/subscription_builder.h @@ -19,8 +19,8 @@ #include "google/cloud/pubsub/topic.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/time_utils.h" +#include "google/pubsub/v1/pubsub.pb.h" #include -#include #include #include #include diff --git a/google/cloud/pubsub/topic_admin_connection.h b/google/cloud/pubsub/topic_admin_connection.h index 66eb32ed45cf5..8af93f5a57276 100644 --- a/google/cloud/pubsub/topic_admin_connection.h +++ b/google/cloud/pubsub/topic_admin_connection.h @@ -25,7 +25,7 @@ #include "google/cloud/internal/non_constructible.h" #include "google/cloud/internal/pagination_range.h" #include "google/cloud/status_or.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include diff --git a/google/cloud/pubsub/topic_builder.h b/google/cloud/pubsub/topic_builder.h index 3012b2bfd8d84..f84301cb05c08 100644 --- a/google/cloud/pubsub/topic_builder.h +++ b/google/cloud/pubsub/topic_builder.h @@ -19,7 +19,7 @@ #include "google/cloud/pubsub/topic.h" #include "google/cloud/pubsub/version.h" #include "google/cloud/internal/time_utils.h" -#include +#include "google/pubsub/v1/pubsub.pb.h" #include #include diff --git a/google/cloud/pubsublite/BUILD.bazel b/google/cloud/pubsublite/BUILD.bazel index c94f5eba9a76c..256629c9ba31f 100644 --- a/google/cloud/pubsublite/BUILD.bazel +++ b/google/cloud/pubsublite/BUILD.bazel @@ -36,7 +36,7 @@ cc_library( "//:common", "//:grpc_utils", "//:pubsub", - "@com_google_googleapis//google/cloud/pubsublite/v1:pubsublite_cc_grpc", + "@googleapis//google/cloud/pubsublite/v1:pubsublite_cc_grpc", ], ) @@ -54,7 +54,7 @@ cc_library( visibility = ["//:__pkg__"], deps = [ ":google_cloud_cpp_pubsublite", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -85,8 +85,8 @@ cc_library( "//:mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/memory", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/memory", + "@googletest//:gtest_main", ], ) for test in pubsublite_unit_tests diff --git a/google/cloud/pubsublite/admin_client.h b/google/cloud/pubsublite/admin_client.h index 793efd20a1cc7..f68edbe3097c3 100644 --- a/google/cloud/pubsublite/admin_client.h +++ b/google/cloud/pubsublite/admin_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/admin_connection.h b/google/cloud/pubsublite/admin_connection.h index fc6f2368329b8..e2a2d6ec19768 100644 --- a/google/cloud/pubsublite/admin_connection.h +++ b/google/cloud/pubsublite/admin_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/pubsublite/admin_connection_idempotency_policy.h" #include "google/cloud/pubsublite/internal/admin_retry_traits.h" +#include "google/cloud/pubsublite/v1/admin.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/pubsublite/admin_connection_idempotency_policy.h b/google/cloud/pubsublite/admin_connection_idempotency_policy.h index 1c1e89bdd0564..3c500a0416785 100644 --- a/google/cloud/pubsublite/admin_connection_idempotency_policy.h +++ b/google/cloud/pubsublite/admin_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/pubsublite/v1/admin.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/pubsublite/integration_tests/BUILD.bazel b/google/cloud/pubsublite/integration_tests/BUILD.bazel index dafc0b4bd8e8e..90d18e5b529c3 100644 --- a/google/cloud/pubsublite/integration_tests/BUILD.bazel +++ b/google/cloud/pubsublite/integration_tests/BUILD.bazel @@ -31,6 +31,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/pubsublite:pubsublite_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsublite_client_integration_tests] diff --git a/google/cloud/pubsublite/integration_tests/publisher_integration_test.cc b/google/cloud/pubsublite/integration_tests/publisher_integration_test.cc index b7450a01e4749..6aa02c03a0ad8 100644 --- a/google/cloud/pubsublite/integration_tests/publisher_integration_test.cc +++ b/google/cloud/pubsublite/integration_tests/publisher_integration_test.cc @@ -17,13 +17,13 @@ #include "google/cloud/pubsublite/endpoint.h" #include "google/cloud/pubsublite/options.h" #include "google/cloud/pubsublite/publisher_connection.h" +#include "google/cloud/pubsublite/v1/admin.pb.h" #include "google/cloud/internal/format_time_point.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/internal/random.h" #include "google/cloud/testing_util/integration_test.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/admin_auth_decorator.cc b/google/cloud/pubsublite/internal/admin_auth_decorator.cc index ac1cfcca47f98..bf65d9927e284 100644 --- a/google/cloud/pubsublite/internal/admin_auth_decorator.cc +++ b/google/cloud/pubsublite/internal/admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/pubsublite/v1/admin.proto #include "google/cloud/pubsublite/internal/admin_auth_decorator.h" -#include +#include "google/cloud/pubsublite/v1/admin.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/admin_auth_decorator.h b/google/cloud/pubsublite/internal/admin_auth_decorator.h index 9ec68596912e8..8edd07741b99c 100644 --- a/google/cloud/pubsublite/internal/admin_auth_decorator.h +++ b/google/cloud/pubsublite/internal/admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/pubsublite/internal/admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsublite/internal/admin_connection_impl.h b/google/cloud/pubsublite/internal/admin_connection_impl.h index 657c951058693..4a7962a3551b6 100644 --- a/google/cloud/pubsublite/internal/admin_connection_impl.h +++ b/google/cloud/pubsublite/internal/admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/pubsublite/internal/admin_logging_decorator.cc b/google/cloud/pubsublite/internal/admin_logging_decorator.cc index 1cfe537c72f08..d3dad841cc4ec 100644 --- a/google/cloud/pubsublite/internal/admin_logging_decorator.cc +++ b/google/cloud/pubsublite/internal/admin_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/pubsublite/v1/admin.proto #include "google/cloud/pubsublite/internal/admin_logging_decorator.h" +#include "google/cloud/pubsublite/v1/admin.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/pubsublite/internal/admin_logging_decorator.h b/google/cloud/pubsublite/internal/admin_logging_decorator.h index aac919b33114e..4eae4b11214d7 100644 --- a/google/cloud/pubsublite/internal/admin_logging_decorator.h +++ b/google/cloud/pubsublite/internal/admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/pubsublite/internal/admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsublite/internal/admin_metadata_decorator.cc b/google/cloud/pubsublite/internal/admin_metadata_decorator.cc index c7ec2eb47bfb8..7cab2bafc647b 100644 --- a/google/cloud/pubsublite/internal/admin_metadata_decorator.cc +++ b/google/cloud/pubsublite/internal/admin_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/pubsublite/v1/admin.proto #include "google/cloud/pubsublite/internal/admin_metadata_decorator.h" +#include "google/cloud/pubsublite/v1/admin.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 #include #include #include diff --git a/google/cloud/pubsublite/internal/admin_metadata_decorator.h b/google/cloud/pubsublite/internal/admin_metadata_decorator.h index c965d959351b6..b11508de3ab54 100644 --- a/google/cloud/pubsublite/internal/admin_metadata_decorator.h +++ b/google/cloud/pubsublite/internal/admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/pubsublite/internal/admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/pubsublite/internal/admin_stub.cc b/google/cloud/pubsublite/internal/admin_stub.cc index f7b4708f0e75a..25a468ff146b5 100644 --- a/google/cloud/pubsublite/internal/admin_stub.cc +++ b/google/cloud/pubsublite/internal/admin_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/admin.proto #include "google/cloud/pubsublite/internal/admin_stub.h" +#include "google/cloud/pubsublite/v1/admin.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/admin_stub.h b/google/cloud/pubsublite/internal/admin_stub.h index ffeeb74b5ace6..42c389784fccf 100644 --- a/google/cloud/pubsublite/internal/admin_stub.h +++ b/google/cloud/pubsublite/internal/admin_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_ADMIN_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_ADMIN_STUB_H +#include "google/cloud/pubsublite/v1/admin.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/admin_stub_factory.cc b/google/cloud/pubsublite/internal/admin_stub_factory.cc index 00a3ff41c4620..3a1795b345b21 100644 --- a/google/cloud/pubsublite/internal/admin_stub_factory.cc +++ b/google/cloud/pubsublite/internal/admin_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/pubsublite/internal/admin_metadata_decorator.h" #include "google/cloud/pubsublite/internal/admin_stub.h" #include "google/cloud/pubsublite/internal/admin_tracing_stub.h" +#include "google/cloud/pubsublite/v1/admin.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/admin_tracing_connection.cc b/google/cloud/pubsublite/internal/admin_tracing_connection.cc index 4f134e1539bb7..64dae6780c3e0 100644 --- a/google/cloud/pubsublite/internal/admin_tracing_connection.cc +++ b/google/cloud/pubsublite/internal/admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AdminServiceTracingConnection::AdminServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -278,16 +276,12 @@ AdminServiceTracingConnection::AsyncGetTopicPartitions( child_->AsyncGetTopicPartitions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAdminServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/pubsublite/internal/admin_tracing_connection.h b/google/cloud/pubsublite/internal/admin_tracing_connection.h index a459352486601..e12790bacd5bb 100644 --- a/google/cloud/pubsublite/internal/admin_tracing_connection.h +++ b/google/cloud/pubsublite/internal/admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AdminServiceTracingConnection : public pubsublite::AdminServiceConnection { public: @@ -140,8 +138,6 @@ class AdminServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/pubsublite/internal/admin_tracing_stub.cc b/google/cloud/pubsublite/internal/admin_tracing_stub.cc index 2c551ef2ac81a..fad04ac95bc2c 100644 --- a/google/cloud/pubsublite/internal/admin_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AdminServiceTracingStub::AdminServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -363,15 +361,9 @@ future AdminServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAdminServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/admin_tracing_stub.h b/google/cloud/pubsublite/internal/admin_tracing_stub.h index 8aff23408ae07..f1926430cb506 100644 --- a/google/cloud/pubsublite/internal/admin_tracing_stub.h +++ b/google/cloud/pubsublite/internal/admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AdminServiceTracingStub : public AdminServiceStub { public: ~AdminServiceTracingStub() override = default; @@ -182,8 +180,6 @@ class AdminServiceTracingStub : public AdminServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsublite/internal/cursor_auth_decorator.cc b/google/cloud/pubsublite/internal/cursor_auth_decorator.cc index 07730996513a1..57994577ad5c3 100644 --- a/google/cloud/pubsublite/internal/cursor_auth_decorator.cc +++ b/google/cloud/pubsublite/internal/cursor_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/pubsublite/v1/cursor.proto #include "google/cloud/pubsublite/internal/cursor_auth_decorator.h" +#include "google/cloud/pubsublite/v1/cursor.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/cursor_logging_decorator.cc b/google/cloud/pubsublite/internal/cursor_logging_decorator.cc index 4ffd50926baea..5b6993616d53d 100644 --- a/google/cloud/pubsublite/internal/cursor_logging_decorator.cc +++ b/google/cloud/pubsublite/internal/cursor_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/cursor.proto #include "google/cloud/pubsublite/internal/cursor_logging_decorator.h" +#include "google/cloud/pubsublite/v1/cursor.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/pubsublite/internal/cursor_metadata_decorator.cc b/google/cloud/pubsublite/internal/cursor_metadata_decorator.cc index ff59399a219c5..34d8666bdc6b7 100644 --- a/google/cloud/pubsublite/internal/cursor_metadata_decorator.cc +++ b/google/cloud/pubsublite/internal/cursor_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/pubsublite/v1/cursor.proto #include "google/cloud/pubsublite/internal/cursor_metadata_decorator.h" +#include "google/cloud/pubsublite/v1/cursor.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 #include #include #include diff --git a/google/cloud/pubsublite/internal/cursor_stub.cc b/google/cloud/pubsublite/internal/cursor_stub.cc index 61e5792f44a7e..a77b193b052ad 100644 --- a/google/cloud/pubsublite/internal/cursor_stub.cc +++ b/google/cloud/pubsublite/internal/cursor_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/cursor.proto #include "google/cloud/pubsublite/internal/cursor_stub.h" +#include "google/cloud/pubsublite/v1/cursor.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/cursor_stub.h b/google/cloud/pubsublite/internal/cursor_stub.h index e917aeb838370..1538ebfc01e8a 100644 --- a/google/cloud/pubsublite/internal/cursor_stub.h +++ b/google/cloud/pubsublite/internal/cursor_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_CURSOR_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_CURSOR_STUB_H +#include "google/cloud/pubsublite/v1/cursor.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/cursor_stub_factory.cc b/google/cloud/pubsublite/internal/cursor_stub_factory.cc index e0203c6e2fb7e..3e98448b198f6 100644 --- a/google/cloud/pubsublite/internal/cursor_stub_factory.cc +++ b/google/cloud/pubsublite/internal/cursor_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/pubsublite/internal/cursor_metadata_decorator.h" #include "google/cloud/pubsublite/internal/cursor_stub.h" #include "google/cloud/pubsublite/internal/cursor_tracing_stub.h" +#include "google/cloud/pubsublite/v1/cursor.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/cursor_tracing_stub.cc b/google/cloud/pubsublite/internal/cursor_tracing_stub.cc index 76d86726bdaee..40b6cd95ca18a 100644 --- a/google/cloud/pubsublite/internal/cursor_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/cursor_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CursorServiceTracingStub::CursorServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -120,15 +118,9 @@ Status CursorServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCursorServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/cursor_tracing_stub.h b/google/cloud/pubsublite/internal/cursor_tracing_stub.h index bb3862e6e28bf..e50dbc6d95883 100644 --- a/google/cloud/pubsublite/internal/cursor_tracing_stub.h +++ b/google/cloud/pubsublite/internal/cursor_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CursorServiceTracingStub : public CursorServiceStub { public: ~CursorServiceTracingStub() override = default; @@ -79,8 +77,6 @@ class CursorServiceTracingStub : public CursorServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsublite/internal/default_publish_message_transformer.h b/google/cloud/pubsublite/internal/default_publish_message_transformer.h index 9c2dc86a02868..22cf7424ff4f4 100644 --- a/google/cloud/pubsublite/internal/default_publish_message_transformer.h +++ b/google/cloud/pubsublite/internal/default_publish_message_transformer.h @@ -16,9 +16,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_DEFAULT_PUBLISH_MESSAGE_TRANSFORMER_H #include "google/cloud/pubsub/message.h" +#include "google/cloud/pubsublite/v1/common.pb.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include namespace google { namespace cloud { diff --git a/google/cloud/pubsublite/internal/default_publish_message_transformer_test.cc b/google/cloud/pubsublite/internal/default_publish_message_transformer_test.cc index 3416f9b67ef67..3587f52c0f840 100644 --- a/google/cloud/pubsublite/internal/default_publish_message_transformer_test.cc +++ b/google/cloud/pubsublite/internal/default_publish_message_transformer_test.cc @@ -16,7 +16,7 @@ #include "google/cloud/internal/base64_transforms.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/protobuf/timestamp.pb.h" #include namespace google { diff --git a/google/cloud/pubsublite/internal/multipartition_publisher.h b/google/cloud/pubsublite/internal/multipartition_publisher.h index ae9992a303ba7..ee19840dbc317 100644 --- a/google/cloud/pubsublite/internal/multipartition_publisher.h +++ b/google/cloud/pubsublite/internal/multipartition_publisher.h @@ -22,8 +22,8 @@ #include "google/cloud/pubsublite/internal/service_composite.h" #include "google/cloud/pubsublite/message_metadata.h" #include "google/cloud/pubsublite/topic.h" -#include -#include +#include "google/cloud/pubsublite/v1/admin.pb.h" +#include "google/cloud/pubsublite/v1/publisher.pb.h" #include #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_auth_decorator.cc b/google/cloud/pubsublite/internal/partition_assignment_auth_decorator.cc index c4e4998701735..d0373cad19d28 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_auth_decorator.cc +++ b/google/cloud/pubsublite/internal/partition_assignment_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/partition_assignment_auth_decorator.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_logging_decorator.cc b/google/cloud/pubsublite/internal/partition_assignment_logging_decorator.cc index c5e9c077969cd..504d99f781f82 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_logging_decorator.cc +++ b/google/cloud/pubsublite/internal/partition_assignment_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/partition_assignment_logging_decorator.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_metadata_decorator.cc b/google/cloud/pubsublite/internal/partition_assignment_metadata_decorator.cc index c294407a4e0c4..5b88ef51f152f 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_metadata_decorator.cc +++ b/google/cloud/pubsublite/internal/partition_assignment_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/partition_assignment_metadata_decorator.h" +#include "google/cloud/pubsublite/v1/subscriber.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 #include #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_stub.cc b/google/cloud/pubsublite/internal/partition_assignment_stub.cc index f35092434bb0b..56e01d7905700 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_stub.cc +++ b/google/cloud/pubsublite/internal/partition_assignment_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/partition_assignment_stub.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_stub.h b/google/cloud/pubsublite/internal/partition_assignment_stub.h index a5e9327a32d3a..a1f230e1d6f98 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_stub.h +++ b/google/cloud/pubsublite/internal/partition_assignment_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_PARTITION_ASSIGNMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_PARTITION_ASSIGNMENT_STUB_H +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_stub_factory.cc b/google/cloud/pubsublite/internal/partition_assignment_stub_factory.cc index aa0daac40d0de..c3ff83e26f0b2 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_stub_factory.cc +++ b/google/cloud/pubsublite/internal/partition_assignment_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/pubsublite/internal/partition_assignment_metadata_decorator.h" #include "google/cloud/pubsublite/internal/partition_assignment_stub.h" #include "google/cloud/pubsublite/internal/partition_assignment_tracing_stub.h" +#include "google/cloud/pubsublite/v1/subscriber.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.cc b/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.cc index 6990d7b07d0c6..90a07142152ad 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PartitionAssignmentServiceTracingStub::PartitionAssignmentServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -100,17 +98,11 @@ Status PartitionAssignmentServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePartitionAssignmentServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.h b/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.h index b2a2984c1d6fd..283abe484bb70 100644 --- a/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.h +++ b/google/cloud/pubsublite/internal/partition_assignment_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PartitionAssignmentServiceTracingStub : public PartitionAssignmentServiceStub { public: @@ -70,8 +68,6 @@ class PartitionAssignmentServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsublite/internal/partition_publisher.h b/google/cloud/pubsublite/internal/partition_publisher.h index 961caf0eb53d9..cbdc0c1988578 100644 --- a/google/cloud/pubsublite/internal/partition_publisher.h +++ b/google/cloud/pubsublite/internal/partition_publisher.h @@ -20,8 +20,8 @@ #include "google/cloud/pubsublite/internal/publisher.h" #include "google/cloud/pubsublite/internal/resumable_async_streaming_read_write_rpc.h" #include "google/cloud/pubsublite/internal/service_composite.h" +#include "google/cloud/pubsublite/v1/publisher.pb.h" #include "absl/functional/function_ref.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/publisher.h b/google/cloud/pubsublite/internal/publisher.h index d6989258d6672..d8e5055bf4b9e 100644 --- a/google/cloud/pubsublite/internal/publisher.h +++ b/google/cloud/pubsublite/internal/publisher.h @@ -16,9 +16,9 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_PUBLISHER_H #include "google/cloud/pubsublite/internal/service.h" +#include "google/cloud/pubsublite/v1/common.pb.h" #include "google/cloud/future.h" #include "google/cloud/status_or.h" -#include namespace google { namespace cloud { diff --git a/google/cloud/pubsublite/internal/publisher_auth_decorator.cc b/google/cloud/pubsublite/internal/publisher_auth_decorator.cc index 676c6d6586fa1..fc123dd0130f6 100644 --- a/google/cloud/pubsublite/internal/publisher_auth_decorator.cc +++ b/google/cloud/pubsublite/internal/publisher_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/pubsublite/v1/publisher.proto #include "google/cloud/pubsublite/internal/publisher_auth_decorator.h" +#include "google/cloud/pubsublite/v1/publisher.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/publisher_logging_decorator.cc b/google/cloud/pubsublite/internal/publisher_logging_decorator.cc index c87bb9e441abb..f1d63ae4897fb 100644 --- a/google/cloud/pubsublite/internal/publisher_logging_decorator.cc +++ b/google/cloud/pubsublite/internal/publisher_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/publisher.proto #include "google/cloud/pubsublite/internal/publisher_logging_decorator.h" +#include "google/cloud/pubsublite/v1/publisher.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/pubsublite/internal/publisher_metadata_decorator.cc b/google/cloud/pubsublite/internal/publisher_metadata_decorator.cc index 90ff8c424f1d8..3a5e11aeaa97c 100644 --- a/google/cloud/pubsublite/internal/publisher_metadata_decorator.cc +++ b/google/cloud/pubsublite/internal/publisher_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/pubsublite/v1/publisher.proto #include "google/cloud/pubsublite/internal/publisher_metadata_decorator.h" +#include "google/cloud/pubsublite/v1/publisher.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 #include #include #include diff --git a/google/cloud/pubsublite/internal/publisher_stub.cc b/google/cloud/pubsublite/internal/publisher_stub.cc index 3c4b92a94286c..670b811e1f6ce 100644 --- a/google/cloud/pubsublite/internal/publisher_stub.cc +++ b/google/cloud/pubsublite/internal/publisher_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/publisher.proto #include "google/cloud/pubsublite/internal/publisher_stub.h" +#include "google/cloud/pubsublite/v1/publisher.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/publisher_stub.h b/google/cloud/pubsublite/internal/publisher_stub.h index a97b85cf74ef6..f9914b0c734ec 100644 --- a/google/cloud/pubsublite/internal/publisher_stub.h +++ b/google/cloud/pubsublite/internal/publisher_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_PUBLISHER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_PUBLISHER_STUB_H +#include "google/cloud/pubsublite/v1/publisher.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/publisher_stub_factory.cc b/google/cloud/pubsublite/internal/publisher_stub_factory.cc index 8b3b80bcac587..0d25aef38cc26 100644 --- a/google/cloud/pubsublite/internal/publisher_stub_factory.cc +++ b/google/cloud/pubsublite/internal/publisher_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/pubsublite/internal/publisher_metadata_decorator.h" #include "google/cloud/pubsublite/internal/publisher_stub.h" #include "google/cloud/pubsublite/internal/publisher_tracing_stub.h" +#include "google/cloud/pubsublite/v1/publisher.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/publisher_tracing_stub.cc b/google/cloud/pubsublite/internal/publisher_tracing_stub.cc index 808ccb1705e24..9fad8cf17800a 100644 --- a/google/cloud/pubsublite/internal/publisher_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/publisher_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PublisherServiceTracingStub::PublisherServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -96,15 +94,9 @@ Status PublisherServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePublisherServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/publisher_tracing_stub.h b/google/cloud/pubsublite/internal/publisher_tracing_stub.h index 3785fc968a446..87f6700018aac 100644 --- a/google/cloud/pubsublite/internal/publisher_tracing_stub.h +++ b/google/cloud/pubsublite/internal/publisher_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PublisherServiceTracingStub : public PublisherServiceStub { public: ~PublisherServiceTracingStub() override = default; @@ -68,8 +66,6 @@ class PublisherServiceTracingStub : public PublisherServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsublite/internal/stream_factory.h b/google/cloud/pubsublite/internal/stream_factory.h index 8d0e7802dd867..56a2be40472c9 100644 --- a/google/cloud/pubsublite/internal/stream_factory.h +++ b/google/cloud/pubsublite/internal/stream_factory.h @@ -19,11 +19,11 @@ #include "google/cloud/pubsublite/internal/partition_assignment_stub.h" #include "google/cloud/pubsublite/internal/publisher_stub.h" #include "google/cloud/pubsublite/internal/subscriber_stub.h" +#include "google/cloud/pubsublite/v1/cursor.grpc.pb.h" +#include "google/cloud/pubsublite/v1/publisher.grpc.pb.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/version.h" -#include -#include -#include #include namespace google { diff --git a/google/cloud/pubsublite/internal/subscriber_auth_decorator.cc b/google/cloud/pubsublite/internal/subscriber_auth_decorator.cc index 52eba69d9ce42..e72d2e916383f 100644 --- a/google/cloud/pubsublite/internal/subscriber_auth_decorator.cc +++ b/google/cloud/pubsublite/internal/subscriber_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/subscriber_auth_decorator.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/subscriber_logging_decorator.cc b/google/cloud/pubsublite/internal/subscriber_logging_decorator.cc index 136675dfd4695..35a960292b7dc 100644 --- a/google/cloud/pubsublite/internal/subscriber_logging_decorator.cc +++ b/google/cloud/pubsublite/internal/subscriber_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/subscriber_logging_decorator.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/pubsublite/internal/subscriber_metadata_decorator.cc b/google/cloud/pubsublite/internal/subscriber_metadata_decorator.cc index b7638ba07bb4b..603b4f1227c80 100644 --- a/google/cloud/pubsublite/internal/subscriber_metadata_decorator.cc +++ b/google/cloud/pubsublite/internal/subscriber_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/subscriber_metadata_decorator.h" +#include "google/cloud/pubsublite/v1/subscriber.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 #include #include #include diff --git a/google/cloud/pubsublite/internal/subscriber_stub.cc b/google/cloud/pubsublite/internal/subscriber_stub.cc index 685c133b0deb9..09202905846ca 100644 --- a/google/cloud/pubsublite/internal/subscriber_stub.cc +++ b/google/cloud/pubsublite/internal/subscriber_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/pubsublite/v1/subscriber.proto #include "google/cloud/pubsublite/internal/subscriber_stub.h" +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/subscriber_stub.h b/google/cloud/pubsublite/internal/subscriber_stub.h index eda8cb45b74e9..7def575a8c992 100644 --- a/google/cloud/pubsublite/internal/subscriber_stub.h +++ b/google/cloud/pubsublite/internal/subscriber_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_SUBSCRIBER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_SUBSCRIBER_STUB_H +#include "google/cloud/pubsublite/v1/subscriber.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/subscriber_stub_factory.cc b/google/cloud/pubsublite/internal/subscriber_stub_factory.cc index bfc79126ca7f6..8f69204a4dc8c 100644 --- a/google/cloud/pubsublite/internal/subscriber_stub_factory.cc +++ b/google/cloud/pubsublite/internal/subscriber_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/pubsublite/internal/subscriber_metadata_decorator.h" #include "google/cloud/pubsublite/internal/subscriber_stub.h" #include "google/cloud/pubsublite/internal/subscriber_tracing_stub.h" +#include "google/cloud/pubsublite/v1/subscriber.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/subscriber_tracing_stub.cc b/google/cloud/pubsublite/internal/subscriber_tracing_stub.cc index 3d4822a3ea8c7..ae0478dbb8ece 100644 --- a/google/cloud/pubsublite/internal/subscriber_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/subscriber_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SubscriberServiceTracingStub::SubscriberServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -96,15 +94,9 @@ Status SubscriberServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSubscriberServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/subscriber_tracing_stub.h b/google/cloud/pubsublite/internal/subscriber_tracing_stub.h index 3f9b7c90fb203..4a0c1aa814d56 100644 --- a/google/cloud/pubsublite/internal/subscriber_tracing_stub.h +++ b/google/cloud/pubsublite/internal/subscriber_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SubscriberServiceTracingStub : public SubscriberServiceStub { public: ~SubscriberServiceTracingStub() override = default; @@ -68,8 +66,6 @@ class SubscriberServiceTracingStub : public SubscriberServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsublite/internal/topic_stats_auth_decorator.cc b/google/cloud/pubsublite/internal/topic_stats_auth_decorator.cc index 84176ab705675..422eacd0138c1 100644 --- a/google/cloud/pubsublite/internal/topic_stats_auth_decorator.cc +++ b/google/cloud/pubsublite/internal/topic_stats_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/pubsublite/v1/topic_stats.proto #include "google/cloud/pubsublite/internal/topic_stats_auth_decorator.h" -#include +#include "google/cloud/pubsublite/v1/topic_stats.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/topic_stats_logging_decorator.cc b/google/cloud/pubsublite/internal/topic_stats_logging_decorator.cc index 8c5ffffaa7897..0ab0bfdc718dc 100644 --- a/google/cloud/pubsublite/internal/topic_stats_logging_decorator.cc +++ b/google/cloud/pubsublite/internal/topic_stats_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/pubsublite/v1/topic_stats.proto #include "google/cloud/pubsublite/internal/topic_stats_logging_decorator.h" +#include "google/cloud/pubsublite/v1/topic_stats.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/pubsublite/internal/topic_stats_metadata_decorator.cc b/google/cloud/pubsublite/internal/topic_stats_metadata_decorator.cc index d5888c35d0966..6fb7dda31ed58 100644 --- a/google/cloud/pubsublite/internal/topic_stats_metadata_decorator.cc +++ b/google/cloud/pubsublite/internal/topic_stats_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/pubsublite/v1/topic_stats.proto #include "google/cloud/pubsublite/internal/topic_stats_metadata_decorator.h" +#include "google/cloud/pubsublite/v1/topic_stats.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 #include #include #include diff --git a/google/cloud/pubsublite/internal/topic_stats_stub.cc b/google/cloud/pubsublite/internal/topic_stats_stub.cc index 35926bb67f968..6de6ec6ea5918 100644 --- a/google/cloud/pubsublite/internal/topic_stats_stub.cc +++ b/google/cloud/pubsublite/internal/topic_stats_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/pubsublite/v1/topic_stats.proto #include "google/cloud/pubsublite/internal/topic_stats_stub.h" +#include "google/cloud/pubsublite/v1/topic_stats.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/pubsublite/internal/topic_stats_stub.h b/google/cloud/pubsublite/internal/topic_stats_stub.h index 0e396f2685937..88d43be5f5035 100644 --- a/google/cloud/pubsublite/internal/topic_stats_stub.h +++ b/google/cloud/pubsublite/internal/topic_stats_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_TOPIC_STATS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_INTERNAL_TOPIC_STATS_STUB_H +#include "google/cloud/pubsublite/v1/topic_stats.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/topic_stats_stub_factory.cc b/google/cloud/pubsublite/internal/topic_stats_stub_factory.cc index e2da9d34ed65c..8fcb6c017738a 100644 --- a/google/cloud/pubsublite/internal/topic_stats_stub_factory.cc +++ b/google/cloud/pubsublite/internal/topic_stats_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/pubsublite/internal/topic_stats_metadata_decorator.h" #include "google/cloud/pubsublite/internal/topic_stats_stub.h" #include "google/cloud/pubsublite/internal/topic_stats_tracing_stub.h" +#include "google/cloud/pubsublite/v1/topic_stats.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/pubsublite/internal/topic_stats_tracing_connection.cc b/google/cloud/pubsublite/internal/topic_stats_tracing_connection.cc index 4bd64200e74df..66e72284cf5bd 100644 --- a/google/cloud/pubsublite/internal/topic_stats_tracing_connection.cc +++ b/google/cloud/pubsublite/internal/topic_stats_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TopicStatsServiceTracingConnection::TopicStatsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -96,17 +94,13 @@ Status TopicStatsServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTopicStatsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/pubsublite/internal/topic_stats_tracing_connection.h b/google/cloud/pubsublite/internal/topic_stats_tracing_connection.h index e204b8f78c2ca..18e3764d58f54 100644 --- a/google/cloud/pubsublite/internal/topic_stats_tracing_connection.h +++ b/google/cloud/pubsublite/internal/topic_stats_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TopicStatsServiceTracingConnection : public pubsublite::TopicStatsServiceConnection { public: @@ -71,8 +69,6 @@ class TopicStatsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/pubsublite/internal/topic_stats_tracing_stub.cc b/google/cloud/pubsublite/internal/topic_stats_tracing_stub.cc index 1d626905e8dd5..cf6120eb786fd 100644 --- a/google/cloud/pubsublite/internal/topic_stats_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/topic_stats_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TopicStatsServiceTracingStub::TopicStatsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -114,15 +112,9 @@ Status TopicStatsServiceTracingStub::CancelOperation( child_->CancelOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTopicStatsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/topic_stats_tracing_stub.h b/google/cloud/pubsublite/internal/topic_stats_tracing_stub.h index cb3ddda33bbea..f3349d0bb7fd9 100644 --- a/google/cloud/pubsublite/internal/topic_stats_tracing_stub.h +++ b/google/cloud/pubsublite/internal/topic_stats_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace pubsublite_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TopicStatsServiceTracingStub : public TopicStatsServiceStub { public: ~TopicStatsServiceTracingStub() override = default; @@ -79,8 +77,6 @@ class TopicStatsServiceTracingStub : public TopicStatsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/pubsublite/message_metadata.h b/google/cloud/pubsublite/message_metadata.h index 526a7e8f1b403..1944e4702c96d 100644 --- a/google/cloud/pubsublite/message_metadata.h +++ b/google/cloud/pubsublite/message_metadata.h @@ -15,12 +15,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_MESSAGE_METADATA_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_MESSAGE_METADATA_H +#include "google/cloud/pubsublite/v1/publisher.pb.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" -#include #include namespace google { diff --git a/google/cloud/pubsublite/options.h b/google/cloud/pubsublite/options.h index 174313fcabf4a..ead105c593564 100644 --- a/google/cloud/pubsublite/options.h +++ b/google/cloud/pubsublite/options.h @@ -17,9 +17,9 @@ #include "google/cloud/pubsub/message.h" #include "google/cloud/pubsublite/internal/resumable_async_streaming_read_write_rpc.h" +#include "google/cloud/pubsublite/v1/common.pb.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/pubsublite/publisher_connection.cc b/google/cloud/pubsublite/publisher_connection.cc index d4fc765793959..6fe5b990d977a 100644 --- a/google/cloud/pubsublite/publisher_connection.cc +++ b/google/cloud/pubsublite/publisher_connection.cc @@ -31,7 +31,7 @@ #include "google/cloud/internal/base64_transforms.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/internal/unified_grpc_credentials.h" -#include +#include "google/protobuf/struct.pb.h" #include namespace google { diff --git a/google/cloud/pubsublite/quickstart/.bazelrc b/google/cloud/pubsublite/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/pubsublite/quickstart/.bazelrc +++ b/google/cloud/pubsublite/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/pubsublite/topic_stats_connection.h b/google/cloud/pubsublite/topic_stats_connection.h index f2fe7dcdae23f..91992be2ca4fa 100644 --- a/google/cloud/pubsublite/topic_stats_connection.h +++ b/google/cloud/pubsublite/topic_stats_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/pubsublite/internal/topic_stats_retry_traits.h" #include "google/cloud/pubsublite/topic_stats_connection_idempotency_policy.h" +#include "google/cloud/pubsublite/v1/topic_stats.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/pubsublite/topic_stats_connection_idempotency_policy.h b/google/cloud/pubsublite/topic_stats_connection_idempotency_policy.h index cf2a6c85c662d..7e7a0e07686d4 100644 --- a/google/cloud/pubsublite/topic_stats_connection_idempotency_policy.h +++ b/google/cloud/pubsublite/topic_stats_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_TOPIC_STATS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUBLITE_TOPIC_STATS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/pubsublite/v1/topic_stats.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/rapidmigrationassessment/BUILD.bazel b/google/cloud/rapidmigrationassessment/BUILD.bazel index 272cc97984cae..957245706d7a2 100644 --- a/google/cloud/rapidmigrationassessment/BUILD.bazel +++ b/google/cloud/rapidmigrationassessment/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/rapidmigrationassessment/v1:rapidmigrationassessment_cc_grpc", + "@googleapis//google/cloud/rapidmigrationassessment/v1:rapidmigrationassessment_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/rapidmigrationassessment/quickstart/.bazelrc b/google/cloud/rapidmigrationassessment/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/rapidmigrationassessment/quickstart/.bazelrc +++ b/google/cloud/rapidmigrationassessment/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.cc index 4f42d6be52276..5bb0413ca8caa 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.cc @@ -18,7 +18,7 @@ // google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.proto #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.h" -#include +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.grpc.pb.h" #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.h index 7f21f099e3aef..3f53981304d1a 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_connection_impl.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_connection_impl.h index 93b4aac53ccfa..e4ec852208cc5 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_connection_impl.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.cc index 79dd5d13f9f6a..38871c32c81f6 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.cc @@ -18,9 +18,9 @@ // google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.proto #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.h index 2c0fc153d3fc9..354a63095adbb 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.cc index b80e56b1a0561..b9ce57d0db904 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.cc @@ -18,12 +18,12 @@ // google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.proto #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.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 #include #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.h index a03d74f2e46c4..7c78c6ad6c6dd 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.h @@ -23,7 +23,7 @@ #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc index c68db5657494e..ea87096e10a32 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc @@ -18,10 +18,10 @@ // google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.proto #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h index 63908d1d969a7..3c85bb7e691bd 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h @@ -20,14 +20,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RAPIDMIGRATIONASSESSMENT_V1_INTERNAL_RAPID_MIGRATION_ASSESSMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RAPIDMIGRATIONASSESSMENT_V1_INTERNAL_RAPID_MIGRATION_ASSESSMENT_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc index 414e9038db512..717d1be10382e 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc @@ -18,20 +18,20 @@ // google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.proto #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_auth_decorator.h" #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_logging_decorator.h" #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_metadata_decorator.h" #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h" #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.cc index c440ff1686cfd..76445eea4871f 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace rapidmigrationassessment_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RapidMigrationAssessmentTracingConnection:: RapidMigrationAssessmentTracingConnection( std::shared_ptr< @@ -375,19 +373,15 @@ Status RapidMigrationAssessmentTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRapidMigrationAssessmentTracingConnection( std::shared_ptr< rapidmigrationassessment_v1::RapidMigrationAssessmentConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.h index d8814e5fc6b91..f3336c284a1c6 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace rapidmigrationassessment_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RapidMigrationAssessmentTracingConnection : public rapidmigrationassessment_v1::RapidMigrationAssessmentConnection { public: @@ -168,8 +166,6 @@ class RapidMigrationAssessmentTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc index 6ff09400c296d..0aeee2080fecb 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace rapidmigrationassessment_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RapidMigrationAssessmentTracingStub::RapidMigrationAssessmentTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -396,16 +394,10 @@ future RapidMigrationAssessmentTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRapidMigrationAssessmentTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.h index 299040b0b5459..5447311c1cf5d 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.h @@ -31,8 +31,6 @@ namespace cloud { namespace rapidmigrationassessment_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RapidMigrationAssessmentTracingStub : public RapidMigrationAssessmentStub { public: @@ -184,8 +182,6 @@ class RapidMigrationAssessmentTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_client.h b/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_client.h index c54ab940e8e4a..ebdf0a4521f23 100644 --- a/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_client.h +++ b/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_client.h @@ -27,7 +27,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection.h b/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection.h index 64b1ce9a55302..f52a188c066a9 100644 --- a/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection.h +++ b/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection.h @@ -22,6 +22,7 @@ #include "google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_retry_traits.h" #include "google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection_idempotency_policy.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -31,8 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection_idempotency_policy.h b/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection_idempotency_policy.h index 72ab20f636621..d26a50efae62e 100644 --- a/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection_idempotency_policy.h +++ b/google/cloud/rapidmigrationassessment/v1/rapid_migration_assessment_connection_idempotency_policy.h @@ -20,11 +20,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RAPIDMIGRATIONASSESSMENT_V1_RAPID_MIGRATION_ASSESSMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RAPIDMIGRATIONASSESSMENT_V1_RAPID_MIGRATION_ASSESSMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/rapidmigrationassessment/v1/rapidmigrationassessment.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/recaptchaenterprise/BUILD.bazel b/google/cloud/recaptchaenterprise/BUILD.bazel index 913d928a06f8c..e9a02ffd98313 100644 --- a/google/cloud/recaptchaenterprise/BUILD.bazel +++ b/google/cloud/recaptchaenterprise/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/recaptchaenterprise/v1:recaptchaenterprise_cc_grpc", + "@googleapis//google/cloud/recaptchaenterprise/v1:recaptchaenterprise_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/recaptchaenterprise/quickstart/.bazelrc b/google/cloud/recaptchaenterprise/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/recaptchaenterprise/quickstart/.bazelrc +++ b/google/cloud/recaptchaenterprise/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_auth_decorator.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_auth_decorator.cc index 63e830e3fc26f..4268ede4257b3 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_auth_decorator.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_auth_decorator.h" -#include +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.grpc.pb.h" #include #include diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_logging_decorator.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_logging_decorator.cc index 4bf9e962be7b5..38efb999c0e63 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_logging_decorator.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_logging_decorator.h" +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_metadata_decorator.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_metadata_decorator.cc index 3c7f691db11df..49d10a4a31fde 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_metadata_decorator.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_metadata_decorator.h" +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.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 #include #include #include diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.cc index 472f95a819527..a8b62ad81c3a2 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.h" +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.h b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.h index 1c4372c315a56..8d3a1e6bbda59 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.h +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECAPTCHAENTERPRISE_V1_INTERNAL_RECAPTCHA_ENTERPRISE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECAPTCHAENTERPRISE_V1_INTERNAL_RECAPTCHA_ENTERPRISE_STUB_H +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub_factory.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub_factory.cc index 7d63fc5a4de36..173809acb7669 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub_factory.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_metadata_decorator.h" #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_stub.h" #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.h" +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.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 #include #include diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc index 737ed0ce1083b..8820f8b4c0067 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace recaptchaenterprise_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RecaptchaEnterpriseServiceTracingConnection:: RecaptchaEnterpriseServiceTracingConnection( std::shared_ptr< @@ -289,19 +287,15 @@ RecaptchaEnterpriseServiceTracingConnection:: std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRecaptchaEnterpriseServiceTracingConnection( std::shared_ptr< recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.h b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.h index 5a14bea9087b9..a566a317cd4f4 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.h +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace recaptchaenterprise_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RecaptchaEnterpriseServiceTracingConnection : public recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection { public: @@ -150,8 +148,6 @@ class RecaptchaEnterpriseServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.cc index ebb1c69b7aa56..8ac82358ad212 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace recaptchaenterprise_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RecaptchaEnterpriseServiceTracingStub::RecaptchaEnterpriseServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -341,17 +339,11 @@ RecaptchaEnterpriseServiceTracingStub::SearchRelatedAccountGroupMemberships( child_->SearchRelatedAccountGroupMemberships(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRecaptchaEnterpriseServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.h b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.h index 4e8b94fc4c68d..29c0fd75dbd10 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.h +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace recaptchaenterprise_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RecaptchaEnterpriseServiceTracingStub : public RecaptchaEnterpriseServiceStub { public: @@ -174,8 +172,6 @@ class RecaptchaEnterpriseServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection.h b/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection.h index 2847ae208c0bc..3cd32509dbe25 100644 --- a/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection.h +++ b/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_retry_traits.h" #include "google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection_idempotency_policy.h" +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection_idempotency_policy.h b/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection_idempotency_policy.h index 4fd43427dedd7..e9dad23ea3381 100644 --- a/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection_idempotency_policy.h +++ b/google/cloud/recaptchaenterprise/v1/recaptcha_enterprise_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECAPTCHAENTERPRISE_V1_RECAPTCHA_ENTERPRISE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECAPTCHAENTERPRISE_V1_RECAPTCHA_ENTERPRISE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/recaptchaenterprise/v1/recaptchaenterprise.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/recommender/BUILD.bazel b/google/cloud/recommender/BUILD.bazel index 8abd72b3da11f..11a8274c71352 100644 --- a/google/cloud/recommender/BUILD.bazel +++ b/google/cloud/recommender/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/recommender/v1:recommender_cc_grpc", + "@googleapis//google/cloud/recommender/v1:recommender_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/recommender/quickstart/.bazelrc b/google/cloud/recommender/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/recommender/quickstart/.bazelrc +++ b/google/cloud/recommender/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/recommender/v1/internal/recommender_auth_decorator.cc b/google/cloud/recommender/v1/internal/recommender_auth_decorator.cc index 691f5f1a6c5b0..53f80c273d8b1 100644 --- a/google/cloud/recommender/v1/internal/recommender_auth_decorator.cc +++ b/google/cloud/recommender/v1/internal/recommender_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/recommender/v1/recommender_service.proto #include "google/cloud/recommender/v1/internal/recommender_auth_decorator.h" -#include +#include "google/cloud/recommender/v1/recommender_service.grpc.pb.h" #include #include diff --git a/google/cloud/recommender/v1/internal/recommender_logging_decorator.cc b/google/cloud/recommender/v1/internal/recommender_logging_decorator.cc index d30c7cc5351d4..d4f09696f59cc 100644 --- a/google/cloud/recommender/v1/internal/recommender_logging_decorator.cc +++ b/google/cloud/recommender/v1/internal/recommender_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/recommender/v1/recommender_service.proto #include "google/cloud/recommender/v1/internal/recommender_logging_decorator.h" +#include "google/cloud/recommender/v1/recommender_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/recommender/v1/internal/recommender_metadata_decorator.cc b/google/cloud/recommender/v1/internal/recommender_metadata_decorator.cc index 48831f129438a..df1ff4a75cf65 100644 --- a/google/cloud/recommender/v1/internal/recommender_metadata_decorator.cc +++ b/google/cloud/recommender/v1/internal/recommender_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/recommender/v1/recommender_service.proto #include "google/cloud/recommender/v1/internal/recommender_metadata_decorator.h" +#include "google/cloud/recommender/v1/recommender_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 #include #include #include diff --git a/google/cloud/recommender/v1/internal/recommender_stub.cc b/google/cloud/recommender/v1/internal/recommender_stub.cc index 8a3ed50ce41d6..99928ff8ad06d 100644 --- a/google/cloud/recommender/v1/internal/recommender_stub.cc +++ b/google/cloud/recommender/v1/internal/recommender_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/recommender/v1/recommender_service.proto #include "google/cloud/recommender/v1/internal/recommender_stub.h" +#include "google/cloud/recommender/v1/recommender_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/recommender/v1/internal/recommender_stub.h b/google/cloud/recommender/v1/internal/recommender_stub.h index 38bc4cd3aec88..991e64866fe4a 100644 --- a/google/cloud/recommender/v1/internal/recommender_stub.h +++ b/google/cloud/recommender/v1/internal/recommender_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_V1_INTERNAL_RECOMMENDER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_V1_INTERNAL_RECOMMENDER_STUB_H +#include "google/cloud/recommender/v1/recommender_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/recommender/v1/internal/recommender_stub_factory.cc b/google/cloud/recommender/v1/internal/recommender_stub_factory.cc index 6f7dd489b59c3..edc8e3f414bc8 100644 --- a/google/cloud/recommender/v1/internal/recommender_stub_factory.cc +++ b/google/cloud/recommender/v1/internal/recommender_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/recommender/v1/internal/recommender_metadata_decorator.h" #include "google/cloud/recommender/v1/internal/recommender_stub.h" #include "google/cloud/recommender/v1/internal/recommender_tracing_stub.h" +#include "google/cloud/recommender/v1/recommender_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 #include #include diff --git a/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc b/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc index 1b1b67aab9e04..07d1d6448a6b1 100644 --- a/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc +++ b/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace recommender_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RecommenderTracingConnection::RecommenderTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -163,16 +161,12 @@ RecommenderTracingConnection::UpdateInsightTypeConfig( return internal::EndSpan(*span, child_->UpdateInsightTypeConfig(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRecommenderTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/recommender/v1/internal/recommender_tracing_connection.h b/google/cloud/recommender/v1/internal/recommender_tracing_connection.h index e8c4842d2efca..2e8abf3900032 100644 --- a/google/cloud/recommender/v1/internal/recommender_tracing_connection.h +++ b/google/cloud/recommender/v1/internal/recommender_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace recommender_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RecommenderTracingConnection : public recommender_v1::RecommenderConnection { public: @@ -103,8 +101,6 @@ class RecommenderTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/recommender/v1/internal/recommender_tracing_stub.cc b/google/cloud/recommender/v1/internal/recommender_tracing_stub.cc index b399c0762e0f1..b5db1fe062a53 100644 --- a/google/cloud/recommender/v1/internal/recommender_tracing_stub.cc +++ b/google/cloud/recommender/v1/internal/recommender_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace recommender_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RecommenderTracingStub::RecommenderTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -202,15 +200,9 @@ RecommenderTracingStub::UpdateInsightTypeConfig( child_->UpdateInsightTypeConfig(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRecommenderTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/recommender/v1/internal/recommender_tracing_stub.h b/google/cloud/recommender/v1/internal/recommender_tracing_stub.h index 45257c0855979..89edb67551a8f 100644 --- a/google/cloud/recommender/v1/internal/recommender_tracing_stub.h +++ b/google/cloud/recommender/v1/internal/recommender_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace recommender_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RecommenderTracingStub : public RecommenderStub { public: ~RecommenderTracingStub() override = default; @@ -118,8 +116,6 @@ class RecommenderTracingStub : public RecommenderStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/recommender/v1/recommender_connection.h b/google/cloud/recommender/v1/recommender_connection.h index 8a3e6ebc06497..18c24b905bdb5 100644 --- a/google/cloud/recommender/v1/recommender_connection.h +++ b/google/cloud/recommender/v1/recommender_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/recommender/v1/internal/recommender_retry_traits.h" #include "google/cloud/recommender/v1/recommender_connection_idempotency_policy.h" +#include "google/cloud/recommender/v1/recommender_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/recommender/v1/recommender_connection_idempotency_policy.h b/google/cloud/recommender/v1/recommender_connection_idempotency_policy.h index c968fae20bee5..26397a7f1df2b 100644 --- a/google/cloud/recommender/v1/recommender_connection_idempotency_policy.h +++ b/google/cloud/recommender/v1/recommender_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_V1_RECOMMENDER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_V1_RECOMMENDER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/recommender/v1/recommender_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/redis/BUILD.bazel b/google/cloud/redis/BUILD.bazel index 7072c4ab75382..7c48afd608d7a 100644 --- a/google/cloud/redis/BUILD.bazel +++ b/google/cloud/redis/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/redis/cluster/v1:cluster_cc_grpc", - "@com_google_googleapis//google/cloud/redis/v1:redis_cc_grpc", + "@googleapis//google/cloud/redis/cluster/v1:cluster_cc_grpc", + "@googleapis//google/cloud/redis/v1:redis_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/redis/cluster/v1/cloud_redis_cluster_client.h b/google/cloud/redis/cluster/v1/cloud_redis_cluster_client.h index 632eec528eabb..4ec7699578834 100644 --- a/google/cloud/redis/cluster/v1/cloud_redis_cluster_client.h +++ b/google/cloud/redis/cluster/v1/cloud_redis_cluster_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection.h b/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection.h index 11533e03a9a66..890d78c09fb57 100644 --- a/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection.h +++ b/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLUSTER_V1_CLOUD_REDIS_CLUSTER_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLUSTER_V1_CLOUD_REDIS_CLUSTER_CONNECTION_H +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.pb.h" #include "google/cloud/redis/cluster/v1/cloud_redis_cluster_connection_idempotency_policy.h" #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection_idempotency_policy.h b/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection_idempotency_policy.h index 3b16a188a5015..7a9fd425c3f07 100644 --- a/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection_idempotency_policy.h +++ b/google/cloud/redis/cluster/v1/cloud_redis_cluster_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLUSTER_V1_CLOUD_REDIS_CLUSTER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLUSTER_V1_CLOUD_REDIS_CLUSTER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.cc index 3861b6bdd3b0a..00ebda76f517f 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/redis/cluster/v1/cloud_redis_cluster.proto #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.h" -#include +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.grpc.pb.h" #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.h index 5b1f74efd0b1a..7bbdde050b386 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_connection_impl.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_connection_impl.h index 9a438acf107b7..6f999987a375f 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_connection_impl.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.cc index 510ea041cd51d..5d7a2c06a5937 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/redis/cluster/v1/cloud_redis_cluster.proto #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.h" +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.h index acd18fd2200fa..dcae84d09f05a 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.cc index 3109d519e7340..af08979d8834e 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/redis/cluster/v1/cloud_redis_cluster.proto #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.h" +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.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 #include #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.h index 2340d58a77a6b..b3a2298cb3f79 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc index b3eda3b74c849..d016f61d6497b 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/redis/cluster/v1/cloud_redis_cluster.proto #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h" +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h index 7f9e224259c06..a98222e247f66 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLUSTER_V1_INTERNAL_CLOUD_REDIS_CLUSTER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLUSTER_V1_INTERNAL_CLOUD_REDIS_CLUSTER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc index 462dd914a7ff4..cfd42a972ef2e 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/redis/cluster/v1/cloud_redis_cluster.proto #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/redis/cluster/v1/cloud_redis_cluster.grpc.pb.h" #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_auth_decorator.h" #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_logging_decorator.h" #include "google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.cc index 10fc381c6d126..212fba3d582c7 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace redis_cluster_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudRedisClusterTracingConnection::CloudRedisClusterTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -368,17 +366,13 @@ Status CloudRedisClusterTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudRedisClusterTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.h index b0b3c0936fd1f..7c2061144db32 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace redis_cluster_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudRedisClusterTracingConnection : public redis_cluster_v1::CloudRedisClusterConnection { public: @@ -177,8 +175,6 @@ class CloudRedisClusterTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.cc index d68ce5d4a0bf9..5b49931096e1a 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace redis_cluster_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudRedisClusterTracingStub::CloudRedisClusterTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -408,15 +406,9 @@ future CloudRedisClusterTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudRedisClusterTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.h index f2a9c059b17a0..ee69801f53716 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace redis_cluster_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudRedisClusterTracingStub : public CloudRedisClusterStub { public: ~CloudRedisClusterTracingStub() override = default; @@ -204,8 +202,6 @@ class CloudRedisClusterTracingStub : public CloudRedisClusterStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/redis/quickstart/.bazelrc b/google/cloud/redis/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/redis/quickstart/.bazelrc +++ b/google/cloud/redis/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/redis/v1/cloud_redis_client.h b/google/cloud/redis/v1/cloud_redis_client.h index 7776fed61becf..956bcc79c7ea8 100644 --- a/google/cloud/redis/v1/cloud_redis_client.h +++ b/google/cloud/redis/v1/cloud_redis_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/v1/cloud_redis_connection.h b/google/cloud/redis/v1/cloud_redis_connection.h index 676915799b9d6..00bd5da0e4353 100644 --- a/google/cloud/redis/v1/cloud_redis_connection.h +++ b/google/cloud/redis/v1/cloud_redis_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_V1_CLOUD_REDIS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_V1_CLOUD_REDIS_CONNECTION_H +#include "google/cloud/redis/v1/cloud_redis.pb.h" #include "google/cloud/redis/v1/cloud_redis_connection_idempotency_policy.h" #include "google/cloud/redis/v1/internal/cloud_redis_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/redis/v1/cloud_redis_connection_idempotency_policy.h b/google/cloud/redis/v1/cloud_redis_connection_idempotency_policy.h index 3ac71638a3160..6233f32329048 100644 --- a/google/cloud/redis/v1/cloud_redis_connection_idempotency_policy.h +++ b/google/cloud/redis/v1/cloud_redis_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_V1_CLOUD_REDIS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_V1_CLOUD_REDIS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/redis/v1/cloud_redis.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.cc b/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.cc index 6602bd179613d..ca7ea6d2363f7 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/redis/v1/cloud_redis.proto #include "google/cloud/redis/v1/internal/cloud_redis_auth_decorator.h" -#include +#include "google/cloud/redis/v1/cloud_redis.grpc.pb.h" #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.h b/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.h index 5c43a28fee550..cce94e1f92977 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.h +++ b/google/cloud/redis/v1/internal/cloud_redis_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/redis/v1/internal/cloud_redis_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_connection_impl.h b/google/cloud/redis/v1/internal/cloud_redis_connection_impl.h index 9e56f167972e9..94b9fe7cedbfc 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_connection_impl.h +++ b/google/cloud/redis/v1/internal/cloud_redis_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.cc b/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.cc index 191af4d971bf6..11afefde8ff5d 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/redis/v1/cloud_redis.proto #include "google/cloud/redis/v1/internal/cloud_redis_logging_decorator.h" +#include "google/cloud/redis/v1/cloud_redis.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.h b/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.h index a7aac7138cd17..300a33fd24d47 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.h +++ b/google/cloud/redis/v1/internal/cloud_redis_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/redis/v1/internal/cloud_redis_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.cc b/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.cc index 2a3ac2c4778c4..cb63fda56b8f5 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/redis/v1/cloud_redis.proto #include "google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.h" +#include "google/cloud/redis/v1/cloud_redis.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 #include #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.h b/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.h index 7efd524661b56..5eb511341a857 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.h +++ b/google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/redis/v1/internal/cloud_redis_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_stub.cc b/google/cloud/redis/v1/internal/cloud_redis_stub.cc index 39cac7c9226d4..7fd07acada40f 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_stub.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/redis/v1/cloud_redis.proto #include "google/cloud/redis/v1/internal/cloud_redis_stub.h" +#include "google/cloud/redis/v1/cloud_redis.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_stub.h b/google/cloud/redis/v1/internal/cloud_redis_stub.h index 4351f890bc08a..994b6a61b8d04 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_stub.h +++ b/google/cloud/redis/v1/internal/cloud_redis_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_V1_INTERNAL_CLOUD_REDIS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_V1_INTERNAL_CLOUD_REDIS_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/redis/v1/cloud_redis.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc b/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc index 8bce0fd9b72c3..327c232a3e4fd 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/redis/v1/cloud_redis.proto #include "google/cloud/redis/v1/internal/cloud_redis_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/redis/v1/cloud_redis.grpc.pb.h" #include "google/cloud/redis/v1/internal/cloud_redis_auth_decorator.h" #include "google/cloud/redis/v1/internal/cloud_redis_logging_decorator.h" #include "google/cloud/redis/v1/internal/cloud_redis_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc b/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc index 4c5a16635d081..398d188948992 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace redis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudRedisTracingConnection::CloudRedisTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -351,15 +349,11 @@ Status CloudRedisTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudRedisTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.h b/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.h index 8270f67fda3db..c3262cc94fb9c 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.h +++ b/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace redis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudRedisTracingConnection : public redis_v1::CloudRedisConnection { public: ~CloudRedisTracingConnection() override = default; @@ -155,8 +153,6 @@ class CloudRedisTracingConnection : public redis_v1::CloudRedisConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc b/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc index 5eebe7d14adae..2b00bb007e574 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace redis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudRedisTracingStub::CloudRedisTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -373,15 +371,9 @@ future CloudRedisTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudRedisTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.h b/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.h index c964996da585c..0dfbe1909f2bb 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.h +++ b/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace redis_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudRedisTracingStub : public CloudRedisStub { public: ~CloudRedisTracingStub() override = default; @@ -177,8 +175,6 @@ class CloudRedisTracingStub : public CloudRedisStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/BUILD.bazel b/google/cloud/resourcemanager/BUILD.bazel index 34610e2590d23..ef635838e1f5a 100644 --- a/google/cloud/resourcemanager/BUILD.bazel +++ b/google/cloud/resourcemanager/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/resourcemanager/v3:resourcemanager_cc_grpc", + "@googleapis//google/cloud/resourcemanager/v3:resourcemanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/resourcemanager/quickstart/.bazelrc b/google/cloud/resourcemanager/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/resourcemanager/quickstart/.bazelrc +++ b/google/cloud/resourcemanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/resourcemanager/v3/folders_client.h b/google/cloud/resourcemanager/v3/folders_client.h index f6358bb22ad90..4436f4e3efd87 100644 --- a/google/cloud/resourcemanager/v3/folders_client.h +++ b/google/cloud/resourcemanager/v3/folders_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/folders_connection.h b/google/cloud/resourcemanager/v3/folders_connection.h index 92ede61d9d579..5368099904696 100644 --- a/google/cloud/resourcemanager/v3/folders_connection.h +++ b/google/cloud/resourcemanager/v3/folders_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_FOLDERS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_FOLDERS_CONNECTION_H +#include "google/cloud/resourcemanager/v3/folders.pb.h" #include "google/cloud/resourcemanager/v3/folders_connection_idempotency_policy.h" #include "google/cloud/resourcemanager/v3/internal/folders_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/folders_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/folders_connection_idempotency_policy.h index 84a39dc875953..219ac32a1fa45 100644 --- a/google/cloud/resourcemanager/v3/folders_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/folders_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_FOLDERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_FOLDERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/folders.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.cc index 63dc10aa1c845..3a25ed2521fe0 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/folders.proto #include "google/cloud/resourcemanager/v3/internal/folders_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/folders.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.h b/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.h index e4e8977805930..b2867b79c3a75 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/folders_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/folders_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_connection_impl.h b/google/cloud/resourcemanager/v3/internal/folders_connection_impl.h index c6d5b0214daa5..f24b7e2cc53f9 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_connection_impl.h +++ b/google/cloud/resourcemanager/v3/internal/folders_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.cc index ae121d3920960..9787f14db533f 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/folders.proto #include "google/cloud/resourcemanager/v3/internal/folders_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/folders.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.h b/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.h index 08e25fe17da5d..0bcf2202151b5 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/folders_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/folders_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.cc index c05b59178cd47..df3ad46264f91 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/folders.proto #include "google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/folders.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.h b/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.h index 8efb23c4b19ce..958510ee18302 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/folders_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_stub.cc b/google/cloud/resourcemanager/v3/internal/folders_stub.cc index e5ce59e3e02b7..0e07f791afcf8 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/resourcemanager/v3/folders.proto #include "google/cloud/resourcemanager/v3/internal/folders_stub.h" +#include "google/cloud/resourcemanager/v3/folders.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_stub.h b/google/cloud/resourcemanager/v3/internal/folders_stub.h index c06951c64cdfa..25aaf3335e116 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_stub.h +++ b/google/cloud/resourcemanager/v3/internal/folders_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_FOLDERS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_FOLDERS_STUB_H +#include "google/cloud/resourcemanager/v3/folders.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc index cda814a4582fc..809cf65e01125 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/resourcemanager/v3/folders.proto #include "google/cloud/resourcemanager/v3/internal/folders_stub_factory.h" +#include "google/cloud/resourcemanager/v3/folders.grpc.pb.h" #include "google/cloud/resourcemanager/v3/internal/folders_auth_decorator.h" #include "google/cloud/resourcemanager/v3/internal/folders_logging_decorator.h" #include "google/cloud/resourcemanager/v3/internal/folders_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc index 4f13f6895b45a..a067235b97ae7 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FoldersTracingConnection::FoldersTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -236,16 +234,12 @@ StatusOr FoldersTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFoldersTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.h index 61b0e244e5087..5dd9fc215accc 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FoldersTracingConnection : public resourcemanager_v3::FoldersConnection { public: ~FoldersTracingConnection() override = default; @@ -126,8 +124,6 @@ class FoldersTracingConnection : public resourcemanager_v3::FoldersConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc index 69a4d46c819d5..eaf3ddee4c63d 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - FoldersTracingStub::FoldersTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -266,15 +264,9 @@ future FoldersTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeFoldersTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.h index aa4cc570895cf..7f672b358c18d 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class FoldersTracingStub : public FoldersStub { public: ~FoldersTracingStub() override = default; @@ -147,8 +145,6 @@ class FoldersTracingStub : public FoldersStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/internal/organizations_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/organizations_auth_decorator.cc index 18b99ce1a2208..82e955374a27c 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/organizations.proto #include "google/cloud/resourcemanager/v3/internal/organizations_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/organizations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/organizations_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/organizations_logging_decorator.cc index 2ce6b02171bd2..e30d4a27f676c 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/organizations.proto #include "google/cloud/resourcemanager/v3/internal/organizations_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/organizations.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/organizations_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/organizations_metadata_decorator.cc index 01b2497015f4d..66441c5341b3c 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/organizations.proto #include "google/cloud/resourcemanager/v3/internal/organizations_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/organizations.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/organizations_stub.cc b/google/cloud/resourcemanager/v3/internal/organizations_stub.cc index c5e73b86f84d6..36e4e923a4b36 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/organizations.proto #include "google/cloud/resourcemanager/v3/internal/organizations_stub.h" +#include "google/cloud/resourcemanager/v3/organizations.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/organizations_stub.h b/google/cloud/resourcemanager/v3/internal/organizations_stub.h index ba0b7cbeb4bfa..12042b476cc10 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_stub.h +++ b/google/cloud/resourcemanager/v3/internal/organizations_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_ORGANIZATIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_ORGANIZATIONS_STUB_H +#include "google/cloud/resourcemanager/v3/organizations.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/organizations_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/organizations_stub_factory.cc index 062d3d2590114..e2057ea64fa29 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/resourcemanager/v3/internal/organizations_metadata_decorator.h" #include "google/cloud/resourcemanager/v3/internal/organizations_stub.h" #include "google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.h" +#include "google/cloud/resourcemanager/v3/organizations.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc index 9ca76ab23ece1..5b95af10b8959 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OrganizationsTracingConnection::OrganizationsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -88,16 +86,12 @@ OrganizationsTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOrganizationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.h index 559077384ea46..29f9b377e8b6d 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OrganizationsTracingConnection : public resourcemanager_v3::OrganizationsConnection { public: @@ -65,8 +63,6 @@ class OrganizationsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.cc index 7ad7b426eb215..7121058168b93 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - OrganizationsTracingStub::OrganizationsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -102,15 +100,9 @@ StatusOr OrganizationsTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeOrganizationsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.h index 79e14da9ad2c6..308979c3271c6 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/organizations_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class OrganizationsTracingStub : public OrganizationsStub { public: ~OrganizationsTracingStub() override = default; @@ -71,8 +69,6 @@ class OrganizationsTracingStub : public OrganizationsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.cc index 015a0fd398569..ea99b188020ae 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/projects.proto #include "google/cloud/resourcemanager/v3/internal/projects_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/projects.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.h b/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.h index 21f71db62adce..5873e6bbe3866 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/projects_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/projects_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_connection_impl.h b/google/cloud/resourcemanager/v3/internal/projects_connection_impl.h index 945fcdee8f3ca..1c7dfe1197dec 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_connection_impl.h +++ b/google/cloud/resourcemanager/v3/internal/projects_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.cc index 02510fa6e5c75..5ee759243f656 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/projects.proto #include "google/cloud/resourcemanager/v3/internal/projects_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/projects.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.h b/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.h index 75d597b196952..490cee5bfbc1a 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/projects_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/projects_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.cc index b549fa6e1f334..adf96fb24a521 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/projects.proto #include "google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/projects.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.h b/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.h index 19aae741fc9fd..af9a0546692bf 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/projects_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_stub.cc b/google/cloud/resourcemanager/v3/internal/projects_stub.cc index de86e7e7e1692..916a6d9bff287 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/resourcemanager/v3/projects.proto #include "google/cloud/resourcemanager/v3/internal/projects_stub.h" +#include "google/cloud/resourcemanager/v3/projects.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_stub.h b/google/cloud/resourcemanager/v3/internal/projects_stub.h index 2c0c04dc43ba2..d86e9f356dab8 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_stub.h +++ b/google/cloud/resourcemanager/v3/internal/projects_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_PROJECTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_PROJECTS_STUB_H +#include "google/cloud/resourcemanager/v3/projects.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc index e3a2079753c1f..fa66ddd43be91 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/resourcemanager/v3/internal/projects_metadata_decorator.h" #include "google/cloud/resourcemanager/v3/internal/projects_stub.h" #include "google/cloud/resourcemanager/v3/internal/projects_tracing_stub.h" +#include "google/cloud/resourcemanager/v3/projects.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc index ee4decb00d415..888a9eed77c4a 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProjectsTracingConnection::ProjectsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -240,16 +238,12 @@ ProjectsTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProjectsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.h index 9269e2b1b9c5b..78895ee0838ac 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProjectsTracingConnection : public resourcemanager_v3::ProjectsConnection { public: @@ -127,8 +125,6 @@ class ProjectsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc index eb278c5b538a2..734f5e167d5ef 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProjectsTracingStub::ProjectsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -266,15 +264,9 @@ future ProjectsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProjectsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.h index d30093af14c3a..cfc8db63939bf 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProjectsTracingStub : public ProjectsStub { public: ~ProjectsTracingStub() override = default; @@ -148,8 +146,6 @@ class ProjectsTracingStub : public ProjectsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.cc index e91ab6fc7871d..21da0ed08bce9 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/tag_bindings.proto #include "google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/tag_bindings.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.h index f146c10a8499a..4a20089d6e2ae 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_connection_impl.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_connection_impl.h index 786298f857087..50019543d18dc 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_connection_impl.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.cc index a753b51839475..dbdca1f4d0907 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/tag_bindings.proto #include "google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_bindings.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.h index 9f1be453c45d2..91d06aa896fa5 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.cc index e604b67578ad9..1dbaf5485eeab 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/tag_bindings.proto #include "google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_bindings.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.h index b2d1f954ef8e9..1cdaf38d308aa 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc index f93a2fc8fd63a..38f7f9fd69f2c 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/resourcemanager/v3/tag_bindings.proto #include "google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h" +#include "google/cloud/resourcemanager/v3/tag_bindings.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h index 74a8a9aee2c11..06b1e79410d26 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_BINDINGS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_BINDINGS_STUB_H +#include "google/cloud/resourcemanager/v3/tag_bindings.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc index d8eb627229b98..b90d6857c496d 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/resourcemanager/v3/internal/tag_bindings_metadata_decorator.h" #include "google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h" #include "google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.h" +#include "google/cloud/resourcemanager/v3/tag_bindings.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc index 35661217c0f7a..fe6eff8f75731 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagBindingsTracingConnection::TagBindingsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -130,16 +128,12 @@ TagBindingsTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagBindingsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.h index b78993bfe4b4c..f3d7ba5095408 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagBindingsTracingConnection : public resourcemanager_v3::TagBindingsConnection { public: @@ -81,8 +79,6 @@ class TagBindingsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc index 6911838dd830f..c165ca4208427 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagBindingsTracingStub::TagBindingsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -154,15 +152,9 @@ future TagBindingsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagBindingsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.h index 0d2b5dbdf8e36..3d4a0665cab3e 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagBindingsTracingStub : public TagBindingsStub { public: ~TagBindingsTracingStub() override = default; @@ -96,8 +94,6 @@ class TagBindingsTracingStub : public TagBindingsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.cc index a3db0f70d7b3d..50f52d756e1ea 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/tag_holds.proto #include "google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/tag_holds.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.h index 9f84d729c5202..d46abeb7c3735 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_holds_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_connection_impl.h b/google/cloud/resourcemanager/v3/internal/tag_holds_connection_impl.h index 44f6ebdb9a222..150a4c78736ee 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_connection_impl.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.cc index 7a856bd9ad6a8..4294a898760dd 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/tag_holds.proto #include "google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_holds.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.h index b85d86a325324..68548d230bce8 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_holds_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.cc index ed391988d002b..a9b180fe3a58f 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/tag_holds.proto #include "google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_holds.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.h index 45b426c90b5b0..6e16be6fe356c 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_holds_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc index e737b5b1aa48c..23464f343272a 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/resourcemanager/v3/tag_holds.proto #include "google/cloud/resourcemanager/v3/internal/tag_holds_stub.h" +#include "google/cloud/resourcemanager/v3/tag_holds.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h index e95286d3fc407..538a4525806cb 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_HOLDS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_HOLDS_STUB_H +#include "google/cloud/resourcemanager/v3/tag_holds.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc index e337c837a09e8..65a52eadffc99 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/resourcemanager/v3/internal/tag_holds_metadata_decorator.h" #include "google/cloud/resourcemanager/v3/internal/tag_holds_stub.h" #include "google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.h" +#include "google/cloud/resourcemanager/v3/tag_holds.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc index 7712c9dd2a6cf..6cf2e944e2f6d 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagHoldsTracingConnection::TagHoldsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -110,16 +108,12 @@ TagHoldsTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagHoldsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.h index 4485de39ff377..71a62dcd23852 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagHoldsTracingConnection : public resourcemanager_v3::TagHoldsConnection { public: @@ -74,8 +72,6 @@ class TagHoldsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc index 0a590f2805da6..a9cace88691d2 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagHoldsTracingStub::TagHoldsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -132,15 +130,9 @@ future TagHoldsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagHoldsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.h index 7b43a9b0147c6..d6cb57a28b292 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagHoldsTracingStub : public TagHoldsStub { public: ~TagHoldsTracingStub() override = default; @@ -89,8 +87,6 @@ class TagHoldsTracingStub : public TagHoldsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.cc index fae3364235f90..6a577308fe548 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/tag_keys.proto #include "google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/tag_keys.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.h index 5179f8b3c1a24..14535d3831ce5 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_keys_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_connection_impl.h b/google/cloud/resourcemanager/v3/internal/tag_keys_connection_impl.h index e27ba357012bd..516bbde8f34fa 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_connection_impl.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.cc index 529f22f4fed9e..db2865d1a6928 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/tag_keys.proto #include "google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_keys.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.h index 38fefd78473fb..9026382e5c6be 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_keys_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.cc index 220c2cb9d4c98..af0b055ff9e02 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/tag_keys.proto #include "google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_keys.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.h index 8dbefce59b10b..18a6465d24e8b 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_keys_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc index 7d5c5340e4dc7..eeb0a03703ab3 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/resourcemanager/v3/tag_keys.proto #include "google/cloud/resourcemanager/v3/internal/tag_keys_stub.h" +#include "google/cloud/resourcemanager/v3/tag_keys.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h index 550cb7d3ad372..397f7b1c782e5 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_KEYS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_KEYS_STUB_H +#include "google/cloud/resourcemanager/v3/tag_keys.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc index 68a9d77e2306c..aedb893b205d5 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/resourcemanager/v3/internal/tag_keys_metadata_decorator.h" #include "google/cloud/resourcemanager/v3/internal/tag_keys_stub.h" #include "google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.h" +#include "google/cloud/resourcemanager/v3/tag_keys.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc index a9ad61dd32669..ce56ae8956735 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagKeysTracingConnection::TagKeysTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -178,16 +176,12 @@ StatusOr TagKeysTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagKeysTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.h index ad0c93454f6e8..6271420ace55d 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagKeysTracingConnection : public resourcemanager_v3::TagKeysConnection { public: ~TagKeysTracingConnection() override = default; @@ -102,8 +100,6 @@ class TagKeysTracingConnection : public resourcemanager_v3::TagKeysConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc index 837efae9e26c9..4859af7348346 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagKeysTracingStub::TagKeysTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -216,15 +214,9 @@ future TagKeysTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagKeysTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.h index c74c3b0ba351c..f86f030b9e2fe 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagKeysTracingStub : public TagKeysStub { public: ~TagKeysTracingStub() override = default; @@ -123,8 +121,6 @@ class TagKeysTracingStub : public TagKeysStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.cc index b4cfe228b197a..4ed66abbfa295 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/resourcemanager/v3/tag_values.proto #include "google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.h" -#include +#include "google/cloud/resourcemanager/v3/tag_values.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.h index 4b278fbe24ded..6481c2b452dfc 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_values_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_connection_impl.h b/google/cloud/resourcemanager/v3/internal/tag_values_connection_impl.h index 06581bde0b29e..a1e719c398e6b 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_connection_impl.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.cc index 044c0af2cc0ca..6a45e60169377 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/resourcemanager/v3/tag_values.proto #include "google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_values.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.h index f16fcf0db7e79..7b596b0ff92a0 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_values_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.cc b/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.cc index 2b59196d5934e..26964aacde24a 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/resourcemanager/v3/tag_values.proto #include "google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.h" +#include "google/cloud/resourcemanager/v3/tag_values.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 #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.h b/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.h index ff7334169b932..8f621e6685803 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/resourcemanager/v3/internal/tag_values_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc index 0c4f284bb2ede..7d70ec6edd541 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/resourcemanager/v3/tag_values.proto #include "google/cloud/resourcemanager/v3/internal/tag_values_stub.h" +#include "google/cloud/resourcemanager/v3/tag_values.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_stub.h b/google/cloud/resourcemanager/v3/internal/tag_values_stub.h index 13c978c154085..e2ab522aad87e 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_VALUES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_INTERNAL_TAG_VALUES_STUB_H +#include "google/cloud/resourcemanager/v3/tag_values.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc index 59d039c5d16ab..39fc24f1efa95 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/resourcemanager/v3/internal/tag_values_metadata_decorator.h" #include "google/cloud/resourcemanager/v3/internal/tag_values_stub.h" #include "google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.h" +#include "google/cloud/resourcemanager/v3/tag_values.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc index cc20472b63299..c96bcda8a4c1e 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagValuesTracingConnection::TagValuesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -185,16 +183,12 @@ TagValuesTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagValuesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.h b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.h index 53bc2779c17a3..68b1b92a63d94 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagValuesTracingConnection : public resourcemanager_v3::TagValuesConnection { public: @@ -104,8 +102,6 @@ class TagValuesTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc index 6d4ef6b6a9037..3eb033749f764 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TagValuesTracingStub::TagValuesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -219,15 +217,9 @@ future TagValuesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTagValuesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.h b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.h index e02a3bcf0ac63..18aa826bcbc6f 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace resourcemanager_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TagValuesTracingStub : public TagValuesStub { public: ~TagValuesTracingStub() override = default; @@ -123,8 +121,6 @@ class TagValuesTracingStub : public TagValuesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/resourcemanager/v3/organizations_connection.h b/google/cloud/resourcemanager/v3/organizations_connection.h index a4c93743610a8..51dbe07a01c66 100644 --- a/google/cloud/resourcemanager/v3/organizations_connection.h +++ b/google/cloud/resourcemanager/v3/organizations_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_ORGANIZATIONS_CONNECTION_H #include "google/cloud/resourcemanager/v3/internal/organizations_retry_traits.h" +#include "google/cloud/resourcemanager/v3/organizations.pb.h" #include "google/cloud/resourcemanager/v3/organizations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/resourcemanager/v3/organizations_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/organizations_connection_idempotency_policy.h index 291d35217cf59..b6612e0ec6eec 100644 --- a/google/cloud/resourcemanager/v3/organizations_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/organizations_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_ORGANIZATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_ORGANIZATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/organizations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/projects_client.h b/google/cloud/resourcemanager/v3/projects_client.h index 1c5e6470389c1..a8a26af3ae247 100644 --- a/google/cloud/resourcemanager/v3/projects_client.h +++ b/google/cloud/resourcemanager/v3/projects_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/projects_connection.h b/google/cloud/resourcemanager/v3/projects_connection.h index 9a67a0467220f..3d2e222e455c0 100644 --- a/google/cloud/resourcemanager/v3/projects_connection.h +++ b/google/cloud/resourcemanager/v3/projects_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_PROJECTS_CONNECTION_H #include "google/cloud/resourcemanager/v3/internal/projects_retry_traits.h" +#include "google/cloud/resourcemanager/v3/projects.pb.h" #include "google/cloud/resourcemanager/v3/projects_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/projects_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/projects_connection_idempotency_policy.h index 0ac4b06c7d67d..e3e2791224510 100644 --- a/google/cloud/resourcemanager/v3/projects_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/projects_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/projects.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/tag_bindings_client.h b/google/cloud/resourcemanager/v3/tag_bindings_client.h index d7b1656c417b1..c1f875e356551 100644 --- a/google/cloud/resourcemanager/v3/tag_bindings_client.h +++ b/google/cloud/resourcemanager/v3/tag_bindings_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_bindings_connection.h b/google/cloud/resourcemanager/v3/tag_bindings_connection.h index 123c51f5ca76f..99d53b86f1420 100644 --- a/google/cloud/resourcemanager/v3/tag_bindings_connection.h +++ b/google/cloud/resourcemanager/v3/tag_bindings_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_BINDINGS_CONNECTION_H #include "google/cloud/resourcemanager/v3/internal/tag_bindings_retry_traits.h" +#include "google/cloud/resourcemanager/v3/tag_bindings.pb.h" #include "google/cloud/resourcemanager/v3/tag_bindings_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_bindings_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/tag_bindings_connection_idempotency_policy.h index 08b3c50fe5f24..30db957ec7988 100644 --- a/google/cloud/resourcemanager/v3/tag_bindings_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/tag_bindings_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_BINDINGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_BINDINGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/tag_bindings.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/tag_holds_client.h b/google/cloud/resourcemanager/v3/tag_holds_client.h index e3fe6251b4624..022cbfc381afd 100644 --- a/google/cloud/resourcemanager/v3/tag_holds_client.h +++ b/google/cloud/resourcemanager/v3/tag_holds_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_holds_connection.h b/google/cloud/resourcemanager/v3/tag_holds_connection.h index c9ef69a2feba1..98943d28aee55 100644 --- a/google/cloud/resourcemanager/v3/tag_holds_connection.h +++ b/google/cloud/resourcemanager/v3/tag_holds_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_HOLDS_CONNECTION_H #include "google/cloud/resourcemanager/v3/internal/tag_holds_retry_traits.h" +#include "google/cloud/resourcemanager/v3/tag_holds.pb.h" #include "google/cloud/resourcemanager/v3/tag_holds_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_holds_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/tag_holds_connection_idempotency_policy.h index fafa0875801a4..31e39c2e6f2a7 100644 --- a/google/cloud/resourcemanager/v3/tag_holds_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/tag_holds_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_HOLDS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_HOLDS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/tag_holds.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/tag_keys_client.h b/google/cloud/resourcemanager/v3/tag_keys_client.h index 97ca149b0ede1..20eaf2d84b3ac 100644 --- a/google/cloud/resourcemanager/v3/tag_keys_client.h +++ b/google/cloud/resourcemanager/v3/tag_keys_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/resourcemanager/v3/tag_keys_connection.h b/google/cloud/resourcemanager/v3/tag_keys_connection.h index 66325751689a5..67df67e239439 100644 --- a/google/cloud/resourcemanager/v3/tag_keys_connection.h +++ b/google/cloud/resourcemanager/v3/tag_keys_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_KEYS_CONNECTION_H #include "google/cloud/resourcemanager/v3/internal/tag_keys_retry_traits.h" +#include "google/cloud/resourcemanager/v3/tag_keys.pb.h" #include "google/cloud/resourcemanager/v3/tag_keys_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_keys_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/tag_keys_connection_idempotency_policy.h index 846bd5a5b766e..ffa1762198835 100644 --- a/google/cloud/resourcemanager/v3/tag_keys_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/tag_keys_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_KEYS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_KEYS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/tag_keys.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/resourcemanager/v3/tag_values_client.h b/google/cloud/resourcemanager/v3/tag_values_client.h index 4b2d5ab5cc8b6..408551f49cbdf 100644 --- a/google/cloud/resourcemanager/v3/tag_values_client.h +++ b/google/cloud/resourcemanager/v3/tag_values_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_values_connection.h b/google/cloud/resourcemanager/v3/tag_values_connection.h index f278e87acef8a..48e3064cd450b 100644 --- a/google/cloud/resourcemanager/v3/tag_values_connection.h +++ b/google/cloud/resourcemanager/v3/tag_values_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_VALUES_CONNECTION_H #include "google/cloud/resourcemanager/v3/internal/tag_values_retry_traits.h" +#include "google/cloud/resourcemanager/v3/tag_values.pb.h" #include "google/cloud/resourcemanager/v3/tag_values_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/resourcemanager/v3/tag_values_connection_idempotency_policy.h b/google/cloud/resourcemanager/v3/tag_values_connection_idempotency_policy.h index d2dddbd791db3..7b94014527264 100644 --- a/google/cloud/resourcemanager/v3/tag_values_connection_idempotency_policy.h +++ b/google/cloud/resourcemanager/v3/tag_values_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_VALUES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_V3_TAG_VALUES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/resourcemanager/v3/tag_values.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/BUILD.bazel b/google/cloud/retail/BUILD.bazel index 4481503e6194b..973720a2cddb1 100644 --- a/google/cloud/retail/BUILD.bazel +++ b/google/cloud/retail/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/retail/v2:retail_cc_grpc", + "@googleapis//google/cloud/retail/v2:retail_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/retail/quickstart/.bazelrc b/google/cloud/retail/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/retail/quickstart/.bazelrc +++ b/google/cloud/retail/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/retail/v2/analytics_client.h b/google/cloud/retail/v2/analytics_client.h index e6ce1baa3c308..dc505aad2f641 100644 --- a/google/cloud/retail/v2/analytics_client.h +++ b/google/cloud/retail/v2/analytics_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/analytics_connection.h b/google/cloud/retail/v2/analytics_connection.h index fee17c818d48b..15fc22d33ae10 100644 --- a/google/cloud/retail/v2/analytics_connection.h +++ b/google/cloud/retail/v2/analytics_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_ANALYTICS_CONNECTION_H #include "google/cloud/retail/v2/analytics_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/analytics_service.pb.h" #include "google/cloud/retail/v2/internal/analytics_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/analytics_connection_idempotency_policy.h b/google/cloud/retail/v2/analytics_connection_idempotency_policy.h index a420c94f3564f..67b9d40f542b2 100644 --- a/google/cloud/retail/v2/analytics_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/analytics_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_ANALYTICS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_ANALYTICS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/analytics_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/catalog_connection.h b/google/cloud/retail/v2/catalog_connection.h index 51c75582b4a55..36e9a4db20ff0 100644 --- a/google/cloud/retail/v2/catalog_connection.h +++ b/google/cloud/retail/v2/catalog_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_CATALOG_CONNECTION_H #include "google/cloud/retail/v2/catalog_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/catalog_service.pb.h" #include "google/cloud/retail/v2/internal/catalog_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/retail/v2/catalog_connection_idempotency_policy.h b/google/cloud/retail/v2/catalog_connection_idempotency_policy.h index 295c6e92280d3..7659ee52a8cba 100644 --- a/google/cloud/retail/v2/catalog_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/catalog_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/catalog_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/completion_client.h b/google/cloud/retail/v2/completion_client.h index a394fc0859cae..2c6f528cc669b 100644 --- a/google/cloud/retail/v2/completion_client.h +++ b/google/cloud/retail/v2/completion_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/completion_connection.h b/google/cloud/retail/v2/completion_connection.h index db49b011ba7f5..3648f70fac1c2 100644 --- a/google/cloud/retail/v2/completion_connection.h +++ b/google/cloud/retail/v2/completion_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_COMPLETION_CONNECTION_H #include "google/cloud/retail/v2/completion_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/completion_service.pb.h" #include "google/cloud/retail/v2/internal/completion_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/completion_connection_idempotency_policy.h b/google/cloud/retail/v2/completion_connection_idempotency_policy.h index 9ee3c7bb3c1c8..c9a50544ba521 100644 --- a/google/cloud/retail/v2/completion_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/completion_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/completion_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/control_connection.h b/google/cloud/retail/v2/control_connection.h index 408ab00ae2890..67f911ca9836a 100644 --- a/google/cloud/retail/v2/control_connection.h +++ b/google/cloud/retail/v2/control_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_CONTROL_CONNECTION_H #include "google/cloud/retail/v2/control_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/control_service.pb.h" #include "google/cloud/retail/v2/internal/control_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/retail/v2/control_connection_idempotency_policy.h b/google/cloud/retail/v2/control_connection_idempotency_policy.h index cb21b38dfbcd6..688e5df861aea 100644 --- a/google/cloud/retail/v2/control_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/control_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_CONTROL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/control_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/internal/analytics_auth_decorator.cc b/google/cloud/retail/v2/internal/analytics_auth_decorator.cc index affe81b6306de..b6ab6f04a0a4c 100644 --- a/google/cloud/retail/v2/internal/analytics_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/analytics_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/analytics_service.proto #include "google/cloud/retail/v2/internal/analytics_auth_decorator.h" -#include +#include "google/cloud/retail/v2/analytics_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/analytics_auth_decorator.h b/google/cloud/retail/v2/internal/analytics_auth_decorator.h index 5a61f87e588ac..aa5b78c7ee336 100644 --- a/google/cloud/retail/v2/internal/analytics_auth_decorator.h +++ b/google/cloud/retail/v2/internal/analytics_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/analytics_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/analytics_connection_impl.h b/google/cloud/retail/v2/internal/analytics_connection_impl.h index f3850cfe54dd9..e926221368841 100644 --- a/google/cloud/retail/v2/internal/analytics_connection_impl.h +++ b/google/cloud/retail/v2/internal/analytics_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/internal/analytics_logging_decorator.cc b/google/cloud/retail/v2/internal/analytics_logging_decorator.cc index b274ef35a799e..5d461005f580f 100644 --- a/google/cloud/retail/v2/internal/analytics_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/analytics_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/analytics_service.proto #include "google/cloud/retail/v2/internal/analytics_logging_decorator.h" +#include "google/cloud/retail/v2/analytics_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/analytics_logging_decorator.h b/google/cloud/retail/v2/internal/analytics_logging_decorator.h index f7001030afce7..945d6f60b29b9 100644 --- a/google/cloud/retail/v2/internal/analytics_logging_decorator.h +++ b/google/cloud/retail/v2/internal/analytics_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/analytics_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/analytics_metadata_decorator.cc b/google/cloud/retail/v2/internal/analytics_metadata_decorator.cc index f1dc53d7869af..d59ee2cd86697 100644 --- a/google/cloud/retail/v2/internal/analytics_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/analytics_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/analytics_service.proto #include "google/cloud/retail/v2/internal/analytics_metadata_decorator.h" +#include "google/cloud/retail/v2/analytics_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/analytics_metadata_decorator.h b/google/cloud/retail/v2/internal/analytics_metadata_decorator.h index 957be1ccee40a..3272e6547c09b 100644 --- a/google/cloud/retail/v2/internal/analytics_metadata_decorator.h +++ b/google/cloud/retail/v2/internal/analytics_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/analytics_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/analytics_stub.cc b/google/cloud/retail/v2/internal/analytics_stub.cc index ad221c04ccd5a..0918f80c955ec 100644 --- a/google/cloud/retail/v2/internal/analytics_stub.cc +++ b/google/cloud/retail/v2/internal/analytics_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/retail/v2/analytics_service.proto #include "google/cloud/retail/v2/internal/analytics_stub.h" +#include "google/cloud/retail/v2/analytics_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/analytics_stub.h b/google/cloud/retail/v2/internal/analytics_stub.h index bec22474520f2..cbc19f3e3f802 100644 --- a/google/cloud/retail/v2/internal/analytics_stub.h +++ b/google/cloud/retail/v2/internal/analytics_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_ANALYTICS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_ANALYTICS_STUB_H +#include "google/cloud/retail/v2/analytics_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/analytics_stub_factory.cc b/google/cloud/retail/v2/internal/analytics_stub_factory.cc index 46354fa94cbc8..ee172cf599cce 100644 --- a/google/cloud/retail/v2/internal/analytics_stub_factory.cc +++ b/google/cloud/retail/v2/internal/analytics_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/retail/v2/analytics_service.proto #include "google/cloud/retail/v2/internal/analytics_stub_factory.h" +#include "google/cloud/retail/v2/analytics_service.grpc.pb.h" #include "google/cloud/retail/v2/internal/analytics_auth_decorator.h" #include "google/cloud/retail/v2/internal/analytics_logging_decorator.h" #include "google/cloud/retail/v2/internal/analytics_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/analytics_tracing_connection.cc b/google/cloud/retail/v2/internal/analytics_tracing_connection.cc index dec64c82d6df8..c4a3cfb8644e0 100644 --- a/google/cloud/retail/v2/internal/analytics_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/analytics_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AnalyticsServiceTracingConnection::AnalyticsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -84,16 +82,12 @@ AnalyticsServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAnalyticsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/analytics_tracing_connection.h b/google/cloud/retail/v2/internal/analytics_tracing_connection.h index 25afd8ecc8be8..f37c8acd1fc5e 100644 --- a/google/cloud/retail/v2/internal/analytics_tracing_connection.h +++ b/google/cloud/retail/v2/internal/analytics_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AnalyticsServiceTracingConnection : public retail_v2::AnalyticsServiceConnection { public: @@ -64,8 +62,6 @@ class AnalyticsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/analytics_tracing_stub.cc b/google/cloud/retail/v2/internal/analytics_tracing_stub.cc index cb90c10d665bc..f1cb34487f111 100644 --- a/google/cloud/retail/v2/internal/analytics_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/analytics_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AnalyticsServiceTracingStub::AnalyticsServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -112,15 +110,9 @@ future AnalyticsServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAnalyticsServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/analytics_tracing_stub.h b/google/cloud/retail/v2/internal/analytics_tracing_stub.h index ce09542c92e4e..9b25be7d334c8 100644 --- a/google/cloud/retail/v2/internal/analytics_tracing_stub.h +++ b/google/cloud/retail/v2/internal/analytics_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AnalyticsServiceTracingStub : public AnalyticsServiceStub { public: ~AnalyticsServiceTracingStub() override = default; @@ -77,8 +75,6 @@ class AnalyticsServiceTracingStub : public AnalyticsServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/catalog_auth_decorator.cc b/google/cloud/retail/v2/internal/catalog_auth_decorator.cc index 82278b51ca591..1851fe9237a9d 100644 --- a/google/cloud/retail/v2/internal/catalog_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/catalog_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/catalog_service.proto #include "google/cloud/retail/v2/internal/catalog_auth_decorator.h" -#include +#include "google/cloud/retail/v2/catalog_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/catalog_logging_decorator.cc b/google/cloud/retail/v2/internal/catalog_logging_decorator.cc index fecde1f404acb..2036f1e0ec6ad 100644 --- a/google/cloud/retail/v2/internal/catalog_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/catalog_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/catalog_service.proto #include "google/cloud/retail/v2/internal/catalog_logging_decorator.h" +#include "google/cloud/retail/v2/catalog_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/catalog_metadata_decorator.cc b/google/cloud/retail/v2/internal/catalog_metadata_decorator.cc index 084db8aac336c..1c15af3505af1 100644 --- a/google/cloud/retail/v2/internal/catalog_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/catalog_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/catalog_service.proto #include "google/cloud/retail/v2/internal/catalog_metadata_decorator.h" +#include "google/cloud/retail/v2/catalog_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/catalog_stub.cc b/google/cloud/retail/v2/internal/catalog_stub.cc index b8030e2e05e48..0b898ad98be7c 100644 --- a/google/cloud/retail/v2/internal/catalog_stub.cc +++ b/google/cloud/retail/v2/internal/catalog_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/catalog_service.proto #include "google/cloud/retail/v2/internal/catalog_stub.h" +#include "google/cloud/retail/v2/catalog_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/retail/v2/internal/catalog_stub.h b/google/cloud/retail/v2/internal/catalog_stub.h index 0ba78e1291eb3..7efbbb6c5cb3f 100644 --- a/google/cloud/retail/v2/internal/catalog_stub.h +++ b/google/cloud/retail/v2/internal/catalog_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_CATALOG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_CATALOG_STUB_H +#include "google/cloud/retail/v2/catalog_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/catalog_stub_factory.cc b/google/cloud/retail/v2/internal/catalog_stub_factory.cc index 677624939cdaa..0112b9c679615 100644 --- a/google/cloud/retail/v2/internal/catalog_stub_factory.cc +++ b/google/cloud/retail/v2/internal/catalog_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/retail/v2/catalog_service.proto #include "google/cloud/retail/v2/internal/catalog_stub_factory.h" +#include "google/cloud/retail/v2/catalog_service.grpc.pb.h" #include "google/cloud/retail/v2/internal/catalog_auth_decorator.h" #include "google/cloud/retail/v2/internal/catalog_logging_decorator.h" #include "google/cloud/retail/v2/internal/catalog_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/catalog_tracing_connection.cc b/google/cloud/retail/v2/internal/catalog_tracing_connection.cc index 07dc1422cd252..44a8095083883 100644 --- a/google/cloud/retail/v2/internal/catalog_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/catalog_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CatalogServiceTracingConnection::CatalogServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -153,16 +151,12 @@ CatalogServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCatalogServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/catalog_tracing_connection.h b/google/cloud/retail/v2/internal/catalog_tracing_connection.h index 982f949fe6601..547459393ae49 100644 --- a/google/cloud/retail/v2/internal/catalog_tracing_connection.h +++ b/google/cloud/retail/v2/internal/catalog_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CatalogServiceTracingConnection : public retail_v2::CatalogServiceConnection { public: @@ -92,8 +90,6 @@ class CatalogServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/catalog_tracing_stub.cc b/google/cloud/retail/v2/internal/catalog_tracing_stub.cc index d005340c6f377..dd10a49abd1b4 100644 --- a/google/cloud/retail/v2/internal/catalog_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/catalog_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CatalogServiceTracingStub::CatalogServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -191,15 +189,9 @@ CatalogServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCatalogServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/catalog_tracing_stub.h b/google/cloud/retail/v2/internal/catalog_tracing_stub.h index e363b4b63e6c9..bf97914447426 100644 --- a/google/cloud/retail/v2/internal/catalog_tracing_stub.h +++ b/google/cloud/retail/v2/internal/catalog_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CatalogServiceTracingStub : public CatalogServiceStub { public: ~CatalogServiceTracingStub() override = default; @@ -105,8 +103,6 @@ class CatalogServiceTracingStub : public CatalogServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/completion_auth_decorator.cc b/google/cloud/retail/v2/internal/completion_auth_decorator.cc index 7c3778a80f3f5..eb37196de39e9 100644 --- a/google/cloud/retail/v2/internal/completion_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/completion_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/completion_service.proto #include "google/cloud/retail/v2/internal/completion_auth_decorator.h" -#include +#include "google/cloud/retail/v2/completion_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/completion_auth_decorator.h b/google/cloud/retail/v2/internal/completion_auth_decorator.h index bc67fa4b66bbc..5caae1c019355 100644 --- a/google/cloud/retail/v2/internal/completion_auth_decorator.h +++ b/google/cloud/retail/v2/internal/completion_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/completion_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/completion_connection_impl.h b/google/cloud/retail/v2/internal/completion_connection_impl.h index 5a190253b6a02..bac2af3cbbfa3 100644 --- a/google/cloud/retail/v2/internal/completion_connection_impl.h +++ b/google/cloud/retail/v2/internal/completion_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/internal/completion_logging_decorator.cc b/google/cloud/retail/v2/internal/completion_logging_decorator.cc index d9c7ef9ab1739..e391509242432 100644 --- a/google/cloud/retail/v2/internal/completion_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/completion_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/completion_service.proto #include "google/cloud/retail/v2/internal/completion_logging_decorator.h" +#include "google/cloud/retail/v2/completion_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/completion_logging_decorator.h b/google/cloud/retail/v2/internal/completion_logging_decorator.h index 43d9ac70d97f9..3fbb05ffada63 100644 --- a/google/cloud/retail/v2/internal/completion_logging_decorator.h +++ b/google/cloud/retail/v2/internal/completion_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/completion_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/completion_metadata_decorator.cc b/google/cloud/retail/v2/internal/completion_metadata_decorator.cc index eeab54a998d29..5c0a94a6be5c8 100644 --- a/google/cloud/retail/v2/internal/completion_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/completion_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/completion_service.proto #include "google/cloud/retail/v2/internal/completion_metadata_decorator.h" +#include "google/cloud/retail/v2/completion_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/completion_metadata_decorator.h b/google/cloud/retail/v2/internal/completion_metadata_decorator.h index c1c35c0913cf5..b8aac274242b5 100644 --- a/google/cloud/retail/v2/internal/completion_metadata_decorator.h +++ b/google/cloud/retail/v2/internal/completion_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/completion_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/completion_stub.cc b/google/cloud/retail/v2/internal/completion_stub.cc index 1c93d2158a306..3caca6b22bcef 100644 --- a/google/cloud/retail/v2/internal/completion_stub.cc +++ b/google/cloud/retail/v2/internal/completion_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/retail/v2/completion_service.proto #include "google/cloud/retail/v2/internal/completion_stub.h" +#include "google/cloud/retail/v2/completion_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/completion_stub.h b/google/cloud/retail/v2/internal/completion_stub.h index 2bbe8b5154e5b..6822776b7da60 100644 --- a/google/cloud/retail/v2/internal/completion_stub.h +++ b/google/cloud/retail/v2/internal/completion_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_COMPLETION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_COMPLETION_STUB_H +#include "google/cloud/retail/v2/completion_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/completion_stub_factory.cc b/google/cloud/retail/v2/internal/completion_stub_factory.cc index a65a9e7536cad..48c66601fc316 100644 --- a/google/cloud/retail/v2/internal/completion_stub_factory.cc +++ b/google/cloud/retail/v2/internal/completion_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/retail/v2/completion_service.proto #include "google/cloud/retail/v2/internal/completion_stub_factory.h" +#include "google/cloud/retail/v2/completion_service.grpc.pb.h" #include "google/cloud/retail/v2/internal/completion_auth_decorator.h" #include "google/cloud/retail/v2/internal/completion_logging_decorator.h" #include "google/cloud/retail/v2/internal/completion_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/completion_tracing_connection.cc b/google/cloud/retail/v2/internal/completion_tracing_connection.cc index 85b2d00be4b4e..bafa2a0b06aca 100644 --- a/google/cloud/retail/v2/internal/completion_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/completion_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompletionServiceTracingConnection::CompletionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -93,17 +91,13 @@ CompletionServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompletionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/completion_tracing_connection.h b/google/cloud/retail/v2/internal/completion_tracing_connection.h index 54cafe4ebc51c..77d54ac06ee1d 100644 --- a/google/cloud/retail/v2/internal/completion_tracing_connection.h +++ b/google/cloud/retail/v2/internal/completion_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompletionServiceTracingConnection : public retail_v2::CompletionServiceConnection { public: @@ -67,8 +65,6 @@ class CompletionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/completion_tracing_stub.cc b/google/cloud/retail/v2/internal/completion_tracing_stub.cc index 6339745e5c98c..b3601313f7d3b 100644 --- a/google/cloud/retail/v2/internal/completion_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/completion_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompletionServiceTracingStub::CompletionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -123,15 +121,9 @@ future CompletionServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompletionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/completion_tracing_stub.h b/google/cloud/retail/v2/internal/completion_tracing_stub.h index d22e1cad9556b..51667c19e317b 100644 --- a/google/cloud/retail/v2/internal/completion_tracing_stub.h +++ b/google/cloud/retail/v2/internal/completion_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompletionServiceTracingStub : public CompletionServiceStub { public: ~CompletionServiceTracingStub() override = default; @@ -81,8 +79,6 @@ class CompletionServiceTracingStub : public CompletionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/control_auth_decorator.cc b/google/cloud/retail/v2/internal/control_auth_decorator.cc index 433f1809e716c..f3dc1a64a805e 100644 --- a/google/cloud/retail/v2/internal/control_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/control_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/control_service.proto #include "google/cloud/retail/v2/internal/control_auth_decorator.h" -#include +#include "google/cloud/retail/v2/control_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/control_logging_decorator.cc b/google/cloud/retail/v2/internal/control_logging_decorator.cc index ac3fcfd2e8b0b..39cdaf6465278 100644 --- a/google/cloud/retail/v2/internal/control_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/control_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/control_service.proto #include "google/cloud/retail/v2/internal/control_logging_decorator.h" +#include "google/cloud/retail/v2/control_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/control_metadata_decorator.cc b/google/cloud/retail/v2/internal/control_metadata_decorator.cc index 27606d7008b18..a425e6b27c2be 100644 --- a/google/cloud/retail/v2/internal/control_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/control_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/control_service.proto #include "google/cloud/retail/v2/internal/control_metadata_decorator.h" +#include "google/cloud/retail/v2/control_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/control_stub.cc b/google/cloud/retail/v2/internal/control_stub.cc index 123c856b0ecea..38ee118f4fd53 100644 --- a/google/cloud/retail/v2/internal/control_stub.cc +++ b/google/cloud/retail/v2/internal/control_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/control_service.proto #include "google/cloud/retail/v2/internal/control_stub.h" +#include "google/cloud/retail/v2/control_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/retail/v2/internal/control_stub.h b/google/cloud/retail/v2/internal/control_stub.h index f11aec9164a00..38897eb92a969 100644 --- a/google/cloud/retail/v2/internal/control_stub.h +++ b/google/cloud/retail/v2/internal/control_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_CONTROL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_CONTROL_STUB_H +#include "google/cloud/retail/v2/control_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/control_stub_factory.cc b/google/cloud/retail/v2/internal/control_stub_factory.cc index f3bf78bbf76bc..0b21a5fbcc029 100644 --- a/google/cloud/retail/v2/internal/control_stub_factory.cc +++ b/google/cloud/retail/v2/internal/control_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/retail/v2/control_service.proto #include "google/cloud/retail/v2/internal/control_stub_factory.h" +#include "google/cloud/retail/v2/control_service.grpc.pb.h" #include "google/cloud/retail/v2/internal/control_auth_decorator.h" #include "google/cloud/retail/v2/internal/control_logging_decorator.h" #include "google/cloud/retail/v2/internal/control_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/control_tracing_connection.cc b/google/cloud/retail/v2/internal/control_tracing_connection.cc index f80cb239665bc..d171e944b928d 100644 --- a/google/cloud/retail/v2/internal/control_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/control_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ControlServiceTracingConnection::ControlServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -99,16 +97,12 @@ ControlServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeControlServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/control_tracing_connection.h b/google/cloud/retail/v2/internal/control_tracing_connection.h index f5a16af6cd8ab..62b1d7c6af4ca 100644 --- a/google/cloud/retail/v2/internal/control_tracing_connection.h +++ b/google/cloud/retail/v2/internal/control_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ControlServiceTracingConnection : public retail_v2::ControlServiceConnection { public: @@ -65,8 +63,6 @@ class ControlServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/control_tracing_stub.cc b/google/cloud/retail/v2/internal/control_tracing_stub.cc index bf87097942f55..81bd44b48b478 100644 --- a/google/cloud/retail/v2/internal/control_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/control_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ControlServiceTracingStub::ControlServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -115,15 +113,9 @@ ControlServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeControlServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/control_tracing_stub.h b/google/cloud/retail/v2/internal/control_tracing_stub.h index 08f7d3430f9a9..0ea9da695205a 100644 --- a/google/cloud/retail/v2/internal/control_tracing_stub.h +++ b/google/cloud/retail/v2/internal/control_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ControlServiceTracingStub : public ControlServiceStub { public: ~ControlServiceTracingStub() override = default; @@ -72,8 +70,6 @@ class ControlServiceTracingStub : public ControlServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/model_auth_decorator.cc b/google/cloud/retail/v2/internal/model_auth_decorator.cc index ca3fc84360188..f42dbeac9d6b5 100644 --- a/google/cloud/retail/v2/internal/model_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/model_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/model_service.proto #include "google/cloud/retail/v2/internal/model_auth_decorator.h" -#include +#include "google/cloud/retail/v2/model_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/model_auth_decorator.h b/google/cloud/retail/v2/internal/model_auth_decorator.h index 5bbdc5393b120..ea0a421c3a115 100644 --- a/google/cloud/retail/v2/internal/model_auth_decorator.h +++ b/google/cloud/retail/v2/internal/model_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/model_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/model_connection_impl.h b/google/cloud/retail/v2/internal/model_connection_impl.h index 09ec76f6d140e..ca0a94b3257ac 100644 --- a/google/cloud/retail/v2/internal/model_connection_impl.h +++ b/google/cloud/retail/v2/internal/model_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/internal/model_logging_decorator.cc b/google/cloud/retail/v2/internal/model_logging_decorator.cc index f106027d06305..6163be69a7e16 100644 --- a/google/cloud/retail/v2/internal/model_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/model_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/model_service.proto #include "google/cloud/retail/v2/internal/model_logging_decorator.h" +#include "google/cloud/retail/v2/model_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/model_logging_decorator.h b/google/cloud/retail/v2/internal/model_logging_decorator.h index d6b437ab0a208..7e2fa7e493a71 100644 --- a/google/cloud/retail/v2/internal/model_logging_decorator.h +++ b/google/cloud/retail/v2/internal/model_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/model_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/model_metadata_decorator.cc b/google/cloud/retail/v2/internal/model_metadata_decorator.cc index 489219e1fd1e1..e91f815a3fde3 100644 --- a/google/cloud/retail/v2/internal/model_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/model_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/model_service.proto #include "google/cloud/retail/v2/internal/model_metadata_decorator.h" +#include "google/cloud/retail/v2/model_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/model_metadata_decorator.h b/google/cloud/retail/v2/internal/model_metadata_decorator.h index c842133073614..f77317f5a7e9f 100644 --- a/google/cloud/retail/v2/internal/model_metadata_decorator.h +++ b/google/cloud/retail/v2/internal/model_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/model_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/model_stub.cc b/google/cloud/retail/v2/internal/model_stub.cc index 2c792f905021e..a662c4cbf10c2 100644 --- a/google/cloud/retail/v2/internal/model_stub.cc +++ b/google/cloud/retail/v2/internal/model_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/retail/v2/model_service.proto #include "google/cloud/retail/v2/internal/model_stub.h" +#include "google/cloud/retail/v2/model_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/model_stub.h b/google/cloud/retail/v2/internal/model_stub.h index 4718136ac438a..95f66c16d0636 100644 --- a/google/cloud/retail/v2/internal/model_stub.h +++ b/google/cloud/retail/v2/internal/model_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_MODEL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_MODEL_STUB_H +#include "google/cloud/retail/v2/model_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/model_stub_factory.cc b/google/cloud/retail/v2/internal/model_stub_factory.cc index 95d342bcdec3a..c8e930ae63084 100644 --- a/google/cloud/retail/v2/internal/model_stub_factory.cc +++ b/google/cloud/retail/v2/internal/model_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/retail/v2/internal/model_metadata_decorator.h" #include "google/cloud/retail/v2/internal/model_stub.h" #include "google/cloud/retail/v2/internal/model_tracing_stub.h" +#include "google/cloud/retail/v2/model_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/model_tracing_connection.cc b/google/cloud/retail/v2/internal/model_tracing_connection.cc index 1b90880f201b9..43ced88a3b137 100644 --- a/google/cloud/retail/v2/internal/model_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/model_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelServiceTracingConnection::ModelServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -161,16 +159,12 @@ ModelServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/model_tracing_connection.h b/google/cloud/retail/v2/internal/model_tracing_connection.h index 087c43e928c84..4326a39f92234 100644 --- a/google/cloud/retail/v2/internal/model_tracing_connection.h +++ b/google/cloud/retail/v2/internal/model_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelServiceTracingConnection : public retail_v2::ModelServiceConnection { public: ~ModelServiceTracingConnection() override = default; @@ -87,8 +85,6 @@ class ModelServiceTracingConnection : public retail_v2::ModelServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/model_tracing_stub.cc b/google/cloud/retail/v2/internal/model_tracing_stub.cc index 16790e6de8997..615521bfc6c73 100644 --- a/google/cloud/retail/v2/internal/model_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/model_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ModelServiceTracingStub::ModelServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -200,15 +198,9 @@ future ModelServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeModelServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/model_tracing_stub.h b/google/cloud/retail/v2/internal/model_tracing_stub.h index cff1499430674..636ea166fb95b 100644 --- a/google/cloud/retail/v2/internal/model_tracing_stub.h +++ b/google/cloud/retail/v2/internal/model_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ModelServiceTracingStub : public ModelServiceStub { public: ~ModelServiceTracingStub() override = default; @@ -108,8 +106,6 @@ class ModelServiceTracingStub : public ModelServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/prediction_auth_decorator.cc b/google/cloud/retail/v2/internal/prediction_auth_decorator.cc index e826024e289d1..663911efa97f2 100644 --- a/google/cloud/retail/v2/internal/prediction_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/prediction_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/prediction_service.proto #include "google/cloud/retail/v2/internal/prediction_auth_decorator.h" -#include +#include "google/cloud/retail/v2/prediction_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/prediction_logging_decorator.cc b/google/cloud/retail/v2/internal/prediction_logging_decorator.cc index 0fcaba0028139..f7b1a17005ce2 100644 --- a/google/cloud/retail/v2/internal/prediction_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/prediction_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/prediction_service.proto #include "google/cloud/retail/v2/internal/prediction_logging_decorator.h" +#include "google/cloud/retail/v2/prediction_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/prediction_metadata_decorator.cc b/google/cloud/retail/v2/internal/prediction_metadata_decorator.cc index 17270b053fea2..de2ce728aa68f 100644 --- a/google/cloud/retail/v2/internal/prediction_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/prediction_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/prediction_service.proto #include "google/cloud/retail/v2/internal/prediction_metadata_decorator.h" +#include "google/cloud/retail/v2/prediction_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/prediction_stub.cc b/google/cloud/retail/v2/internal/prediction_stub.cc index e15e31971bd04..4e021f0fc7be0 100644 --- a/google/cloud/retail/v2/internal/prediction_stub.cc +++ b/google/cloud/retail/v2/internal/prediction_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/prediction_service.proto #include "google/cloud/retail/v2/internal/prediction_stub.h" +#include "google/cloud/retail/v2/prediction_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/retail/v2/internal/prediction_stub.h b/google/cloud/retail/v2/internal/prediction_stub.h index a06c80cacc5e0..e74a99cca8b7a 100644 --- a/google/cloud/retail/v2/internal/prediction_stub.h +++ b/google/cloud/retail/v2/internal/prediction_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_PREDICTION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_PREDICTION_STUB_H +#include "google/cloud/retail/v2/prediction_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/prediction_stub_factory.cc b/google/cloud/retail/v2/internal/prediction_stub_factory.cc index 861ddfcf44b5c..78793d6378453 100644 --- a/google/cloud/retail/v2/internal/prediction_stub_factory.cc +++ b/google/cloud/retail/v2/internal/prediction_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/retail/v2/internal/prediction_metadata_decorator.h" #include "google/cloud/retail/v2/internal/prediction_stub.h" #include "google/cloud/retail/v2/internal/prediction_tracing_stub.h" +#include "google/cloud/retail/v2/prediction_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/prediction_tracing_connection.cc b/google/cloud/retail/v2/internal/prediction_tracing_connection.cc index 337f806685499..c55b85b6e9606 100644 --- a/google/cloud/retail/v2/internal/prediction_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/prediction_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PredictionServiceTracingConnection::PredictionServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -62,17 +60,13 @@ PredictionServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePredictionServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/prediction_tracing_connection.h b/google/cloud/retail/v2/internal/prediction_tracing_connection.h index 5381b94618f7f..4b1e3faadc2a3 100644 --- a/google/cloud/retail/v2/internal/prediction_tracing_connection.h +++ b/google/cloud/retail/v2/internal/prediction_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PredictionServiceTracingConnection : public retail_v2::PredictionServiceConnection { public: @@ -53,8 +51,6 @@ class PredictionServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/prediction_tracing_stub.cc b/google/cloud/retail/v2/internal/prediction_tracing_stub.cc index 3a7139fbffd9b..8617104cac717 100644 --- a/google/cloud/retail/v2/internal/prediction_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/prediction_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - PredictionServiceTracingStub::PredictionServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -68,15 +66,9 @@ PredictionServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakePredictionServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/prediction_tracing_stub.h b/google/cloud/retail/v2/internal/prediction_tracing_stub.h index 285f553badd1f..b5b7fa31a3f9f 100644 --- a/google/cloud/retail/v2/internal/prediction_tracing_stub.h +++ b/google/cloud/retail/v2/internal/prediction_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class PredictionServiceTracingStub : public PredictionServiceStub { public: ~PredictionServiceTracingStub() override = default; @@ -57,8 +55,6 @@ class PredictionServiceTracingStub : public PredictionServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/product_auth_decorator.cc b/google/cloud/retail/v2/internal/product_auth_decorator.cc index d1428136c6931..fc3efe6c197cd 100644 --- a/google/cloud/retail/v2/internal/product_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/product_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/product_service.proto #include "google/cloud/retail/v2/internal/product_auth_decorator.h" -#include +#include "google/cloud/retail/v2/product_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/product_auth_decorator.h b/google/cloud/retail/v2/internal/product_auth_decorator.h index 06918c8d0b5ce..c8214f81dbe26 100644 --- a/google/cloud/retail/v2/internal/product_auth_decorator.h +++ b/google/cloud/retail/v2/internal/product_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/product_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/product_connection_impl.h b/google/cloud/retail/v2/internal/product_connection_impl.h index 5206f22185a84..4415e001f2290 100644 --- a/google/cloud/retail/v2/internal/product_connection_impl.h +++ b/google/cloud/retail/v2/internal/product_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/internal/product_logging_decorator.cc b/google/cloud/retail/v2/internal/product_logging_decorator.cc index 95d9bfa7db0f9..13d361142da3e 100644 --- a/google/cloud/retail/v2/internal/product_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/product_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/product_service.proto #include "google/cloud/retail/v2/internal/product_logging_decorator.h" +#include "google/cloud/retail/v2/product_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/product_logging_decorator.h b/google/cloud/retail/v2/internal/product_logging_decorator.h index 55dd8d52b5fdc..1bb20b45ab205 100644 --- a/google/cloud/retail/v2/internal/product_logging_decorator.h +++ b/google/cloud/retail/v2/internal/product_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/product_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/product_metadata_decorator.cc b/google/cloud/retail/v2/internal/product_metadata_decorator.cc index 700a496a24cd0..cb2dead73ac31 100644 --- a/google/cloud/retail/v2/internal/product_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/product_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/product_service.proto #include "google/cloud/retail/v2/internal/product_metadata_decorator.h" +#include "google/cloud/retail/v2/product_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/product_metadata_decorator.h b/google/cloud/retail/v2/internal/product_metadata_decorator.h index 844862c8da654..fccb3e40504df 100644 --- a/google/cloud/retail/v2/internal/product_metadata_decorator.h +++ b/google/cloud/retail/v2/internal/product_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/product_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/product_stub.cc b/google/cloud/retail/v2/internal/product_stub.cc index 6d98dc6203d28..a76bfa1c6b718 100644 --- a/google/cloud/retail/v2/internal/product_stub.cc +++ b/google/cloud/retail/v2/internal/product_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/retail/v2/product_service.proto #include "google/cloud/retail/v2/internal/product_stub.h" +#include "google/cloud/retail/v2/product_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/product_stub.h b/google/cloud/retail/v2/internal/product_stub.h index 3baf3d96d9d06..5eefaa5f5b722 100644 --- a/google/cloud/retail/v2/internal/product_stub.h +++ b/google/cloud/retail/v2/internal/product_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_PRODUCT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_PRODUCT_STUB_H +#include "google/cloud/retail/v2/product_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/product_stub_factory.cc b/google/cloud/retail/v2/internal/product_stub_factory.cc index 78445c5333601..7f1dc7817e050 100644 --- a/google/cloud/retail/v2/internal/product_stub_factory.cc +++ b/google/cloud/retail/v2/internal/product_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/retail/v2/internal/product_metadata_decorator.h" #include "google/cloud/retail/v2/internal/product_stub.h" #include "google/cloud/retail/v2/internal/product_tracing_stub.h" +#include "google/cloud/retail/v2/product_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/product_tracing_connection.cc b/google/cloud/retail/v2/internal/product_tracing_connection.cc index 7f6aece8b6f3d..0757548cbd1ee 100644 --- a/google/cloud/retail/v2/internal/product_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/product_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProductServiceTracingConnection::ProductServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -307,16 +305,12 @@ ProductServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProductServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/product_tracing_connection.h b/google/cloud/retail/v2/internal/product_tracing_connection.h index 627ad0b426de6..3fc86daf34ea6 100644 --- a/google/cloud/retail/v2/internal/product_tracing_connection.h +++ b/google/cloud/retail/v2/internal/product_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProductServiceTracingConnection : public retail_v2::ProductServiceConnection { public: @@ -153,8 +151,6 @@ class ProductServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/product_tracing_stub.cc b/google/cloud/retail/v2/internal/product_tracing_stub.cc index cabc42756fa04..2bb8549e70bd0 100644 --- a/google/cloud/retail/v2/internal/product_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/product_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProductServiceTracingStub::ProductServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -332,15 +330,9 @@ future ProductServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProductServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/product_tracing_stub.h b/google/cloud/retail/v2/internal/product_tracing_stub.h index 44612be75cb32..8178f6467ea76 100644 --- a/google/cloud/retail/v2/internal/product_tracing_stub.h +++ b/google/cloud/retail/v2/internal/product_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProductServiceTracingStub : public ProductServiceStub { public: ~ProductServiceTracingStub() override = default; @@ -162,8 +160,6 @@ class ProductServiceTracingStub : public ProductServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/search_auth_decorator.cc b/google/cloud/retail/v2/internal/search_auth_decorator.cc index af18af8e463a3..77e79cde507dd 100644 --- a/google/cloud/retail/v2/internal/search_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/search_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/search_service.proto #include "google/cloud/retail/v2/internal/search_auth_decorator.h" -#include +#include "google/cloud/retail/v2/search_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/search_logging_decorator.cc b/google/cloud/retail/v2/internal/search_logging_decorator.cc index 74d49b70f2e3c..c69ea2b4af014 100644 --- a/google/cloud/retail/v2/internal/search_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/search_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/search_service.proto #include "google/cloud/retail/v2/internal/search_logging_decorator.h" +#include "google/cloud/retail/v2/search_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/search_metadata_decorator.cc b/google/cloud/retail/v2/internal/search_metadata_decorator.cc index 4ccd2e1dc3b9a..34bb6296241f7 100644 --- a/google/cloud/retail/v2/internal/search_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/search_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/search_service.proto #include "google/cloud/retail/v2/internal/search_metadata_decorator.h" +#include "google/cloud/retail/v2/search_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/search_stub.cc b/google/cloud/retail/v2/internal/search_stub.cc index e4735880a113b..355e50e029212 100644 --- a/google/cloud/retail/v2/internal/search_stub.cc +++ b/google/cloud/retail/v2/internal/search_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/search_service.proto #include "google/cloud/retail/v2/internal/search_stub.h" +#include "google/cloud/retail/v2/search_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/retail/v2/internal/search_stub.h b/google/cloud/retail/v2/internal/search_stub.h index 12ace728716a7..cbbbd70437ddc 100644 --- a/google/cloud/retail/v2/internal/search_stub.h +++ b/google/cloud/retail/v2/internal/search_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_SEARCH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_SEARCH_STUB_H +#include "google/cloud/retail/v2/search_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/search_stub_factory.cc b/google/cloud/retail/v2/internal/search_stub_factory.cc index f54272aff8b0c..e302030efea32 100644 --- a/google/cloud/retail/v2/internal/search_stub_factory.cc +++ b/google/cloud/retail/v2/internal/search_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/retail/v2/internal/search_metadata_decorator.h" #include "google/cloud/retail/v2/internal/search_stub.h" #include "google/cloud/retail/v2/internal/search_tracing_stub.h" +#include "google/cloud/retail/v2/search_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/search_tracing_connection.cc b/google/cloud/retail/v2/internal/search_tracing_connection.cc index 07752bc6d4166..cb5a41467e0f8 100644 --- a/google/cloud/retail/v2/internal/search_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/search_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SearchServiceTracingConnection::SearchServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -64,16 +62,12 @@ SearchServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSearchServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/search_tracing_connection.h b/google/cloud/retail/v2/internal/search_tracing_connection.h index 3aa2ed9de1e0c..2bb1c4b8da4ad 100644 --- a/google/cloud/retail/v2/internal/search_tracing_connection.h +++ b/google/cloud/retail/v2/internal/search_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SearchServiceTracingConnection : public retail_v2::SearchServiceConnection { public: @@ -53,8 +51,6 @@ class SearchServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/search_tracing_stub.cc b/google/cloud/retail/v2/internal/search_tracing_stub.cc index 95267b5680b66..2e0f86911badb 100644 --- a/google/cloud/retail/v2/internal/search_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/search_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SearchServiceTracingStub::SearchServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -67,15 +65,9 @@ StatusOr SearchServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSearchServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/search_tracing_stub.h b/google/cloud/retail/v2/internal/search_tracing_stub.h index 2f7b4ab380492..e469b98ef54f7 100644 --- a/google/cloud/retail/v2/internal/search_tracing_stub.h +++ b/google/cloud/retail/v2/internal/search_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SearchServiceTracingStub : public SearchServiceStub { public: ~SearchServiceTracingStub() override = default; @@ -56,8 +54,6 @@ class SearchServiceTracingStub : public SearchServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/serving_config_auth_decorator.cc b/google/cloud/retail/v2/internal/serving_config_auth_decorator.cc index 0d5953f17556b..3c902c5fe4fed 100644 --- a/google/cloud/retail/v2/internal/serving_config_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/serving_config_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/serving_config_service.proto #include "google/cloud/retail/v2/internal/serving_config_auth_decorator.h" -#include +#include "google/cloud/retail/v2/serving_config_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/serving_config_logging_decorator.cc b/google/cloud/retail/v2/internal/serving_config_logging_decorator.cc index 6d6623f34259b..eec58ec11baf2 100644 --- a/google/cloud/retail/v2/internal/serving_config_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/serving_config_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/serving_config_service.proto #include "google/cloud/retail/v2/internal/serving_config_logging_decorator.h" +#include "google/cloud/retail/v2/serving_config_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/serving_config_metadata_decorator.cc b/google/cloud/retail/v2/internal/serving_config_metadata_decorator.cc index 636c44dcdfc77..8c7c5459eeffe 100644 --- a/google/cloud/retail/v2/internal/serving_config_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/serving_config_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/serving_config_service.proto #include "google/cloud/retail/v2/internal/serving_config_metadata_decorator.h" +#include "google/cloud/retail/v2/serving_config_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/serving_config_stub.cc b/google/cloud/retail/v2/internal/serving_config_stub.cc index 23c78c8b85b69..d25336ad5f53e 100644 --- a/google/cloud/retail/v2/internal/serving_config_stub.cc +++ b/google/cloud/retail/v2/internal/serving_config_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/serving_config_service.proto #include "google/cloud/retail/v2/internal/serving_config_stub.h" +#include "google/cloud/retail/v2/serving_config_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/retail/v2/internal/serving_config_stub.h b/google/cloud/retail/v2/internal/serving_config_stub.h index c03e791a87e6f..95be10c679eac 100644 --- a/google/cloud/retail/v2/internal/serving_config_stub.h +++ b/google/cloud/retail/v2/internal/serving_config_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_SERVING_CONFIG_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_SERVING_CONFIG_STUB_H +#include "google/cloud/retail/v2/serving_config_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/serving_config_stub_factory.cc b/google/cloud/retail/v2/internal/serving_config_stub_factory.cc index 1886a346752c3..a2e43af767212 100644 --- a/google/cloud/retail/v2/internal/serving_config_stub_factory.cc +++ b/google/cloud/retail/v2/internal/serving_config_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/retail/v2/internal/serving_config_metadata_decorator.h" #include "google/cloud/retail/v2/internal/serving_config_stub.h" #include "google/cloud/retail/v2/internal/serving_config_tracing_stub.h" +#include "google/cloud/retail/v2/serving_config_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc b/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc index 5190b9a8b3ccc..e2582aec172fd 100644 --- a/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServingConfigServiceTracingConnection::ServingConfigServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -117,17 +115,13 @@ ServingConfigServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServingConfigServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/serving_config_tracing_connection.h b/google/cloud/retail/v2/internal/serving_config_tracing_connection.h index eab919dac0fcf..7bde6b8b9f404 100644 --- a/google/cloud/retail/v2/internal/serving_config_tracing_connection.h +++ b/google/cloud/retail/v2/internal/serving_config_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServingConfigServiceTracingConnection : public retail_v2::ServingConfigServiceConnection { public: @@ -75,8 +73,6 @@ class ServingConfigServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/serving_config_tracing_stub.cc b/google/cloud/retail/v2/internal/serving_config_tracing_stub.cc index efa17b5f2f353..c2a76694db270 100644 --- a/google/cloud/retail/v2/internal/serving_config_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/serving_config_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServingConfigServiceTracingStub::ServingConfigServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -139,15 +137,9 @@ ServingConfigServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServingConfigServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/serving_config_tracing_stub.h b/google/cloud/retail/v2/internal/serving_config_tracing_stub.h index 04cfc881a2397..3a0b1a0a4fd42 100644 --- a/google/cloud/retail/v2/internal/serving_config_tracing_stub.h +++ b/google/cloud/retail/v2/internal/serving_config_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServingConfigServiceTracingStub : public ServingConfigServiceStub { public: ~ServingConfigServiceTracingStub() override = default; @@ -86,8 +84,6 @@ class ServingConfigServiceTracingStub : public ServingConfigServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/internal/user_event_auth_decorator.cc b/google/cloud/retail/v2/internal/user_event_auth_decorator.cc index 691368b0a5c28..e5ecea2eee277 100644 --- a/google/cloud/retail/v2/internal/user_event_auth_decorator.cc +++ b/google/cloud/retail/v2/internal/user_event_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/retail/v2/user_event_service.proto #include "google/cloud/retail/v2/internal/user_event_auth_decorator.h" -#include +#include "google/cloud/retail/v2/user_event_service.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/user_event_auth_decorator.h b/google/cloud/retail/v2/internal/user_event_auth_decorator.h index 2d970b257e006..74fdf22a7db40 100644 --- a/google/cloud/retail/v2/internal/user_event_auth_decorator.h +++ b/google/cloud/retail/v2/internal/user_event_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/user_event_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/user_event_connection_impl.h b/google/cloud/retail/v2/internal/user_event_connection_impl.h index 7e79c975891ec..66779022ee39c 100644 --- a/google/cloud/retail/v2/internal/user_event_connection_impl.h +++ b/google/cloud/retail/v2/internal/user_event_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/internal/user_event_logging_decorator.cc b/google/cloud/retail/v2/internal/user_event_logging_decorator.cc index f64c2f41bc431..15b367a64ee82 100644 --- a/google/cloud/retail/v2/internal/user_event_logging_decorator.cc +++ b/google/cloud/retail/v2/internal/user_event_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/retail/v2/user_event_service.proto #include "google/cloud/retail/v2/internal/user_event_logging_decorator.h" +#include "google/cloud/retail/v2/user_event_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/retail/v2/internal/user_event_logging_decorator.h b/google/cloud/retail/v2/internal/user_event_logging_decorator.h index ae4f63349ee45..cb330fa2174ad 100644 --- a/google/cloud/retail/v2/internal/user_event_logging_decorator.h +++ b/google/cloud/retail/v2/internal/user_event_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/user_event_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/user_event_metadata_decorator.cc b/google/cloud/retail/v2/internal/user_event_metadata_decorator.cc index 7d4a73f6f8b93..54885ed866be1 100644 --- a/google/cloud/retail/v2/internal/user_event_metadata_decorator.cc +++ b/google/cloud/retail/v2/internal/user_event_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/retail/v2/user_event_service.proto #include "google/cloud/retail/v2/internal/user_event_metadata_decorator.h" +#include "google/cloud/retail/v2/user_event_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 #include #include #include diff --git a/google/cloud/retail/v2/internal/user_event_metadata_decorator.h b/google/cloud/retail/v2/internal/user_event_metadata_decorator.h index 5fab344d2c5f5..a130d82d7417e 100644 --- a/google/cloud/retail/v2/internal/user_event_metadata_decorator.h +++ b/google/cloud/retail/v2/internal/user_event_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/retail/v2/internal/user_event_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/internal/user_event_stub.cc b/google/cloud/retail/v2/internal/user_event_stub.cc index 9f337302135bc..404ac7a27e593 100644 --- a/google/cloud/retail/v2/internal/user_event_stub.cc +++ b/google/cloud/retail/v2/internal/user_event_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/retail/v2/user_event_service.proto #include "google/cloud/retail/v2/internal/user_event_stub.h" +#include "google/cloud/retail/v2/user_event_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/user_event_stub.h b/google/cloud/retail/v2/internal/user_event_stub.h index 5b299ec6f91b1..24b622ecba3de 100644 --- a/google/cloud/retail/v2/internal/user_event_stub.h +++ b/google/cloud/retail/v2/internal/user_event_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_USER_EVENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_INTERNAL_USER_EVENT_STUB_H +#include "google/cloud/retail/v2/user_event_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/user_event_stub_factory.cc b/google/cloud/retail/v2/internal/user_event_stub_factory.cc index dd1f9b5329d46..ab77716c88882 100644 --- a/google/cloud/retail/v2/internal/user_event_stub_factory.cc +++ b/google/cloud/retail/v2/internal/user_event_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/retail/v2/internal/user_event_metadata_decorator.h" #include "google/cloud/retail/v2/internal/user_event_stub.h" #include "google/cloud/retail/v2/internal/user_event_tracing_stub.h" +#include "google/cloud/retail/v2/user_event_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/internal/user_event_tracing_connection.cc b/google/cloud/retail/v2/internal/user_event_tracing_connection.cc index 5b731a63d06ba..fd2aafe277028 100644 --- a/google/cloud/retail/v2/internal/user_event_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/user_event_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UserEventServiceTracingConnection::UserEventServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -160,16 +158,12 @@ UserEventServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUserEventServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/retail/v2/internal/user_event_tracing_connection.h b/google/cloud/retail/v2/internal/user_event_tracing_connection.h index 6d9bac06084fc..05ec3bb8e93ef 100644 --- a/google/cloud/retail/v2/internal/user_event_tracing_connection.h +++ b/google/cloud/retail/v2/internal/user_event_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UserEventServiceTracingConnection : public retail_v2::UserEventServiceConnection { public: @@ -93,8 +91,6 @@ class UserEventServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/retail/v2/internal/user_event_tracing_stub.cc b/google/cloud/retail/v2/internal/user_event_tracing_stub.cc index 7ab12bcbd44aa..42ca41425441d 100644 --- a/google/cloud/retail/v2/internal/user_event_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/user_event_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - UserEventServiceTracingStub::UserEventServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -188,15 +186,9 @@ future UserEventServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeUserEventServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/user_event_tracing_stub.h b/google/cloud/retail/v2/internal/user_event_tracing_stub.h index 0abd070448eb3..3006155bd7b54 100644 --- a/google/cloud/retail/v2/internal/user_event_tracing_stub.h +++ b/google/cloud/retail/v2/internal/user_event_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace retail_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class UserEventServiceTracingStub : public UserEventServiceStub { public: ~UserEventServiceTracingStub() override = default; @@ -110,8 +108,6 @@ class UserEventServiceTracingStub : public UserEventServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/retail/v2/model_client.h b/google/cloud/retail/v2/model_client.h index bbe342406e31b..ed79c92c8d905 100644 --- a/google/cloud/retail/v2/model_client.h +++ b/google/cloud/retail/v2/model_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/retail/v2/model_connection.h b/google/cloud/retail/v2/model_connection.h index b546dce9ff342..c1e85f4f6cd63 100644 --- a/google/cloud/retail/v2/model_connection.h +++ b/google/cloud/retail/v2/model_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/retail/v2/internal/model_retry_traits.h" #include "google/cloud/retail/v2/model_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/model_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/model_connection_idempotency_policy.h b/google/cloud/retail/v2/model_connection_idempotency_policy.h index 0862f56c4906e..b3a2fa72743d7 100644 --- a/google/cloud/retail/v2/model_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/model_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_MODEL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_MODEL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/model_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/prediction_connection.h b/google/cloud/retail/v2/prediction_connection.h index 65d675c9edeb6..320b1f9e622f5 100644 --- a/google/cloud/retail/v2/prediction_connection.h +++ b/google/cloud/retail/v2/prediction_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/retail/v2/internal/prediction_retry_traits.h" #include "google/cloud/retail/v2/prediction_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/prediction_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/retail/v2/prediction_connection_idempotency_policy.h b/google/cloud/retail/v2/prediction_connection_idempotency_policy.h index 56f095a30505d..fc1cb4cf8c1fc 100644 --- a/google/cloud/retail/v2/prediction_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/prediction_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/prediction_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/product_client.h b/google/cloud/retail/v2/product_client.h index f7c3c85d2fd44..15acb4c381142 100644 --- a/google/cloud/retail/v2/product_client.h +++ b/google/cloud/retail/v2/product_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/product_connection.h b/google/cloud/retail/v2/product_connection.h index c743d2e1709d6..0431dcbd0f0d9 100644 --- a/google/cloud/retail/v2/product_connection.h +++ b/google/cloud/retail/v2/product_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/retail/v2/internal/product_retry_traits.h" #include "google/cloud/retail/v2/product_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/product_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/product_connection_idempotency_policy.h b/google/cloud/retail/v2/product_connection_idempotency_policy.h index 117bb0c62cb94..fe173388d5316 100644 --- a/google/cloud/retail/v2/product_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/product_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_PRODUCT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_PRODUCT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/product_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/search_connection.h b/google/cloud/retail/v2/search_connection.h index 051dd6e11053a..968bed33a9c7f 100644 --- a/google/cloud/retail/v2/search_connection.h +++ b/google/cloud/retail/v2/search_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/retail/v2/internal/search_retry_traits.h" #include "google/cloud/retail/v2/search_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/search_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/retail/v2/search_connection_idempotency_policy.h b/google/cloud/retail/v2/search_connection_idempotency_policy.h index 529101d62f6de..8ea7f59535193 100644 --- a/google/cloud/retail/v2/search_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/search_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/search_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/serving_config_connection.h b/google/cloud/retail/v2/serving_config_connection.h index 86022cd571ff5..7b19aa544cedd 100644 --- a/google/cloud/retail/v2/serving_config_connection.h +++ b/google/cloud/retail/v2/serving_config_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/retail/v2/internal/serving_config_retry_traits.h" #include "google/cloud/retail/v2/serving_config_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/serving_config_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/retail/v2/serving_config_connection_idempotency_policy.h b/google/cloud/retail/v2/serving_config_connection_idempotency_policy.h index 1b74b29c4f111..ffce6c28ec671 100644 --- a/google/cloud/retail/v2/serving_config_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/serving_config_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_SERVING_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_SERVING_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/serving_config_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/user_event_client.h b/google/cloud/retail/v2/user_event_client.h index 08086000cb0ea..2c40ee4c23703 100644 --- a/google/cloud/retail/v2/user_event_client.h +++ b/google/cloud/retail/v2/user_event_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/retail/v2/user_event_connection.h b/google/cloud/retail/v2/user_event_connection.h index 5b521904034a2..efb5c7ab7f5da 100644 --- a/google/cloud/retail/v2/user_event_connection.h +++ b/google/cloud/retail/v2/user_event_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/retail/v2/internal/user_event_retry_traits.h" #include "google/cloud/retail/v2/user_event_connection_idempotency_policy.h" +#include "google/cloud/retail/v2/user_event_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/retail/v2/user_event_connection_idempotency_policy.h b/google/cloud/retail/v2/user_event_connection_idempotency_policy.h index 6359d5d652fef..0589402027d10 100644 --- a/google/cloud/retail/v2/user_event_connection_idempotency_policy.h +++ b/google/cloud/retail/v2/user_event_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_V2_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/retail/v2/user_event_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/BUILD.bazel b/google/cloud/run/BUILD.bazel index c88d2bf6c1e82..0365a11f7090d 100644 --- a/google/cloud/run/BUILD.bazel +++ b/google/cloud/run/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/run/v2:run_cc_grpc", + "@googleapis//google/cloud/run/v2:run_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/run/quickstart/.bazelrc b/google/cloud/run/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/run/quickstart/.bazelrc +++ b/google/cloud/run/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/run/v2/executions_client.h b/google/cloud/run/v2/executions_client.h index c8dc04445dd6a..eba1536b524b0 100644 --- a/google/cloud/run/v2/executions_client.h +++ b/google/cloud/run/v2/executions_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/executions_connection.h b/google/cloud/run/v2/executions_connection.h index ee925e7d8a326..8fac26c9076eb 100644 --- a/google/cloud/run/v2/executions_connection.h +++ b/google/cloud/run/v2/executions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_EXECUTIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_EXECUTIONS_CONNECTION_H +#include "google/cloud/run/v2/execution.pb.h" #include "google/cloud/run/v2/executions_connection_idempotency_policy.h" #include "google/cloud/run/v2/internal/executions_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/executions_connection_idempotency_policy.h b/google/cloud/run/v2/executions_connection_idempotency_policy.h index 9b071a5877b7a..f0dd43e830e31 100644 --- a/google/cloud/run/v2/executions_connection_idempotency_policy.h +++ b/google/cloud/run/v2/executions_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/run/v2/execution.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/internal/executions_auth_decorator.cc b/google/cloud/run/v2/internal/executions_auth_decorator.cc index 1f0f35ef45d55..dc26ef654901d 100644 --- a/google/cloud/run/v2/internal/executions_auth_decorator.cc +++ b/google/cloud/run/v2/internal/executions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/run/v2/execution.proto #include "google/cloud/run/v2/internal/executions_auth_decorator.h" -#include +#include "google/cloud/run/v2/execution.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/executions_auth_decorator.h b/google/cloud/run/v2/internal/executions_auth_decorator.h index 58fec74f585c8..84ce0ccce2d57 100644 --- a/google/cloud/run/v2/internal/executions_auth_decorator.h +++ b/google/cloud/run/v2/internal/executions_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/executions_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/executions_connection_impl.h b/google/cloud/run/v2/internal/executions_connection_impl.h index 4b08ed9db6b49..f33279f9179d3 100644 --- a/google/cloud/run/v2/internal/executions_connection_impl.h +++ b/google/cloud/run/v2/internal/executions_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/internal/executions_logging_decorator.cc b/google/cloud/run/v2/internal/executions_logging_decorator.cc index 1a7fbaf2ce65c..a515d5cf9888b 100644 --- a/google/cloud/run/v2/internal/executions_logging_decorator.cc +++ b/google/cloud/run/v2/internal/executions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/run/v2/execution.proto #include "google/cloud/run/v2/internal/executions_logging_decorator.h" +#include "google/cloud/run/v2/execution.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/executions_logging_decorator.h b/google/cloud/run/v2/internal/executions_logging_decorator.h index 758f5bb426c02..7c8d6eac440d7 100644 --- a/google/cloud/run/v2/internal/executions_logging_decorator.h +++ b/google/cloud/run/v2/internal/executions_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/executions_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/executions_metadata_decorator.cc b/google/cloud/run/v2/internal/executions_metadata_decorator.cc index fbfd08061cebf..798b680c8c53c 100644 --- a/google/cloud/run/v2/internal/executions_metadata_decorator.cc +++ b/google/cloud/run/v2/internal/executions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/run/v2/execution.proto #include "google/cloud/run/v2/internal/executions_metadata_decorator.h" +#include "google/cloud/run/v2/execution.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 #include #include #include diff --git a/google/cloud/run/v2/internal/executions_metadata_decorator.h b/google/cloud/run/v2/internal/executions_metadata_decorator.h index 252c4c73596d5..b1d263b18b735 100644 --- a/google/cloud/run/v2/internal/executions_metadata_decorator.h +++ b/google/cloud/run/v2/internal/executions_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/executions_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/executions_stub.cc b/google/cloud/run/v2/internal/executions_stub.cc index 2e8f50368a26c..e5b50ab2cac87 100644 --- a/google/cloud/run/v2/internal/executions_stub.cc +++ b/google/cloud/run/v2/internal/executions_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/run/v2/execution.proto #include "google/cloud/run/v2/internal/executions_stub.h" +#include "google/cloud/run/v2/execution.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/executions_stub.h b/google/cloud/run/v2/internal/executions_stub.h index 1a3b61dc664c4..a5ef1c4b608e6 100644 --- a/google/cloud/run/v2/internal/executions_stub.h +++ b/google/cloud/run/v2/internal/executions_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_EXECUTIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_EXECUTIONS_STUB_H +#include "google/cloud/run/v2/execution.grpc.pb.h" +#include "google/cloud/run/v2/execution.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/executions_stub_factory.cc b/google/cloud/run/v2/internal/executions_stub_factory.cc index 41d12c225b3c3..f6b1656a5ed90 100644 --- a/google/cloud/run/v2/internal/executions_stub_factory.cc +++ b/google/cloud/run/v2/internal/executions_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/run/v2/execution.proto #include "google/cloud/run/v2/internal/executions_stub_factory.h" +#include "google/cloud/run/v2/execution.grpc.pb.h" #include "google/cloud/run/v2/internal/executions_auth_decorator.h" #include "google/cloud/run/v2/internal/executions_logging_decorator.h" #include "google/cloud/run/v2/internal/executions_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/executions_tracing_connection.cc b/google/cloud/run/v2/internal/executions_tracing_connection.cc index 9203d5caa4af8..2dec713065c4a 100644 --- a/google/cloud/run/v2/internal/executions_tracing_connection.cc +++ b/google/cloud/run/v2/internal/executions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExecutionsTracingConnection::ExecutionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -143,15 +141,11 @@ ExecutionsTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExecutionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/run/v2/internal/executions_tracing_connection.h b/google/cloud/run/v2/internal/executions_tracing_connection.h index b308484335e48..921d073849af8 100644 --- a/google/cloud/run/v2/internal/executions_tracing_connection.h +++ b/google/cloud/run/v2/internal/executions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExecutionsTracingConnection : public run_v2::ExecutionsConnection { public: ~ExecutionsTracingConnection() override = default; @@ -81,8 +79,6 @@ class ExecutionsTracingConnection : public run_v2::ExecutionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/run/v2/internal/executions_tracing_stub.cc b/google/cloud/run/v2/internal/executions_tracing_stub.cc index 06d5ad761dfe3..9bb7e1d5d2a1a 100644 --- a/google/cloud/run/v2/internal/executions_tracing_stub.cc +++ b/google/cloud/run/v2/internal/executions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExecutionsTracingStub::ExecutionsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -180,15 +178,9 @@ future ExecutionsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExecutionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/executions_tracing_stub.h b/google/cloud/run/v2/internal/executions_tracing_stub.h index d4ded9b10f192..38415653441f8 100644 --- a/google/cloud/run/v2/internal/executions_tracing_stub.h +++ b/google/cloud/run/v2/internal/executions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExecutionsTracingStub : public ExecutionsStub { public: ~ExecutionsTracingStub() override = default; @@ -100,8 +98,6 @@ class ExecutionsTracingStub : public ExecutionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/run/v2/internal/jobs_auth_decorator.cc b/google/cloud/run/v2/internal/jobs_auth_decorator.cc index e43a92f37f728..3043c6b8a4c03 100644 --- a/google/cloud/run/v2/internal/jobs_auth_decorator.cc +++ b/google/cloud/run/v2/internal/jobs_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/run/v2/job.proto #include "google/cloud/run/v2/internal/jobs_auth_decorator.h" -#include +#include "google/cloud/run/v2/job.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/jobs_auth_decorator.h b/google/cloud/run/v2/internal/jobs_auth_decorator.h index a84c01a944207..299a3ddeffda3 100644 --- a/google/cloud/run/v2/internal/jobs_auth_decorator.h +++ b/google/cloud/run/v2/internal/jobs_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/jobs_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/jobs_connection_impl.h b/google/cloud/run/v2/internal/jobs_connection_impl.h index 75a23aab2334b..b7d710c4f011b 100644 --- a/google/cloud/run/v2/internal/jobs_connection_impl.h +++ b/google/cloud/run/v2/internal/jobs_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/internal/jobs_logging_decorator.cc b/google/cloud/run/v2/internal/jobs_logging_decorator.cc index bfa934deb6731..ac74ac01a8d8b 100644 --- a/google/cloud/run/v2/internal/jobs_logging_decorator.cc +++ b/google/cloud/run/v2/internal/jobs_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/run/v2/job.proto #include "google/cloud/run/v2/internal/jobs_logging_decorator.h" +#include "google/cloud/run/v2/job.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/jobs_logging_decorator.h b/google/cloud/run/v2/internal/jobs_logging_decorator.h index 553a70d1d873c..ada99ed568bc3 100644 --- a/google/cloud/run/v2/internal/jobs_logging_decorator.h +++ b/google/cloud/run/v2/internal/jobs_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/jobs_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/jobs_metadata_decorator.cc b/google/cloud/run/v2/internal/jobs_metadata_decorator.cc index 380be7f664ddd..8fddcca4421d3 100644 --- a/google/cloud/run/v2/internal/jobs_metadata_decorator.cc +++ b/google/cloud/run/v2/internal/jobs_metadata_decorator.cc @@ -17,6 +17,7 @@ // source: google/cloud/run/v2/job.proto #include "google/cloud/run/v2/internal/jobs_metadata_decorator.h" +#include "google/cloud/run/v2/job.grpc.pb.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -24,7 +25,6 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/jobs_metadata_decorator.h b/google/cloud/run/v2/internal/jobs_metadata_decorator.h index c2bc33ce54ce3..292b727889c82 100644 --- a/google/cloud/run/v2/internal/jobs_metadata_decorator.h +++ b/google/cloud/run/v2/internal/jobs_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/jobs_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/jobs_stub.cc b/google/cloud/run/v2/internal/jobs_stub.cc index be653ab342910..b46707ce08379 100644 --- a/google/cloud/run/v2/internal/jobs_stub.cc +++ b/google/cloud/run/v2/internal/jobs_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/run/v2/job.proto #include "google/cloud/run/v2/internal/jobs_stub.h" +#include "google/cloud/run/v2/job.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/jobs_stub.h b/google/cloud/run/v2/internal/jobs_stub.h index 1f4a6aaf4b18c..2b38ef4efc143 100644 --- a/google/cloud/run/v2/internal/jobs_stub.h +++ b/google/cloud/run/v2/internal/jobs_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_JOBS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_JOBS_STUB_H +#include "google/cloud/run/v2/execution.pb.h" +#include "google/cloud/run/v2/job.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/jobs_stub_factory.cc b/google/cloud/run/v2/internal/jobs_stub_factory.cc index 25ce80b2fa001..5102aa82bc8e2 100644 --- a/google/cloud/run/v2/internal/jobs_stub_factory.cc +++ b/google/cloud/run/v2/internal/jobs_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/run/v2/internal/jobs_metadata_decorator.h" #include "google/cloud/run/v2/internal/jobs_stub.h" #include "google/cloud/run/v2/internal/jobs_tracing_stub.h" +#include "google/cloud/run/v2/job.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/jobs_tracing_connection.cc b/google/cloud/run/v2/internal/jobs_tracing_connection.cc index addfcfcfe6685..9b9463d97def7 100644 --- a/google/cloud/run/v2/internal/jobs_tracing_connection.cc +++ b/google/cloud/run/v2/internal/jobs_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobsTracingConnection::JobsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -187,15 +185,11 @@ StatusOr JobsTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/run/v2/internal/jobs_tracing_connection.h b/google/cloud/run/v2/internal/jobs_tracing_connection.h index 328cc1e2152d1..6a896fb54ac55 100644 --- a/google/cloud/run/v2/internal/jobs_tracing_connection.h +++ b/google/cloud/run/v2/internal/jobs_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobsTracingConnection : public run_v2::JobsConnection { public: ~JobsTracingConnection() override = default; @@ -109,8 +107,6 @@ class JobsTracingConnection : public run_v2::JobsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/run/v2/internal/jobs_tracing_stub.cc b/google/cloud/run/v2/internal/jobs_tracing_stub.cc index bfd5aa7af16ba..60738d2e88417 100644 --- a/google/cloud/run/v2/internal/jobs_tracing_stub.cc +++ b/google/cloud/run/v2/internal/jobs_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobsTracingStub::JobsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -249,14 +247,8 @@ future JobsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobsTracingStub(std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/jobs_tracing_stub.h b/google/cloud/run/v2/internal/jobs_tracing_stub.h index 3bff4cccac581..fb403efc9fb86 100644 --- a/google/cloud/run/v2/internal/jobs_tracing_stub.h +++ b/google/cloud/run/v2/internal/jobs_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobsTracingStub : public JobsStub { public: ~JobsTracingStub() override = default; @@ -132,8 +130,6 @@ class JobsTracingStub : public JobsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/run/v2/internal/revisions_auth_decorator.cc b/google/cloud/run/v2/internal/revisions_auth_decorator.cc index c84a135a697d7..1e2b61ece3c76 100644 --- a/google/cloud/run/v2/internal/revisions_auth_decorator.cc +++ b/google/cloud/run/v2/internal/revisions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/run/v2/revision.proto #include "google/cloud/run/v2/internal/revisions_auth_decorator.h" -#include +#include "google/cloud/run/v2/revision.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/revisions_auth_decorator.h b/google/cloud/run/v2/internal/revisions_auth_decorator.h index 97e08c530e1b5..f0a647a03ca16 100644 --- a/google/cloud/run/v2/internal/revisions_auth_decorator.h +++ b/google/cloud/run/v2/internal/revisions_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/revisions_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/revisions_connection_impl.h b/google/cloud/run/v2/internal/revisions_connection_impl.h index b3fee19a82ca3..b2554dcf7f8f7 100644 --- a/google/cloud/run/v2/internal/revisions_connection_impl.h +++ b/google/cloud/run/v2/internal/revisions_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/internal/revisions_logging_decorator.cc b/google/cloud/run/v2/internal/revisions_logging_decorator.cc index c8573540b970e..054c32fe931fc 100644 --- a/google/cloud/run/v2/internal/revisions_logging_decorator.cc +++ b/google/cloud/run/v2/internal/revisions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/run/v2/revision.proto #include "google/cloud/run/v2/internal/revisions_logging_decorator.h" +#include "google/cloud/run/v2/revision.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/revisions_logging_decorator.h b/google/cloud/run/v2/internal/revisions_logging_decorator.h index ba4e2bd4a3ecd..fb3ec62fd2f22 100644 --- a/google/cloud/run/v2/internal/revisions_logging_decorator.h +++ b/google/cloud/run/v2/internal/revisions_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/revisions_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/revisions_metadata_decorator.cc b/google/cloud/run/v2/internal/revisions_metadata_decorator.cc index f2554e961d6e7..eaaf3a52f500f 100644 --- a/google/cloud/run/v2/internal/revisions_metadata_decorator.cc +++ b/google/cloud/run/v2/internal/revisions_metadata_decorator.cc @@ -17,6 +17,7 @@ // source: google/cloud/run/v2/revision.proto #include "google/cloud/run/v2/internal/revisions_metadata_decorator.h" +#include "google/cloud/run/v2/revision.grpc.pb.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -24,7 +25,6 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/revisions_metadata_decorator.h b/google/cloud/run/v2/internal/revisions_metadata_decorator.h index 63305f405a640..a822f0f026e25 100644 --- a/google/cloud/run/v2/internal/revisions_metadata_decorator.h +++ b/google/cloud/run/v2/internal/revisions_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/revisions_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/revisions_stub.cc b/google/cloud/run/v2/internal/revisions_stub.cc index c7e1f2068adf3..b04a7df9a5bc4 100644 --- a/google/cloud/run/v2/internal/revisions_stub.cc +++ b/google/cloud/run/v2/internal/revisions_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/run/v2/revision.proto #include "google/cloud/run/v2/internal/revisions_stub.h" +#include "google/cloud/run/v2/revision.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/revisions_stub.h b/google/cloud/run/v2/internal/revisions_stub.h index 3b55004d96000..9e2bb2150c9b1 100644 --- a/google/cloud/run/v2/internal/revisions_stub.h +++ b/google/cloud/run/v2/internal/revisions_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_REVISIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_REVISIONS_STUB_H +#include "google/cloud/run/v2/revision.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/revisions_stub_factory.cc b/google/cloud/run/v2/internal/revisions_stub_factory.cc index d60184965d83a..cbbe9f8dd056b 100644 --- a/google/cloud/run/v2/internal/revisions_stub_factory.cc +++ b/google/cloud/run/v2/internal/revisions_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/run/v2/internal/revisions_metadata_decorator.h" #include "google/cloud/run/v2/internal/revisions_stub.h" #include "google/cloud/run/v2/internal/revisions_tracing_stub.h" +#include "google/cloud/run/v2/revision.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/revisions_tracing_connection.cc b/google/cloud/run/v2/internal/revisions_tracing_connection.cc index b09e5a6e2e817..182317d74ef64 100644 --- a/google/cloud/run/v2/internal/revisions_tracing_connection.cc +++ b/google/cloud/run/v2/internal/revisions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RevisionsTracingConnection::RevisionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -110,15 +108,11 @@ RevisionsTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRevisionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/run/v2/internal/revisions_tracing_connection.h b/google/cloud/run/v2/internal/revisions_tracing_connection.h index d8e9452fa01e5..058fd393928c9 100644 --- a/google/cloud/run/v2/internal/revisions_tracing_connection.h +++ b/google/cloud/run/v2/internal/revisions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RevisionsTracingConnection : public run_v2::RevisionsConnection { public: ~RevisionsTracingConnection() override = default; @@ -71,8 +69,6 @@ class RevisionsTracingConnection : public run_v2::RevisionsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/run/v2/internal/revisions_tracing_stub.cc b/google/cloud/run/v2/internal/revisions_tracing_stub.cc index 91598a92cd0bb..93313951d4ab2 100644 --- a/google/cloud/run/v2/internal/revisions_tracing_stub.cc +++ b/google/cloud/run/v2/internal/revisions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RevisionsTracingStub::RevisionsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -153,15 +151,9 @@ future RevisionsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRevisionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/revisions_tracing_stub.h b/google/cloud/run/v2/internal/revisions_tracing_stub.h index 8a50b99766932..e38bf3ef6d04a 100644 --- a/google/cloud/run/v2/internal/revisions_tracing_stub.h +++ b/google/cloud/run/v2/internal/revisions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RevisionsTracingStub : public RevisionsStub { public: ~RevisionsTracingStub() override = default; @@ -90,8 +88,6 @@ class RevisionsTracingStub : public RevisionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/run/v2/internal/services_auth_decorator.cc b/google/cloud/run/v2/internal/services_auth_decorator.cc index fc1e84a331090..1afc43c89112e 100644 --- a/google/cloud/run/v2/internal/services_auth_decorator.cc +++ b/google/cloud/run/v2/internal/services_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/run/v2/service.proto #include "google/cloud/run/v2/internal/services_auth_decorator.h" -#include +#include "google/cloud/run/v2/service.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/services_auth_decorator.h b/google/cloud/run/v2/internal/services_auth_decorator.h index cf7692013a01c..2c16a5d5aa817 100644 --- a/google/cloud/run/v2/internal/services_auth_decorator.h +++ b/google/cloud/run/v2/internal/services_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/services_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/services_connection_impl.h b/google/cloud/run/v2/internal/services_connection_impl.h index 073e2d8dd1d2e..95b11d8f6ad0d 100644 --- a/google/cloud/run/v2/internal/services_connection_impl.h +++ b/google/cloud/run/v2/internal/services_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/internal/services_logging_decorator.cc b/google/cloud/run/v2/internal/services_logging_decorator.cc index 34e23bff120e1..95dd2bdcd38c8 100644 --- a/google/cloud/run/v2/internal/services_logging_decorator.cc +++ b/google/cloud/run/v2/internal/services_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/run/v2/service.proto #include "google/cloud/run/v2/internal/services_logging_decorator.h" +#include "google/cloud/run/v2/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/services_logging_decorator.h b/google/cloud/run/v2/internal/services_logging_decorator.h index c1e54a1b202cc..7fba8b5d288b5 100644 --- a/google/cloud/run/v2/internal/services_logging_decorator.h +++ b/google/cloud/run/v2/internal/services_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/services_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/services_metadata_decorator.cc b/google/cloud/run/v2/internal/services_metadata_decorator.cc index d0506876bf3ab..35519cfdc0bad 100644 --- a/google/cloud/run/v2/internal/services_metadata_decorator.cc +++ b/google/cloud/run/v2/internal/services_metadata_decorator.cc @@ -17,6 +17,7 @@ // source: google/cloud/run/v2/service.proto #include "google/cloud/run/v2/internal/services_metadata_decorator.h" +#include "google/cloud/run/v2/service.grpc.pb.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -24,7 +25,6 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/services_metadata_decorator.h b/google/cloud/run/v2/internal/services_metadata_decorator.h index 1678c9d73f02d..3f60c30d781ae 100644 --- a/google/cloud/run/v2/internal/services_metadata_decorator.h +++ b/google/cloud/run/v2/internal/services_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/run/v2/internal/services_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/internal/services_stub.cc b/google/cloud/run/v2/internal/services_stub.cc index 0b1a81abce56b..b093591ef3111 100644 --- a/google/cloud/run/v2/internal/services_stub.cc +++ b/google/cloud/run/v2/internal/services_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/run/v2/service.proto #include "google/cloud/run/v2/internal/services_stub.h" +#include "google/cloud/run/v2/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/services_stub.h b/google/cloud/run/v2/internal/services_stub.h index 92df911759265..7abe5a48478dc 100644 --- a/google/cloud/run/v2/internal/services_stub.h +++ b/google/cloud/run/v2/internal/services_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_SERVICES_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_SERVICES_STUB_H +#include "google/cloud/run/v2/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/services_stub_factory.cc b/google/cloud/run/v2/internal/services_stub_factory.cc index 4b8606e3871e8..688bbbfbfd94c 100644 --- a/google/cloud/run/v2/internal/services_stub_factory.cc +++ b/google/cloud/run/v2/internal/services_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/run/v2/internal/services_metadata_decorator.h" #include "google/cloud/run/v2/internal/services_stub.h" #include "google/cloud/run/v2/internal/services_tracing_stub.h" +#include "google/cloud/run/v2/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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/services_tracing_connection.cc b/google/cloud/run/v2/internal/services_tracing_connection.cc index 38938fb7b26f6..f6d0361e3b6da 100644 --- a/google/cloud/run/v2/internal/services_tracing_connection.cc +++ b/google/cloud/run/v2/internal/services_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServicesTracingConnection::ServicesTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -178,15 +176,11 @@ ServicesTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServicesTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/run/v2/internal/services_tracing_connection.h b/google/cloud/run/v2/internal/services_tracing_connection.h index f592d61140e05..3b28cce779004 100644 --- a/google/cloud/run/v2/internal/services_tracing_connection.h +++ b/google/cloud/run/v2/internal/services_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServicesTracingConnection : public run_v2::ServicesConnection { public: ~ServicesTracingConnection() override = default; @@ -100,8 +98,6 @@ class ServicesTracingConnection : public run_v2::ServicesConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/run/v2/internal/services_tracing_stub.cc b/google/cloud/run/v2/internal/services_tracing_stub.cc index d5a6d529c5505..c971784c2b523 100644 --- a/google/cloud/run/v2/internal/services_tracing_stub.cc +++ b/google/cloud/run/v2/internal/services_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServicesTracingStub::ServicesTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -236,15 +234,9 @@ future ServicesTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServicesTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/services_tracing_stub.h b/google/cloud/run/v2/internal/services_tracing_stub.h index 6d04b263bdd8d..bc2738c4c9987 100644 --- a/google/cloud/run/v2/internal/services_tracing_stub.h +++ b/google/cloud/run/v2/internal/services_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServicesTracingStub : public ServicesStub { public: ~ServicesTracingStub() override = default; @@ -122,8 +120,6 @@ class ServicesTracingStub : public ServicesStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/run/v2/internal/tasks_auth_decorator.cc b/google/cloud/run/v2/internal/tasks_auth_decorator.cc index a29dd3084fe7c..83aad244608ae 100644 --- a/google/cloud/run/v2/internal/tasks_auth_decorator.cc +++ b/google/cloud/run/v2/internal/tasks_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/run/v2/task.proto #include "google/cloud/run/v2/internal/tasks_auth_decorator.h" -#include +#include "google/cloud/run/v2/task.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/tasks_logging_decorator.cc b/google/cloud/run/v2/internal/tasks_logging_decorator.cc index 017961e18d01d..340b024597a4b 100644 --- a/google/cloud/run/v2/internal/tasks_logging_decorator.cc +++ b/google/cloud/run/v2/internal/tasks_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/run/v2/task.proto #include "google/cloud/run/v2/internal/tasks_logging_decorator.h" +#include "google/cloud/run/v2/task.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/run/v2/internal/tasks_metadata_decorator.cc b/google/cloud/run/v2/internal/tasks_metadata_decorator.cc index aa5d2f265ef80..4623083da2f7a 100644 --- a/google/cloud/run/v2/internal/tasks_metadata_decorator.cc +++ b/google/cloud/run/v2/internal/tasks_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/run/v2/task.proto #include "google/cloud/run/v2/internal/tasks_metadata_decorator.h" +#include "google/cloud/run/v2/task.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 #include #include #include diff --git a/google/cloud/run/v2/internal/tasks_stub.cc b/google/cloud/run/v2/internal/tasks_stub.cc index 140a225d3265d..9918059f7d0e1 100644 --- a/google/cloud/run/v2/internal/tasks_stub.cc +++ b/google/cloud/run/v2/internal/tasks_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/run/v2/task.proto #include "google/cloud/run/v2/internal/tasks_stub.h" +#include "google/cloud/run/v2/task.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/run/v2/internal/tasks_stub.h b/google/cloud/run/v2/internal/tasks_stub.h index fad496b1f463e..a6bd510761891 100644 --- a/google/cloud/run/v2/internal/tasks_stub.h +++ b/google/cloud/run/v2/internal/tasks_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_TASKS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_INTERNAL_TASKS_STUB_H +#include "google/cloud/run/v2/task.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/tasks_stub_factory.cc b/google/cloud/run/v2/internal/tasks_stub_factory.cc index 712a090c80198..9afa10ac363fe 100644 --- a/google/cloud/run/v2/internal/tasks_stub_factory.cc +++ b/google/cloud/run/v2/internal/tasks_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/run/v2/internal/tasks_metadata_decorator.h" #include "google/cloud/run/v2/internal/tasks_stub.h" #include "google/cloud/run/v2/internal/tasks_tracing_stub.h" +#include "google/cloud/run/v2/task.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/run/v2/internal/tasks_tracing_connection.cc b/google/cloud/run/v2/internal/tasks_tracing_connection.cc index 4cf3c84000cce..5900f8099b787 100644 --- a/google/cloud/run/v2/internal/tasks_tracing_connection.cc +++ b/google/cloud/run/v2/internal/tasks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TasksTracingConnection::TasksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -80,15 +78,11 @@ StatusOr TasksTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTasksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/run/v2/internal/tasks_tracing_connection.h b/google/cloud/run/v2/internal/tasks_tracing_connection.h index 870ced612e677..1135adb5a2b9f 100644 --- a/google/cloud/run/v2/internal/tasks_tracing_connection.h +++ b/google/cloud/run/v2/internal/tasks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TasksTracingConnection : public run_v2::TasksConnection { public: ~TasksTracingConnection() override = default; @@ -61,8 +59,6 @@ class TasksTracingConnection : public run_v2::TasksConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/run/v2/internal/tasks_tracing_stub.cc b/google/cloud/run/v2/internal/tasks_tracing_stub.cc index 2ce99b4b7c0b5..139b1c1f066c3 100644 --- a/google/cloud/run/v2/internal/tasks_tracing_stub.cc +++ b/google/cloud/run/v2/internal/tasks_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TasksTracingStub::TasksTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -96,15 +94,9 @@ StatusOr TasksTracingStub::WaitOperation( child_->WaitOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTasksTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/tasks_tracing_stub.h b/google/cloud/run/v2/internal/tasks_tracing_stub.h index ab65a7d853384..e3b6e193b5461 100644 --- a/google/cloud/run/v2/internal/tasks_tracing_stub.h +++ b/google/cloud/run/v2/internal/tasks_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace run_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TasksTracingStub : public TasksStub { public: ~TasksTracingStub() override = default; @@ -68,8 +66,6 @@ class TasksTracingStub : public TasksStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/run/v2/jobs_client.h b/google/cloud/run/v2/jobs_client.h index 31e03722c0321..0a3b75e62b488 100644 --- a/google/cloud/run/v2/jobs_client.h +++ b/google/cloud/run/v2/jobs_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/jobs_connection.h b/google/cloud/run/v2/jobs_connection.h index f11d24f829f92..a0ac54d22c0d8 100644 --- a/google/cloud/run/v2/jobs_connection.h +++ b/google/cloud/run/v2/jobs_connection.h @@ -19,7 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_JOBS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_JOBS_CONNECTION_H +#include "google/cloud/run/v2/execution.pb.h" #include "google/cloud/run/v2/internal/jobs_retry_traits.h" +#include "google/cloud/run/v2/job.pb.h" #include "google/cloud/run/v2/jobs_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,9 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/jobs_connection_idempotency_policy.h b/google/cloud/run/v2/jobs_connection_idempotency_policy.h index 240b37d89f398..808acf3e4ff99 100644 --- a/google/cloud/run/v2/jobs_connection_idempotency_policy.h +++ b/google/cloud/run/v2/jobs_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_JOBS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_JOBS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/run/v2/job.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/revisions_client.h b/google/cloud/run/v2/revisions_client.h index 4fed4e28db90c..8ceeccf7d1a91 100644 --- a/google/cloud/run/v2/revisions_client.h +++ b/google/cloud/run/v2/revisions_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/revisions_connection.h b/google/cloud/run/v2/revisions_connection.h index 3919c4799839e..9b537642439ca 100644 --- a/google/cloud/run/v2/revisions_connection.h +++ b/google/cloud/run/v2/revisions_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_REVISIONS_CONNECTION_H #include "google/cloud/run/v2/internal/revisions_retry_traits.h" +#include "google/cloud/run/v2/revision.pb.h" #include "google/cloud/run/v2/revisions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/revisions_connection_idempotency_policy.h b/google/cloud/run/v2/revisions_connection_idempotency_policy.h index 985abf0b01fa2..b208faf9c21f0 100644 --- a/google/cloud/run/v2/revisions_connection_idempotency_policy.h +++ b/google/cloud/run/v2/revisions_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_REVISIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_REVISIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/run/v2/revision.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/services_client.h b/google/cloud/run/v2/services_client.h index 1d8b685ad42eb..f0a61c7bd8afb 100644 --- a/google/cloud/run/v2/services_client.h +++ b/google/cloud/run/v2/services_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/run/v2/services_connection.h b/google/cloud/run/v2/services_connection.h index 2d72889db8f74..6045a2f7a8a5f 100644 --- a/google/cloud/run/v2/services_connection.h +++ b/google/cloud/run/v2/services_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_SERVICES_CONNECTION_H #include "google/cloud/run/v2/internal/services_retry_traits.h" +#include "google/cloud/run/v2/service.pb.h" #include "google/cloud/run/v2/services_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/services_connection_idempotency_policy.h b/google/cloud/run/v2/services_connection_idempotency_policy.h index 25e9c545e34e1..c8db086991353 100644 --- a/google/cloud/run/v2/services_connection_idempotency_policy.h +++ b/google/cloud/run/v2/services_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/run/v2/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/run/v2/tasks_connection.h b/google/cloud/run/v2/tasks_connection.h index 7360236798918..817b7499a1181 100644 --- a/google/cloud/run/v2/tasks_connection.h +++ b/google/cloud/run/v2/tasks_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_TASKS_CONNECTION_H #include "google/cloud/run/v2/internal/tasks_retry_traits.h" +#include "google/cloud/run/v2/task.pb.h" #include "google/cloud/run/v2/tasks_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/run/v2/tasks_connection_idempotency_policy.h b/google/cloud/run/v2/tasks_connection_idempotency_policy.h index 5ba9ae37de252..0c41873b4eae7 100644 --- a/google/cloud/run/v2/tasks_connection_idempotency_policy.h +++ b/google/cloud/run/v2/tasks_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_V2_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/run/v2/task.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/scheduler/BUILD.bazel b/google/cloud/scheduler/BUILD.bazel index d2f15d3dc935d..345f4af0aeaea 100644 --- a/google/cloud/scheduler/BUILD.bazel +++ b/google/cloud/scheduler/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/scheduler/v1:scheduler_cc_grpc", + "@googleapis//google/cloud/scheduler/v1:scheduler_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/scheduler/quickstart/.bazelrc b/google/cloud/scheduler/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/scheduler/quickstart/.bazelrc +++ b/google/cloud/scheduler/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/scheduler/v1/cloud_scheduler_connection.h b/google/cloud/scheduler/v1/cloud_scheduler_connection.h index 91550e83073be..2bd216ae4a78d 100644 --- a/google/cloud/scheduler/v1/cloud_scheduler_connection.h +++ b/google/cloud/scheduler/v1/cloud_scheduler_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_V1_CLOUD_SCHEDULER_CONNECTION_H #include "google/cloud/scheduler/v1/cloud_scheduler_connection_idempotency_policy.h" +#include "google/cloud/scheduler/v1/cloudscheduler.pb.h" #include "google/cloud/scheduler/v1/internal/cloud_scheduler_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/scheduler/v1/cloud_scheduler_connection_idempotency_policy.h b/google/cloud/scheduler/v1/cloud_scheduler_connection_idempotency_policy.h index 22e095e371197..edfdd4a997e66 100644 --- a/google/cloud/scheduler/v1/cloud_scheduler_connection_idempotency_policy.h +++ b/google/cloud/scheduler/v1/cloud_scheduler_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_V1_CLOUD_SCHEDULER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_V1_CLOUD_SCHEDULER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/scheduler/v1/cloudscheduler.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_auth_decorator.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_auth_decorator.cc index cf53941711794..8218fc9e82db8 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_auth_decorator.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/scheduler/v1/cloudscheduler.proto #include "google/cloud/scheduler/v1/internal/cloud_scheduler_auth_decorator.h" -#include +#include "google/cloud/scheduler/v1/cloudscheduler.grpc.pb.h" #include #include diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_logging_decorator.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_logging_decorator.cc index ce049626513ad..22877c408fec2 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_logging_decorator.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/scheduler/v1/cloudscheduler.proto #include "google/cloud/scheduler/v1/internal/cloud_scheduler_logging_decorator.h" +#include "google/cloud/scheduler/v1/cloudscheduler.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_metadata_decorator.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_metadata_decorator.cc index 75807d95ec4d0..c24014c027503 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_metadata_decorator.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/scheduler/v1/cloudscheduler.proto #include "google/cloud/scheduler/v1/internal/cloud_scheduler_metadata_decorator.h" +#include "google/cloud/scheduler/v1/cloudscheduler.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 #include #include #include diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.cc index 3f92cfe48b930..0429d9418571e 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/scheduler/v1/cloudscheduler.proto #include "google/cloud/scheduler/v1/internal/cloud_scheduler_stub.h" +#include "google/cloud/scheduler/v1/cloudscheduler.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.h b/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.h index 476a9c66244e9..81947abfbf456 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.h +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_V1_INTERNAL_CLOUD_SCHEDULER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_V1_INTERNAL_CLOUD_SCHEDULER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/scheduler/v1/cloudscheduler.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_stub_factory.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_stub_factory.cc index b5439a4121c8c..4c7b14e887137 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_stub_factory.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/scheduler/v1/cloudscheduler.proto #include "google/cloud/scheduler/v1/internal/cloud_scheduler_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/scheduler/v1/cloudscheduler.grpc.pb.h" #include "google/cloud/scheduler/v1/internal/cloud_scheduler_auth_decorator.h" #include "google/cloud/scheduler/v1/internal/cloud_scheduler_logging_decorator.h" #include "google/cloud/scheduler/v1/internal/cloud_scheduler_metadata_decorator.h" @@ -28,8 +30,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include #include #include diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc index 4b27e7b1c7148..79bc0eb6bce18 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace scheduler_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudSchedulerTracingConnection::CloudSchedulerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -126,16 +124,12 @@ CloudSchedulerTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudSchedulerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.h b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.h index d59c57c27f28f..fe19d77cafec6 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.h +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace scheduler_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudSchedulerTracingConnection : public scheduler_v1::CloudSchedulerConnection { public: @@ -74,8 +72,6 @@ class CloudSchedulerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.cc index 4846d56ed0af9..daaf8c5359be8 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace scheduler_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudSchedulerTracingStub::CloudSchedulerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -148,15 +146,9 @@ CloudSchedulerTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudSchedulerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.h b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.h index 2bf6cc785e00a..518d8fc116335 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.h +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace scheduler_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudSchedulerTracingStub : public CloudSchedulerStub { public: ~CloudSchedulerTracingStub() override = default; @@ -84,8 +82,6 @@ class CloudSchedulerTracingStub : public CloudSchedulerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/secretmanager/BUILD.bazel b/google/cloud/secretmanager/BUILD.bazel index e54f4680e3542..7000afebeaa96 100644 --- a/google/cloud/secretmanager/BUILD.bazel +++ b/google/cloud/secretmanager/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/secretmanager/v1:secretmanager_cc_grpc", + "@googleapis//google/cloud/secretmanager/v1:secretmanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/secretmanager/quickstart/.bazelrc b/google/cloud/secretmanager/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/secretmanager/quickstart/.bazelrc +++ b/google/cloud/secretmanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_auth_decorator.cc b/google/cloud/secretmanager/v1/internal/secret_manager_auth_decorator.cc index 0a108b16dc6d0..547ff1116d5f3 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_auth_decorator.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/secretmanager/v1/service.proto #include "google/cloud/secretmanager/v1/internal/secret_manager_auth_decorator.h" -#include +#include "google/cloud/secretmanager/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_logging_decorator.cc b/google/cloud/secretmanager/v1/internal/secret_manager_logging_decorator.cc index 937554e35ab1e..1b2492e6b5c5c 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_logging_decorator.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/secretmanager/v1/service.proto #include "google/cloud/secretmanager/v1/internal/secret_manager_logging_decorator.h" +#include "google/cloud/secretmanager/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_metadata_decorator.cc b/google/cloud/secretmanager/v1/internal/secret_manager_metadata_decorator.cc index b10049334d21e..242dd13b93943 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_metadata_decorator.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/secretmanager/v1/service.proto #include "google/cloud/secretmanager/v1/internal/secret_manager_metadata_decorator.h" +#include "google/cloud/secretmanager/v1/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 #include #include #include diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_stub.cc b/google/cloud/secretmanager/v1/internal/secret_manager_stub.cc index 19c110253915e..3a7bf1b9521a6 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_stub.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/secretmanager/v1/service.proto #include "google/cloud/secretmanager/v1/internal/secret_manager_stub.h" +#include "google/cloud/secretmanager/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_stub.h b/google/cloud/secretmanager/v1/internal/secret_manager_stub.h index d910ac5d5f498..c07651c0a2235 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_stub.h +++ b/google/cloud/secretmanager/v1/internal/secret_manager_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_V1_INTERNAL_SECRET_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_V1_INTERNAL_SECRET_MANAGER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/secretmanager/v1/service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_stub_factory.cc b/google/cloud/secretmanager/v1/internal/secret_manager_stub_factory.cc index d4461b4ed80e5..250c83baef63b 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_stub_factory.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_stub_factory.cc @@ -17,19 +17,19 @@ // source: google/cloud/secretmanager/v1/service.proto #include "google/cloud/secretmanager/v1/internal/secret_manager_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/secretmanager/v1/internal/secret_manager_auth_decorator.h" #include "google/cloud/secretmanager/v1/internal/secret_manager_logging_decorator.h" #include "google/cloud/secretmanager/v1/internal/secret_manager_metadata_decorator.h" #include "google/cloud/secretmanager/v1/internal/secret_manager_stub.h" #include "google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.h" +#include "google/cloud/secretmanager/v1/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 -#include #include #include diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc index 86775307618e2..1aac92d620960 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace secretmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecretManagerServiceTracingConnection::SecretManagerServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -196,17 +194,13 @@ SecretManagerServiceTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecretManagerServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.h b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.h index 038bafd99e049..1d69be01eda88 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.h +++ b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace secretmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecretManagerServiceTracingConnection : public secretmanager_v1::SecretManagerServiceConnection { public: @@ -109,8 +107,6 @@ class SecretManagerServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.cc b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.cc index 92888a8899b78..0ef431af8d0fb 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace secretmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecretManagerServiceTracingStub::SecretManagerServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -244,15 +242,9 @@ SecretManagerServiceTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecretManagerServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.h b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.h index 73a6793ff8cde..66d4a33aaaca9 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.h +++ b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace secretmanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecretManagerServiceTracingStub : public SecretManagerServiceStub { public: ~SecretManagerServiceTracingStub() override = default; @@ -129,8 +127,6 @@ class SecretManagerServiceTracingStub : public SecretManagerServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/secretmanager/v1/secret_manager_connection.h b/google/cloud/secretmanager/v1/secret_manager_connection.h index 6fb96415a12ef..10a6745e73af5 100644 --- a/google/cloud/secretmanager/v1/secret_manager_connection.h +++ b/google/cloud/secretmanager/v1/secret_manager_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/secretmanager/v1/internal/secret_manager_retry_traits.h" #include "google/cloud/secretmanager/v1/secret_manager_connection_idempotency_policy.h" +#include "google/cloud/secretmanager/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/secretmanager/v1/secret_manager_connection_idempotency_policy.h b/google/cloud/secretmanager/v1/secret_manager_connection_idempotency_policy.h index 1a55e8e9c2ef4..482a07b7742e6 100644 --- a/google/cloud/secretmanager/v1/secret_manager_connection_idempotency_policy.h +++ b/google/cloud/secretmanager/v1/secret_manager_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_V1_SECRET_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_V1_SECRET_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/secretmanager/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/securesourcemanager/BUILD.bazel b/google/cloud/securesourcemanager/BUILD.bazel index 186fabf4020bb..f9fe82b0d8601 100644 --- a/google/cloud/securesourcemanager/BUILD.bazel +++ b/google/cloud/securesourcemanager/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/securesourcemanager/v1:securesourcemanager_cc_grpc", + "@googleapis//google/cloud/securesourcemanager/v1:securesourcemanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/securesourcemanager/quickstart/.bazelrc b/google/cloud/securesourcemanager/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/securesourcemanager/quickstart/.bazelrc +++ b/google/cloud/securesourcemanager/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.cc index 0675c198ce193..21e320eecf2b9 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/securesourcemanager/v1/secure_source_manager.proto #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.h" -#include +#include "google/cloud/securesourcemanager/v1/secure_source_manager.grpc.pb.h" #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.h index 7d83bf6c137cb..9cd6ba2c3dbbc 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_connection_impl.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_connection_impl.h index 889c464395405..237119b748711 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_connection_impl.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.cc index 4f84a0525f70e..beca7ea14466d 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/securesourcemanager/v1/secure_source_manager.proto #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.h index 85df78a00f20f..af394f5652fd0 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.cc index b6afb1fe39022..c2108b7dbe10f 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/securesourcemanager/v1/secure_source_manager.proto #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.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 #include #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.h index fed56c12b3a39..e70766d171b94 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc index dfccc9a7aabd4..aa17c8f9c3b45 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/securesourcemanager/v1/secure_source_manager.proto #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h index 98b7f139e030c..aa5838b9c4d44 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURESOURCEMANAGER_V1_INTERNAL_SECURE_SOURCE_MANAGER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURESOURCEMANAGER_V1_INTERNAL_SECURE_SOURCE_MANAGER_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc index 124bd48abe5af..2d024fcc8970c 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/securesourcemanager/v1/secure_source_manager.proto #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_auth_decorator.h" #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_logging_decorator.h" #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_metadata_decorator.h" #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h" #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc index b2a94c6ee157a..b2ccc20a52533 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace securesourcemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecureSourceManagerTracingConnection::SecureSourceManagerTracingConnection( std::shared_ptr child) @@ -1353,18 +1351,14 @@ Status SecureSourceManagerTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecureSourceManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.h index feddef996ec36..7882479a18316 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace securesourcemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecureSourceManagerTracingConnection : public securesourcemanager_v1::SecureSourceManagerConnection { public: @@ -555,8 +553,6 @@ class SecureSourceManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc index 26ade867630af..149fd33f874cf 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace securesourcemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecureSourceManagerTracingStub::SecureSourceManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1364,15 +1362,9 @@ future SecureSourceManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecureSourceManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.h index 12621e8e026c5..241b2a410f9c9 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace securesourcemanager_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecureSourceManagerTracingStub : public SecureSourceManagerStub { public: ~SecureSourceManagerTracingStub() override = default; @@ -577,8 +575,6 @@ class SecureSourceManagerTracingStub : public SecureSourceManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/securesourcemanager/v1/secure_source_manager_client.h b/google/cloud/securesourcemanager/v1/secure_source_manager_client.h index b72ae781e6e82..4bfc19fe73fed 100644 --- a/google/cloud/securesourcemanager/v1/secure_source_manager_client.h +++ b/google/cloud/securesourcemanager/v1/secure_source_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securesourcemanager/v1/secure_source_manager_connection.h b/google/cloud/securesourcemanager/v1/secure_source_manager_connection.h index 0c0d461e30bfd..ca25a5b9cac65 100644 --- a/google/cloud/securesourcemanager/v1/secure_source_manager_connection.h +++ b/google/cloud/securesourcemanager/v1/secure_source_manager_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURESOURCEMANAGER_V1_SECURE_SOURCE_MANAGER_CONNECTION_H #include "google/cloud/securesourcemanager/v1/internal/secure_source_manager_retry_traits.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.pb.h" #include "google/cloud/securesourcemanager/v1/secure_source_manager_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securesourcemanager/v1/secure_source_manager_connection_idempotency_policy.h b/google/cloud/securesourcemanager/v1/secure_source_manager_connection_idempotency_policy.h index e16db34d16f47..a81dbc60a06af 100644 --- a/google/cloud/securesourcemanager/v1/secure_source_manager_connection_idempotency_policy.h +++ b/google/cloud/securesourcemanager/v1/secure_source_manager_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURESOURCEMANAGER_V1_SECURE_SOURCE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURESOURCEMANAGER_V1_SECURE_SOURCE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/securesourcemanager/v1/secure_source_manager.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycenter/BUILD.bazel b/google/cloud/securitycenter/BUILD.bazel index 30a842d8bf8bc..8f6f48d0a3d81 100644 --- a/google/cloud/securitycenter/BUILD.bazel +++ b/google/cloud/securitycenter/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/securitycenter/v1:securitycenter_cc_grpc", - "@com_google_googleapis//google/cloud/securitycenter/v2:securitycenter_cc_grpc", + "@googleapis//google/cloud/securitycenter/v1:securitycenter_cc_grpc", + "@googleapis//google/cloud/securitycenter/v2:securitycenter_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/securitycenter/quickstart/.bazelrc b/google/cloud/securitycenter/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/securitycenter/quickstart/.bazelrc +++ b/google/cloud/securitycenter/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc index c19357e2d6d7a..a963a35339f2c 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/securitycenter/v1/securitycenter_service.proto #include "google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h" -#include +#include "google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h index 87e661281d567..96743b6c9af32 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h +++ b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securitycenter/v1/internal/security_center_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h b/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h index e2a5bb014cdb3..58e9f478cbd86 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h +++ b/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc index 416c5c2f6dfe0..cc4f1a32f6cb0 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/securitycenter/v1/securitycenter_service.proto #include "google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h" +#include "google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h index aef83ffc98951..523387d064d48 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h +++ b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securitycenter/v1/internal/security_center_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc index 67b130e2c3b81..8e1743cebf0e3 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/securitycenter/v1/securitycenter_service.proto #include "google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h" +#include "google/cloud/securitycenter/v1/securitycenter_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 #include #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h index 5980fd8d9a8f8..9631a89ea48e4 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h +++ b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securitycenter/v1/internal/security_center_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub.cc b/google/cloud/securitycenter/v1/internal/security_center_stub.cc index 5d1b0d739b28f..804065c586ca0 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_stub.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/securitycenter/v1/securitycenter_service.proto #include "google/cloud/securitycenter/v1/internal/security_center_stub.h" +#include "google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub.h b/google/cloud/securitycenter/v1/internal/security_center_stub.h index d79cd749ae0a7..c85d4d7e7a225 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_stub.h +++ b/google/cloud/securitycenter/v1/internal/security_center_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_H +#include "google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc index 063f11fa446be..81dc53c5b4077 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h" #include "google/cloud/securitycenter/v1/internal/security_center_stub.h" #include "google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h" +#include "google/cloud/securitycenter/v1/securitycenter_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc index 9cd3719a3d721..666a34be1104e 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace securitycenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityCenterTracingConnection::SecurityCenterTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -816,16 +814,12 @@ Status SecurityCenterTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityCenterTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h index 84d81f11604cb..24c6471fca1d0 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h +++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace securitycenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityCenterTracingConnection : public securitycenter_v1::SecurityCenterConnection { public: @@ -383,8 +381,6 @@ class SecurityCenterTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc index f7ec9e3bfe555..7971859bbbe01 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace securitycenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityCenterTracingStub::SecurityCenterTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1001,15 +999,9 @@ future SecurityCenterTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityCenterTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h index e254e1ec7d0fa..da1f767637c25 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h +++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace securitycenter_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityCenterTracingStub : public SecurityCenterStub { public: ~SecurityCenterTracingStub() override = default; @@ -462,8 +460,6 @@ class SecurityCenterTracingStub : public SecurityCenterStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/securitycenter/v1/security_center_client.h b/google/cloud/securitycenter/v1/security_center_client.h index ac6335a048c5c..df5ec15dc5ea2 100644 --- a/google/cloud/securitycenter/v1/security_center_client.h +++ b/google/cloud/securitycenter/v1/security_center_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v1/security_center_connection.h b/google/cloud/securitycenter/v1/security_center_connection.h index 9d9666a00692b..2e43481c88551 100644 --- a/google/cloud/securitycenter/v1/security_center_connection.h +++ b/google/cloud/securitycenter/v1/security_center_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/securitycenter/v1/internal/security_center_retry_traits.h" #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h" +#include "google/cloud/securitycenter/v1/securitycenter_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h b/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h index f635efe79ee01..3c5fe8140252e 100644 --- a/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h +++ b/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.cc b/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.cc index ce468cb2cc479..cf5d27892d436 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/securitycenter/v2/securitycenter_service.proto #include "google/cloud/securitycenter/v2/internal/security_center_auth_decorator.h" -#include +#include "google/cloud/securitycenter/v2/securitycenter_service.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.h b/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.h index 7167ed38f3a19..f2b692dcf129c 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.h +++ b/google/cloud/securitycenter/v2/internal/security_center_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securitycenter/v2/internal/security_center_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_connection_impl.h b/google/cloud/securitycenter/v2/internal/security_center_connection_impl.h index 301df2b0759d9..197f81c965dd9 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_connection_impl.h +++ b/google/cloud/securitycenter/v2/internal/security_center_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.cc b/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.cc index d6c438fa5d6ee..c5dcbccb89de8 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/securitycenter/v2/securitycenter_service.proto #include "google/cloud/securitycenter/v2/internal/security_center_logging_decorator.h" +#include "google/cloud/securitycenter/v2/securitycenter_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.h b/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.h index 3d45e4b3e060f..d60760db7d852 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.h +++ b/google/cloud/securitycenter/v2/internal/security_center_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securitycenter/v2/internal/security_center_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.cc b/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.cc index 0f67bbff60a22..40f1839e783d6 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.cc @@ -17,6 +17,7 @@ // source: google/cloud/securitycenter/v2/securitycenter_service.proto #include "google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.h" +#include "google/cloud/securitycenter/v2/securitycenter_service.grpc.pb.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -24,7 +25,6 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.h b/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.h index 00571e354992e..c3deec302684e 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.h +++ b/google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/securitycenter/v2/internal/security_center_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_stub.cc b/google/cloud/securitycenter/v2/internal/security_center_stub.cc index b0463f5dc952f..d62f47acd24fd 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_stub.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/securitycenter/v2/securitycenter_service.proto #include "google/cloud/securitycenter/v2/internal/security_center_stub.h" +#include "google/cloud/securitycenter/v2/securitycenter_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_stub.h b/google/cloud/securitycenter/v2/internal/security_center_stub.h index e9a141bf926ea..c5fecdcd6988c 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_stub.h +++ b/google/cloud/securitycenter/v2/internal/security_center_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V2_INTERNAL_SECURITY_CENTER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V2_INTERNAL_SECURITY_CENTER_STUB_H +#include "google/cloud/securitycenter/v2/securitycenter_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc b/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc index c14c0ad6a439d..127daf56589ba 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/securitycenter/v2/internal/security_center_metadata_decorator.h" #include "google/cloud/securitycenter/v2/internal/security_center_stub.h" #include "google/cloud/securitycenter/v2/internal/security_center_tracing_stub.h" +#include "google/cloud/securitycenter/v2/securitycenter_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.cc b/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.cc index 70293c612b27d..36a56aef5ba10 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace securitycenter_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityCenterTracingConnection::SecurityCenterTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -491,16 +489,12 @@ Status SecurityCenterTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityCenterTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.h b/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.h index 85a35113c4d32..534a7c70144c7 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.h +++ b/google/cloud/securitycenter/v2/internal/security_center_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace securitycenter_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityCenterTracingConnection : public securitycenter_v2::SecurityCenterConnection { public: @@ -236,8 +234,6 @@ class SecurityCenterTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.cc b/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.cc index 61263b2ebedfd..856dfe1f5931c 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace securitycenter_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityCenterTracingStub::SecurityCenterTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -633,15 +631,9 @@ future SecurityCenterTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityCenterTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.h b/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.h index 5ba5c2df21fde..812ccbaa8a291 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.h +++ b/google/cloud/securitycenter/v2/internal/security_center_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace securitycenter_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityCenterTracingStub : public SecurityCenterStub { public: ~SecurityCenterTracingStub() override = default; @@ -293,8 +291,6 @@ class SecurityCenterTracingStub : public SecurityCenterStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/securitycenter/v2/security_center_client.h b/google/cloud/securitycenter/v2/security_center_client.h index caf5b652abdf9..98b79b2f6f0d4 100644 --- a/google/cloud/securitycenter/v2/security_center_client.h +++ b/google/cloud/securitycenter/v2/security_center_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/securitycenter/v2/security_center_connection.h b/google/cloud/securitycenter/v2/security_center_connection.h index 6974301db8d4b..4514020b3ff78 100644 --- a/google/cloud/securitycenter/v2/security_center_connection.h +++ b/google/cloud/securitycenter/v2/security_center_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/securitycenter/v2/internal/security_center_retry_traits.h" #include "google/cloud/securitycenter/v2/security_center_connection_idempotency_policy.h" +#include "google/cloud/securitycenter/v2/securitycenter_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycenter/v2/security_center_connection_idempotency_policy.h b/google/cloud/securitycenter/v2/security_center_connection_idempotency_policy.h index 874334a29dfef..607c46fd8ab65 100644 --- a/google/cloud/securitycenter/v2/security_center_connection_idempotency_policy.h +++ b/google/cloud/securitycenter/v2/security_center_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V2_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V2_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/securitycenter/v2/securitycenter_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/securitycentermanagement/BUILD.bazel b/google/cloud/securitycentermanagement/BUILD.bazel index f037e3967d9e5..b41b78be5efd1 100644 --- a/google/cloud/securitycentermanagement/BUILD.bazel +++ b/google/cloud/securitycentermanagement/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/securitycentermanagement/v1:securitycentermanagement_cc_grpc", + "@googleapis//google/cloud/securitycentermanagement/v1:securitycentermanagement_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/securitycentermanagement/quickstart/.bazelrc b/google/cloud/securitycentermanagement/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/securitycentermanagement/quickstart/.bazelrc +++ b/google/cloud/securitycentermanagement/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_auth_decorator.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_auth_decorator.cc index 64756ee568c9a..9d1053e00642e 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_auth_decorator.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_auth_decorator.cc @@ -18,7 +18,7 @@ // google/cloud/securitycentermanagement/v1/security_center_management.proto #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_auth_decorator.h" -#include +#include "google/cloud/securitycentermanagement/v1/security_center_management.grpc.pb.h" #include #include diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_logging_decorator.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_logging_decorator.cc index 1aaf5ee8b9275..04618b7627853 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_logging_decorator.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_logging_decorator.cc @@ -18,9 +18,9 @@ // google/cloud/securitycentermanagement/v1/security_center_management.proto #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_logging_decorator.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_metadata_decorator.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_metadata_decorator.cc index 1b502638ebadf..17af2e8d96ff7 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_metadata_decorator.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_metadata_decorator.cc @@ -18,12 +18,12 @@ // google/cloud/securitycentermanagement/v1/security_center_management.proto #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_metadata_decorator.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.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 #include #include #include diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.cc index 3e4375c9bfdb2..cefade7290d9d 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.cc @@ -18,9 +18,9 @@ // google/cloud/securitycentermanagement/v1/security_center_management.proto #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.h b/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.h index 4056c591eb945..814f337057d03 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.h +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.h @@ -20,11 +20,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTERMANAGEMENT_V1_INTERNAL_SECURITY_CENTER_MANAGEMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTERMANAGEMENT_V1_INTERNAL_SECURITY_CENTER_MANAGEMENT_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub_factory.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub_factory.cc index 4eb0865866361..66d8cbf677fc1 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub_factory.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_stub_factory.cc @@ -18,19 +18,19 @@ // google/cloud/securitycentermanagement/v1/security_center_management.proto #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_auth_decorator.h" #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_logging_decorator.h" #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_metadata_decorator.h" #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_stub.h" #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.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 -#include #include #include diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.cc index 7f853dbbd7807..260c33d8eabfe 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.cc @@ -28,8 +28,6 @@ namespace cloud { namespace securitycentermanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityCenterManagementTracingConnection:: SecurityCenterManagementTracingConnection( std::shared_ptr< @@ -363,19 +361,15 @@ SecurityCenterManagementTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityCenterManagementTracingConnection( std::shared_ptr< securitycentermanagement_v1::SecurityCenterManagementConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.h b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.h index 4ad2407574b9a..810eea10e7e5e 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.h +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_connection.h @@ -29,8 +29,6 @@ namespace cloud { namespace securitycentermanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityCenterManagementTracingConnection : public securitycentermanagement_v1::SecurityCenterManagementConnection { public: @@ -190,8 +188,6 @@ class SecurityCenterManagementTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.cc b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.cc index c2ccbb580b421..3bad53de6565a 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.cc +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace securitycentermanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SecurityCenterManagementTracingStub::SecurityCenterManagementTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -409,16 +407,10 @@ SecurityCenterManagementTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSecurityCenterManagementTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.h b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.h index 80d28004c4b08..abc6768b22da6 100644 --- a/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.h +++ b/google/cloud/securitycentermanagement/v1/internal/security_center_management_tracing_stub.h @@ -31,8 +31,6 @@ namespace cloud { namespace securitycentermanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SecurityCenterManagementTracingStub : public SecurityCenterManagementStub { public: @@ -212,8 +210,6 @@ class SecurityCenterManagementTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/securitycentermanagement/v1/security_center_management_connection.h b/google/cloud/securitycentermanagement/v1/security_center_management_connection.h index 27a78128e5bc0..0badebea49bc3 100644 --- a/google/cloud/securitycentermanagement/v1/security_center_management_connection.h +++ b/google/cloud/securitycentermanagement/v1/security_center_management_connection.h @@ -21,6 +21,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTERMANAGEMENT_V1_SECURITY_CENTER_MANAGEMENT_CONNECTION_H #include "google/cloud/securitycentermanagement/v1/internal/security_center_management_retry_traits.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.pb.h" #include "google/cloud/securitycentermanagement/v1/security_center_management_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/securitycentermanagement/v1/security_center_management_connection_idempotency_policy.h b/google/cloud/securitycentermanagement/v1/security_center_management_connection_idempotency_policy.h index 27315750d8ca0..70c2dbb7de93b 100644 --- a/google/cloud/securitycentermanagement/v1/security_center_management_connection_idempotency_policy.h +++ b/google/cloud/securitycentermanagement/v1/security_center_management_connection_idempotency_policy.h @@ -20,10 +20,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTERMANAGEMENT_V1_SECURITY_CENTER_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTERMANAGEMENT_V1_SECURITY_CENTER_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/securitycentermanagement/v1/security_center_management.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/servicecontrol/BUILD.bazel b/google/cloud/servicecontrol/BUILD.bazel index 8528b124568e9..adad8f0e31e89 100644 --- a/google/cloud/servicecontrol/BUILD.bazel +++ b/google/cloud/servicecontrol/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/api/servicecontrol/v1:servicecontrol_cc_grpc", - "@com_google_googleapis//google/api/servicecontrol/v2:servicecontrol_cc_grpc", + "@googleapis//google/api/servicecontrol/v1:servicecontrol_cc_grpc", + "@googleapis//google/api/servicecontrol/v2:servicecontrol_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/servicecontrol/quickstart/.bazelrc b/google/cloud/servicecontrol/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/servicecontrol/quickstart/.bazelrc +++ b/google/cloud/servicecontrol/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_auth_decorator.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_auth_decorator.cc index d3ffdec0c7ec6..d82a06347d2e8 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_auth_decorator.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/servicecontrol/v1/quota_controller.proto #include "google/cloud/servicecontrol/v1/internal/quota_controller_auth_decorator.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_logging_decorator.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_logging_decorator.cc index 1e58504250c10..8e166b4a6eadd 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_logging_decorator.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicecontrol/v1/internal/quota_controller_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_metadata_decorator.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_metadata_decorator.cc index fd70f2d356165..270f834086419 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_metadata_decorator.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_stub.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_stub.cc index 79f264de8338e..f4a2e16d11a64 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_stub.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicecontrol/v1/internal/quota_controller_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_stub.h b/google/cloud/servicecontrol/v1/internal/quota_controller_stub.h index 525fc5ad79279..da4d0f5d66a0f 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_stub.h +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_stub_factory.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_stub_factory.cc index ca96e63a68a85..a226dd725998e 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_stub_factory.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.cc index 25bf47b2c8400..44e7063d066a0 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - QuotaControllerTracingConnection::QuotaControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -41,16 +39,12 @@ QuotaControllerTracingConnection::AllocateQuota( return internal::EndSpan(*span, child_->AllocateQuota(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeQuotaControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.h b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.h index 756b95cec530e..5fcec6d74a836 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.h +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class QuotaControllerTracingConnection : public servicecontrol_v1::QuotaControllerConnection { public: @@ -48,8 +46,6 @@ class QuotaControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.cc b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.cc index c657c5a1189b5..d214f8fb628d2 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.cc +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - QuotaControllerTracingStub::QuotaControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ QuotaControllerTracingStub::AllocateQuota( child_->AllocateQuota(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeQuotaControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.h b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.h index 93ee960667cf5..3cac825ff0093 100644 --- a/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.h +++ b/google/cloud/servicecontrol/v1/internal/quota_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class QuotaControllerTracingStub : public QuotaControllerStub { public: ~QuotaControllerTracingStub() override = default; @@ -50,8 +48,6 @@ class QuotaControllerTracingStub : public QuotaControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_auth_decorator.cc b/google/cloud/servicecontrol/v1/internal/service_controller_auth_decorator.cc index 3c8350d354d1f..4c4e1716a7b81 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_auth_decorator.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/servicecontrol/v1/service_controller.proto #include "google/cloud/servicecontrol/v1/internal/service_controller_auth_decorator.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_logging_decorator.cc b/google/cloud/servicecontrol/v1/internal/service_controller_logging_decorator.cc index c8a06b4ab41ac..3014fbb72ef1b 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_logging_decorator.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicecontrol/v1/internal/service_controller_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_metadata_decorator.cc b/google/cloud/servicecontrol/v1/internal/service_controller_metadata_decorator.cc index 2f97c190ba7b1..ad363e91a2d6c 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_metadata_decorator.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_stub.cc b/google/cloud/servicecontrol/v1/internal/service_controller_stub.cc index 65f4340cd1017..1fa1d53ca3da2 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_stub.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicecontrol/v1/internal/service_controller_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_stub.h b/google/cloud/servicecontrol/v1/internal/service_controller_stub.h index 8a5aef06d1de1..959b083d10beb 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_stub.h +++ b/google/cloud/servicecontrol/v1/internal/service_controller_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_stub_factory.cc b/google/cloud/servicecontrol/v1/internal/service_controller_stub_factory.cc index 548cd5573897d..ca500e613b536 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_stub_factory.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.cc b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.cc index c9c99834bd059..aa4b8b9690109 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceControllerTracingConnection::ServiceControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -50,17 +48,13 @@ ServiceControllerTracingConnection::Report( return internal::EndSpan(*span, child_->Report(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.h b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.h index 9965ea39798ee..5be2d90af403e 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.h +++ b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceControllerTracingConnection : public servicecontrol_v1::ServiceControllerConnection { public: @@ -50,8 +48,6 @@ class ServiceControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.cc b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.cc index d1a0404904110..36007f5f953f3 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.cc +++ b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceControllerTracingStub::ServiceControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -56,15 +54,9 @@ ServiceControllerTracingStub::Report( child_->Report(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.h b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.h index c1909e1756708..1902152f7f42f 100644 --- a/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.h +++ b/google/cloud/servicecontrol/v1/internal/service_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicecontrol_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceControllerTracingStub : public ServiceControllerStub { public: ~ServiceControllerTracingStub() override = default; @@ -53,8 +51,6 @@ class ServiceControllerTracingStub : public ServiceControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicecontrol/v1/quota_controller_connection.h b/google/cloud/servicecontrol/v1/quota_controller_connection.h index 9e8f65c30f43d..681d5b22c6586 100644 --- a/google/cloud/servicecontrol/v1/quota_controller_connection.h +++ b/google/cloud/servicecontrol/v1/quota_controller_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.pb.h" #include namespace google { diff --git a/google/cloud/servicecontrol/v1/quota_controller_connection_idempotency_policy.h b/google/cloud/servicecontrol/v1/quota_controller_connection_idempotency_policy.h index 85e5c40c55ac6..ec78728a16951 100644 --- a/google/cloud/servicecontrol/v1/quota_controller_connection_idempotency_policy.h +++ b/google/cloud/servicecontrol/v1/quota_controller_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v1/quota_controller.grpc.pb.h" #include namespace google { diff --git a/google/cloud/servicecontrol/v1/service_controller_connection.h b/google/cloud/servicecontrol/v1/service_controller_connection.h index 5475e099a3396..d97a91d3d4f70 100644 --- a/google/cloud/servicecontrol/v1/service_controller_connection.h +++ b/google/cloud/servicecontrol/v1/service_controller_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v1/service_controller.pb.h" #include namespace google { diff --git a/google/cloud/servicecontrol/v1/service_controller_connection_idempotency_policy.h b/google/cloud/servicecontrol/v1/service_controller_connection_idempotency_policy.h index 20b1546733cd1..9c39a951d149a 100644 --- a/google/cloud/servicecontrol/v1/service_controller_connection_idempotency_policy.h +++ b/google/cloud/servicecontrol/v1/service_controller_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v1/service_controller.grpc.pb.h" #include namespace google { diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_auth_decorator.cc b/google/cloud/servicecontrol/v2/internal/service_controller_auth_decorator.cc index e22b57e66999a..b4c8ac2b6668a 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_auth_decorator.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/servicecontrol/v2/service_controller.proto #include "google/cloud/servicecontrol/v2/internal/service_controller_auth_decorator.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_logging_decorator.cc b/google/cloud/servicecontrol/v2/internal/service_controller_logging_decorator.cc index bded98ab6e4e4..3158af22f8a01 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_logging_decorator.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicecontrol/v2/internal/service_controller_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_metadata_decorator.cc b/google/cloud/servicecontrol/v2/internal/service_controller_metadata_decorator.cc index 04932bbb72150..fd120efcefa7c 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_metadata_decorator.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_stub.cc b/google/cloud/servicecontrol/v2/internal/service_controller_stub.cc index 7a861bea1a911..92e0c74019197 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_stub.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicecontrol/v2/internal/service_controller_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_stub.h b/google/cloud/servicecontrol/v2/internal/service_controller_stub.h index f8e73cc9ecd91..8db80c1255d14 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_stub.h +++ b/google/cloud/servicecontrol/v2/internal/service_controller_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_stub_factory.cc b/google/cloud/servicecontrol/v2/internal/service_controller_stub_factory.cc index c25a2f5aa701c..3cce0ef0f3b1d 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_stub_factory.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include #include diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.cc b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.cc index 5a043f7496bf2..ccff8dfe59152 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceControllerTracingConnection::ServiceControllerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -50,17 +48,13 @@ ServiceControllerTracingConnection::Report( return internal::EndSpan(*span, child_->Report(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceControllerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.h b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.h index 5c7ddc2f38f10..7cae48d7855fa 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.h +++ b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceControllerTracingConnection : public servicecontrol_v2::ServiceControllerConnection { public: @@ -50,8 +48,6 @@ class ServiceControllerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.cc b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.cc index 3595cb198ac5a..5dc51429584f7 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.cc +++ b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceControllerTracingStub::ServiceControllerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -56,15 +54,9 @@ ServiceControllerTracingStub::Report( child_->Report(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.h b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.h index 59b4e0da92bcd..f47030f052ca7 100644 --- a/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.h +++ b/google/cloud/servicecontrol/v2/internal/service_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceControllerTracingStub : public ServiceControllerStub { public: ~ServiceControllerTracingStub() override = default; @@ -53,8 +51,6 @@ class ServiceControllerTracingStub : public ServiceControllerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicecontrol/v2/service_controller_connection.h b/google/cloud/servicecontrol/v2/service_controller_connection.h index 1cfbdfd836578..2fdc4f38c9625 100644 --- a/google/cloud/servicecontrol/v2/service_controller_connection.h +++ b/google/cloud/servicecontrol/v2/service_controller_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v2/service_controller.pb.h" #include namespace google { diff --git a/google/cloud/servicecontrol/v2/service_controller_connection_idempotency_policy.h b/google/cloud/servicecontrol/v2/service_controller_connection_idempotency_policy.h index a48459d234f66..1fc737b1eefa8 100644 --- a/google/cloud/servicecontrol/v2/service_controller_connection_idempotency_policy.h +++ b/google/cloud/servicecontrol/v2/service_controller_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/api/servicecontrol/v2/service_controller.grpc.pb.h" #include namespace google { diff --git a/google/cloud/servicedirectory/BUILD.bazel b/google/cloud/servicedirectory/BUILD.bazel index 77e33da3c8fa4..f08c64ab8531c 100644 --- a/google/cloud/servicedirectory/BUILD.bazel +++ b/google/cloud/servicedirectory/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/servicedirectory/v1:servicedirectory_cc_grpc", + "@googleapis//google/cloud/servicedirectory/v1:servicedirectory_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/servicedirectory/quickstart/.bazelrc b/google/cloud/servicedirectory/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/servicedirectory/quickstart/.bazelrc +++ b/google/cloud/servicedirectory/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/servicedirectory/v1/internal/lookup_auth_decorator.cc b/google/cloud/servicedirectory/v1/internal/lookup_auth_decorator.cc index 8232f7a4c7c88..ceec6b987d8b4 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_auth_decorator.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/servicedirectory/v1/lookup_service.proto #include "google/cloud/servicedirectory/v1/internal/lookup_auth_decorator.h" -#include +#include "google/cloud/servicedirectory/v1/lookup_service.grpc.pb.h" #include #include diff --git a/google/cloud/servicedirectory/v1/internal/lookup_logging_decorator.cc b/google/cloud/servicedirectory/v1/internal/lookup_logging_decorator.cc index e67fd31703f6d..643cfd835a2d8 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_logging_decorator.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/servicedirectory/v1/lookup_service.proto #include "google/cloud/servicedirectory/v1/internal/lookup_logging_decorator.h" +#include "google/cloud/servicedirectory/v1/lookup_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/lookup_metadata_decorator.cc b/google/cloud/servicedirectory/v1/internal/lookup_metadata_decorator.cc index 385a023edfcf3..639f40bfdd565 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_metadata_decorator.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/servicedirectory/v1/lookup_service.proto #include "google/cloud/servicedirectory/v1/internal/lookup_metadata_decorator.h" +#include "google/cloud/servicedirectory/v1/lookup_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 #include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/lookup_stub.cc b/google/cloud/servicedirectory/v1/internal/lookup_stub.cc index 401d2dcb3a864..6c77870f915fe 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_stub.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/servicedirectory/v1/lookup_service.proto #include "google/cloud/servicedirectory/v1/internal/lookup_stub.h" +#include "google/cloud/servicedirectory/v1/lookup_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/lookup_stub.h b/google/cloud/servicedirectory/v1/internal/lookup_stub.h index e28f7388a2f84..640c210f896ae 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_stub.h +++ b/google/cloud/servicedirectory/v1/internal/lookup_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_INTERNAL_LOOKUP_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_INTERNAL_LOOKUP_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicedirectory/v1/lookup_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/lookup_stub_factory.cc b/google/cloud/servicedirectory/v1/internal/lookup_stub_factory.cc index 591267c340d6b..ac8d7672fa080 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_stub_factory.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_stub_factory.cc @@ -17,19 +17,19 @@ // source: google/cloud/servicedirectory/v1/lookup_service.proto #include "google/cloud/servicedirectory/v1/internal/lookup_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/servicedirectory/v1/internal/lookup_auth_decorator.h" #include "google/cloud/servicedirectory/v1/internal/lookup_logging_decorator.h" #include "google/cloud/servicedirectory/v1/internal/lookup_metadata_decorator.h" #include "google/cloud/servicedirectory/v1/internal/lookup_stub.h" #include "google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.h" +#include "google/cloud/servicedirectory/v1/lookup_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 -#include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.cc b/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.cc index 98c928e7ac94a..56673203bc80c 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LookupServiceTracingConnection::LookupServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -62,16 +60,12 @@ LookupServiceTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLookupServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.h b/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.h index e5618e5e819c5..77a1f91680296 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.h +++ b/google/cloud/servicedirectory/v1/internal/lookup_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LookupServiceTracingConnection : public servicedirectory_v1::LookupServiceConnection { public: @@ -55,8 +53,6 @@ class LookupServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.cc b/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.cc index e2a8eb0fb436b..8e22752ee560d 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.cc +++ b/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LookupServiceTracingStub::LookupServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -68,15 +66,9 @@ LookupServiceTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLookupServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.h b/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.h index fd5b16d914776..58554481987f4 100644 --- a/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.h +++ b/google/cloud/servicedirectory/v1/internal/lookup_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LookupServiceTracingStub : public LookupServiceStub { public: ~LookupServiceTracingStub() override = default; @@ -58,8 +56,6 @@ class LookupServiceTracingStub : public LookupServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicedirectory/v1/internal/registration_auth_decorator.cc b/google/cloud/servicedirectory/v1/internal/registration_auth_decorator.cc index 47e9734dfefd1..5920f11350079 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_auth_decorator.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/servicedirectory/v1/registration_service.proto #include "google/cloud/servicedirectory/v1/internal/registration_auth_decorator.h" -#include +#include "google/cloud/servicedirectory/v1/registration_service.grpc.pb.h" #include #include diff --git a/google/cloud/servicedirectory/v1/internal/registration_logging_decorator.cc b/google/cloud/servicedirectory/v1/internal/registration_logging_decorator.cc index 34ae7ecaf8359..92e51c6249ae1 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_logging_decorator.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/servicedirectory/v1/registration_service.proto #include "google/cloud/servicedirectory/v1/internal/registration_logging_decorator.h" +#include "google/cloud/servicedirectory/v1/registration_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/registration_metadata_decorator.cc b/google/cloud/servicedirectory/v1/internal/registration_metadata_decorator.cc index da21c765a77df..ce18d8ace2210 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_metadata_decorator.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/servicedirectory/v1/registration_service.proto #include "google/cloud/servicedirectory/v1/internal/registration_metadata_decorator.h" +#include "google/cloud/servicedirectory/v1/registration_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 #include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/registration_stub.cc b/google/cloud/servicedirectory/v1/internal/registration_stub.cc index f8457526979ef..b7be5a37ab18e 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_stub.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/servicedirectory/v1/registration_service.proto #include "google/cloud/servicedirectory/v1/internal/registration_stub.h" +#include "google/cloud/servicedirectory/v1/registration_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/registration_stub.h b/google/cloud/servicedirectory/v1/internal/registration_stub.h index 1c8d79aa32041..42c6af810b459 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_stub.h +++ b/google/cloud/servicedirectory/v1/internal/registration_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_INTERNAL_REGISTRATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_INTERNAL_REGISTRATION_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicedirectory/v1/registration_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/registration_stub_factory.cc b/google/cloud/servicedirectory/v1/internal/registration_stub_factory.cc index ed9032d70407c..2db567680797d 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_stub_factory.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_stub_factory.cc @@ -17,19 +17,19 @@ // source: google/cloud/servicedirectory/v1/registration_service.proto #include "google/cloud/servicedirectory/v1/internal/registration_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/servicedirectory/v1/internal/registration_auth_decorator.h" #include "google/cloud/servicedirectory/v1/internal/registration_logging_decorator.h" #include "google/cloud/servicedirectory/v1/internal/registration_metadata_decorator.h" #include "google/cloud/servicedirectory/v1/internal/registration_stub.h" #include "google/cloud/servicedirectory/v1/internal/registration_tracing_stub.h" +#include "google/cloud/servicedirectory/v1/registration_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 -#include #include #include diff --git a/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc b/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc index 5e5d8da1e8ae8..f07f63974c560 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegistrationServiceTracingConnection::RegistrationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -224,17 +222,13 @@ RegistrationServiceTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegistrationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.h b/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.h index 96777e2ef8dbf..d06a82d99ffb7 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.h +++ b/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegistrationServiceTracingConnection : public servicedirectory_v1::RegistrationServiceConnection { public: @@ -120,8 +118,6 @@ class RegistrationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.cc b/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.cc index d7009eab91e0f..3b1dbd4cabd58 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - RegistrationServiceTracingStub::RegistrationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -274,15 +272,9 @@ RegistrationServiceTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeRegistrationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.h b/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.h index 11b373a2493d2..e0427843f4019 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.h +++ b/google/cloud/servicedirectory/v1/internal/registration_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicedirectory_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class RegistrationServiceTracingStub : public RegistrationServiceStub { public: ~RegistrationServiceTracingStub() override = default; @@ -141,8 +139,6 @@ class RegistrationServiceTracingStub : public RegistrationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicedirectory/v1/lookup_connection.h b/google/cloud/servicedirectory/v1/lookup_connection.h index 969748a503959..61a3ca8d6810f 100644 --- a/google/cloud/servicedirectory/v1/lookup_connection.h +++ b/google/cloud/servicedirectory/v1/lookup_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/servicedirectory/v1/internal/lookup_retry_traits.h" #include "google/cloud/servicedirectory/v1/lookup_connection_idempotency_policy.h" +#include "google/cloud/servicedirectory/v1/lookup_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/servicedirectory/v1/lookup_connection_idempotency_policy.h b/google/cloud/servicedirectory/v1/lookup_connection_idempotency_policy.h index ad5130c57d640..4d17ed48be641 100644 --- a/google/cloud/servicedirectory/v1/lookup_connection_idempotency_policy.h +++ b/google/cloud/servicedirectory/v1/lookup_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_LOOKUP_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_LOOKUP_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicedirectory/v1/lookup_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/servicedirectory/v1/registration_connection.h b/google/cloud/servicedirectory/v1/registration_connection.h index b2e3f416ec8ed..9c4a3e5f64d9d 100644 --- a/google/cloud/servicedirectory/v1/registration_connection.h +++ b/google/cloud/servicedirectory/v1/registration_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/servicedirectory/v1/internal/registration_retry_traits.h" #include "google/cloud/servicedirectory/v1/registration_connection_idempotency_policy.h" +#include "google/cloud/servicedirectory/v1/registration_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/servicedirectory/v1/registration_connection_idempotency_policy.h b/google/cloud/servicedirectory/v1/registration_connection_idempotency_policy.h index 0697b4ce310e0..464185582bf70 100644 --- a/google/cloud/servicedirectory/v1/registration_connection_idempotency_policy.h +++ b/google/cloud/servicedirectory/v1/registration_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_REGISTRATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_V1_REGISTRATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicedirectory/v1/registration_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/servicehealth/BUILD.bazel b/google/cloud/servicehealth/BUILD.bazel index aa1ac8cf6011b..632a15c056b59 100644 --- a/google/cloud/servicehealth/BUILD.bazel +++ b/google/cloud/servicehealth/BUILD.bazel @@ -21,8 +21,8 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/servicehealth/logging/v1:logging_cc_grpc", - "@com_google_googleapis//google/cloud/servicehealth/v1:servicehealth_cc_grpc", + "@googleapis//google/cloud/servicehealth/logging/v1:logging_cc_grpc", + "@googleapis//google/cloud/servicehealth/v1:servicehealth_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/servicehealth/quickstart/.bazelrc b/google/cloud/servicehealth/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/servicehealth/quickstart/.bazelrc +++ b/google/cloud/servicehealth/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/servicehealth/v1/internal/service_health_auth_decorator.cc b/google/cloud/servicehealth/v1/internal/service_health_auth_decorator.cc index dc7e7ae4c0ee8..8a13585bd4475 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_auth_decorator.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/servicehealth/v1/event_service.proto #include "google/cloud/servicehealth/v1/internal/service_health_auth_decorator.h" -#include +#include "google/cloud/servicehealth/v1/event_service.grpc.pb.h" #include #include diff --git a/google/cloud/servicehealth/v1/internal/service_health_logging_decorator.cc b/google/cloud/servicehealth/v1/internal/service_health_logging_decorator.cc index e2c7c208fc26d..6e54fd089f132 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_logging_decorator.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/servicehealth/v1/event_service.proto #include "google/cloud/servicehealth/v1/internal/service_health_logging_decorator.h" +#include "google/cloud/servicehealth/v1/event_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/servicehealth/v1/internal/service_health_metadata_decorator.cc b/google/cloud/servicehealth/v1/internal/service_health_metadata_decorator.cc index 61f5e1ca8a421..9383721f68254 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_metadata_decorator.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/servicehealth/v1/event_service.proto #include "google/cloud/servicehealth/v1/internal/service_health_metadata_decorator.h" +#include "google/cloud/servicehealth/v1/event_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 #include #include #include diff --git a/google/cloud/servicehealth/v1/internal/service_health_stub.cc b/google/cloud/servicehealth/v1/internal/service_health_stub.cc index 4783f0eecb6a5..d19749987a4b9 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_stub.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/servicehealth/v1/event_service.proto #include "google/cloud/servicehealth/v1/internal/service_health_stub.h" +#include "google/cloud/servicehealth/v1/event_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/servicehealth/v1/internal/service_health_stub.h b/google/cloud/servicehealth/v1/internal/service_health_stub.h index 734ae5dd6c3c6..f0ac86d581ff8 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_stub.h +++ b/google/cloud/servicehealth/v1/internal/service_health_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEHEALTH_V1_INTERNAL_SERVICE_HEALTH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEHEALTH_V1_INTERNAL_SERVICE_HEALTH_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicehealth/v1/event_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/servicehealth/v1/internal/service_health_stub_factory.cc b/google/cloud/servicehealth/v1/internal/service_health_stub_factory.cc index 114a9226b78f0..cd4230fc5cdb9 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_stub_factory.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/servicehealth/v1/event_service.proto #include "google/cloud/servicehealth/v1/internal/service_health_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicehealth/v1/event_service.grpc.pb.h" #include "google/cloud/servicehealth/v1/internal/service_health_auth_decorator.h" #include "google/cloud/servicehealth/v1/internal/service_health_logging_decorator.h" #include "google/cloud/servicehealth/v1/internal/service_health_metadata_decorator.h" @@ -28,8 +30,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include #include #include diff --git a/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.cc b/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.cc index 16e0d84caa8cc..5f8e6d3aebcea 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace servicehealth_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceHealthTracingConnection::ServiceHealthTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -117,16 +115,12 @@ ServiceHealthTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceHealthTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.h b/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.h index b8c1d0466d901..3780912dbf700 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.h +++ b/google/cloud/servicehealth/v1/internal/service_health_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicehealth_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceHealthTracingConnection : public servicehealth_v1::ServiceHealthConnection { public: @@ -77,8 +75,6 @@ class ServiceHealthTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.cc b/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.cc index 224dace0ccbad..a1956a242d01b 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.cc +++ b/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicehealth_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceHealthTracingStub::ServiceHealthTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -134,15 +132,9 @@ ServiceHealthTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceHealthTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.h b/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.h index 80b4bddbfc86c..709fac8e0e89a 100644 --- a/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.h +++ b/google/cloud/servicehealth/v1/internal/service_health_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicehealth_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceHealthTracingStub : public ServiceHealthStub { public: ~ServiceHealthTracingStub() override = default; @@ -86,8 +84,6 @@ class ServiceHealthTracingStub : public ServiceHealthStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicehealth/v1/service_health_connection.h b/google/cloud/servicehealth/v1/service_health_connection.h index 6a3ac93de78de..8a00cdde01509 100644 --- a/google/cloud/servicehealth/v1/service_health_connection.h +++ b/google/cloud/servicehealth/v1/service_health_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEHEALTH_V1_SERVICE_HEALTH_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEHEALTH_V1_SERVICE_HEALTH_CONNECTION_H +#include "google/cloud/servicehealth/v1/event_service.pb.h" #include "google/cloud/servicehealth/v1/internal/service_health_retry_traits.h" #include "google/cloud/servicehealth/v1/service_health_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/servicehealth/v1/service_health_connection_idempotency_policy.h b/google/cloud/servicehealth/v1/service_health_connection_idempotency_policy.h index eb725cf911e73..7ddd8f4b582a4 100644 --- a/google/cloud/servicehealth/v1/service_health_connection_idempotency_policy.h +++ b/google/cloud/servicehealth/v1/service_health_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEHEALTH_V1_SERVICE_HEALTH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEHEALTH_V1_SERVICE_HEALTH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/servicehealth/v1/event_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/servicemanagement/BUILD.bazel b/google/cloud/servicemanagement/BUILD.bazel index adaa712d116f3..13028d71bc546 100644 --- a/google/cloud/servicemanagement/BUILD.bazel +++ b/google/cloud/servicemanagement/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/api/servicemanagement/v1:servicemanagement_cc_grpc", + "@googleapis//google/api/servicemanagement/v1:servicemanagement_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/servicemanagement/quickstart/.bazelrc b/google/cloud/servicemanagement/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/servicemanagement/quickstart/.bazelrc +++ b/google/cloud/servicemanagement/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.cc b/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.cc index 6afa8cf09e1f6..51ad0b627a48b 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/servicemanagement/v1/servicemanager.proto #include "google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.h" -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.h b/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.h index 542f697b2ee82..7916661a52800 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/servicemanagement/v1/internal/service_manager_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_connection_impl.h b/google/cloud/servicemanagement/v1/internal/service_manager_connection_impl.h index 0bc6e894a8fb0..793db61363e76 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_connection_impl.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.cc b/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.cc index 1f93d7baefdee..c807817f3eb4e 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.h b/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.h index 0d7b9982ae8ba..60c42cacfc2e8 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/servicemanagement/v1/internal/service_manager_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.cc b/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.cc index 5aa72efcbd0da..aa4b1e2f180e4 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.h b/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.h index 389ff63765554..24ab1f8ef9031 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/servicemanagement/v1/internal/service_manager_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc b/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc index 6504c930dfd4e..042c95d9a3c51 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/servicemanagement/v1/internal/service_manager_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_stub.h b/google/cloud/servicemanagement/v1/internal/service_manager_stub.h index 6d07b37103b53..d185399e0a245 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_stub.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_stub.h @@ -24,9 +24,9 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc b/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc index 4e9cae2222a10..082936bdb5eaf 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc @@ -28,9 +28,9 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc index 78f6e7dbf31dd..78dbe9ff946bd 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace servicemanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceManagerTracingConnection::ServiceManagerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -304,16 +302,12 @@ ServiceManagerTracingConnection::ListOperations( std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceManagerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.h b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.h index 8917a041898a5..a87800590f365 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace servicemanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceManagerTracingConnection : public servicemanagement_v1::ServiceManagerConnection { public: @@ -154,8 +152,6 @@ class ServiceManagerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc index ba441f08574e6..f02643401b47b 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace servicemanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceManagerTracingStub::ServiceManagerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -343,15 +341,9 @@ future ServiceManagerTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceManagerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.h b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.h index a8c37bbc0af6c..aec2a0ed5618c 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace servicemanagement_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceManagerTracingStub : public ServiceManagerStub { public: ~ServiceManagerTracingStub() override = default; @@ -175,8 +173,6 @@ class ServiceManagerTracingStub : public ServiceManagerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/servicemanagement/v1/service_manager_client.h b/google/cloud/servicemanagement/v1/service_manager_client.h index 610180f30c8f3..c6d315225a18f 100644 --- a/google/cloud/servicemanagement/v1/service_manager_client.h +++ b/google/cloud/servicemanagement/v1/service_manager_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/servicemanagement/v1/service_manager_connection.h b/google/cloud/servicemanagement/v1/service_manager_connection.h index 6730c69f11cda..6f6e1f8139ed9 100644 --- a/google/cloud/servicemanagement/v1/service_manager_connection.h +++ b/google/cloud/servicemanagement/v1/service_manager_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/servicemanagement/v1/servicemanager.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/servicemanagement/v1/service_manager_connection_idempotency_policy.h b/google/cloud/servicemanagement/v1/service_manager_connection_idempotency_policy.h index 336837dc80807..187de47221a8c 100644 --- a/google/cloud/servicemanagement/v1/service_manager_connection_idempotency_policy.h +++ b/google/cloud/servicemanagement/v1/service_manager_connection_idempotency_policy.h @@ -21,9 +21,9 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/api/servicemanagement/v1/servicemanager.grpc.pb.h" +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/serviceusage/BUILD.bazel b/google/cloud/serviceusage/BUILD.bazel index 5c3a1505e99e0..5a2418c6b379d 100644 --- a/google/cloud/serviceusage/BUILD.bazel +++ b/google/cloud/serviceusage/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/api/serviceusage/v1:serviceusage_cc_grpc", + "@googleapis//google/api/serviceusage/v1:serviceusage_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/serviceusage/quickstart/.bazelrc b/google/cloud/serviceusage/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/serviceusage/quickstart/.bazelrc +++ b/google/cloud/serviceusage/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.cc b/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.cc index 0a4032ac9d768..780daa7e0bf6e 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/api/serviceusage/v1/serviceusage.proto #include "google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.h" -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.h b/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.h index 4f78fafbe0653..20dc34d62337f 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/serviceusage/v1/internal/service_usage_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_connection_impl.h b/google/cloud/serviceusage/v1/internal/service_usage_connection_impl.h index b3f0b3f595e59..160ba1e2a6b83 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_connection_impl.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.cc b/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.cc index 6fe5a02501ba5..27386699ae803 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" #include #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.h b/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.h index 3150b4a3548c9..9af3abd06d648 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/serviceusage/v1/internal/service_usage_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.cc b/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.cc index b47374b8d7e36..49eccf8ebd838 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" #include #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.h b/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.h index cf920c014fbda..b0f073901f4ec 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/serviceusage/v1/internal/service_usage_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_stub.cc b/google/cloud/serviceusage/v1/internal/service_usage_stub.cc index 717c825848f99..fb428b5890a2a 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_stub.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/serviceusage/v1/internal/service_usage_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_stub.h b/google/cloud/serviceusage/v1/internal/service_usage_stub.h index 48ebbc130f100..83a934295e2dc 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_stub.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc b/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc index dd5099889271f..2f036994b60b4 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc b/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc index bc43e2f579aaa..e49e16b88adac 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace serviceusage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceUsageTracingConnection::ServiceUsageTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -170,16 +168,12 @@ ServiceUsageTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceUsageTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.h b/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.h index a209e18e344e4..0df975c58b391 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace serviceusage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceUsageTracingConnection : public serviceusage_v1::ServiceUsageConnection { public: @@ -97,8 +95,6 @@ class ServiceUsageTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc b/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc index 349cf6f8db76c..501d297aa9b6c 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace serviceusage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ServiceUsageTracingStub::ServiceUsageTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -198,15 +196,9 @@ future ServiceUsageTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeServiceUsageTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.h b/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.h index 33a98ac435300..668e6874116e1 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace serviceusage_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ServiceUsageTracingStub : public ServiceUsageStub { public: ~ServiceUsageTracingStub() override = default; @@ -114,8 +112,6 @@ class ServiceUsageTracingStub : public ServiceUsageStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/serviceusage/v1/service_usage_client.h b/google/cloud/serviceusage/v1/service_usage_client.h index 356059d80b887..9b61116cf69d1 100644 --- a/google/cloud/serviceusage/v1/service_usage_client.h +++ b/google/cloud/serviceusage/v1/service_usage_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/serviceusage/v1/service_usage_connection.h b/google/cloud/serviceusage/v1/service_usage_connection.h index 57ac988d14c21..c993df8624b42 100644 --- a/google/cloud/serviceusage/v1/service_usage_connection.h +++ b/google/cloud/serviceusage/v1/service_usage_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/serviceusage/v1/serviceusage.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/serviceusage/v1/service_usage_connection_idempotency_policy.h b/google/cloud/serviceusage/v1/service_usage_connection_idempotency_policy.h index f2162f9e3302f..25c21d08d3016 100644 --- a/google/cloud/serviceusage/v1/service_usage_connection_idempotency_policy.h +++ b/google/cloud/serviceusage/v1/service_usage_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/api/serviceusage/v1/serviceusage.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/shell/BUILD.bazel b/google/cloud/shell/BUILD.bazel index 49ef335321bee..0f780aa750d33 100644 --- a/google/cloud/shell/BUILD.bazel +++ b/google/cloud/shell/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/shell/v1:shell_cc_grpc", + "@googleapis//google/cloud/shell/v1:shell_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/shell/quickstart/.bazelrc b/google/cloud/shell/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/shell/quickstart/.bazelrc +++ b/google/cloud/shell/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/shell/v1/cloud_shell_client.h b/google/cloud/shell/v1/cloud_shell_client.h index 30c7dd604b081..5ff83bfb1bff5 100644 --- a/google/cloud/shell/v1/cloud_shell_client.h +++ b/google/cloud/shell/v1/cloud_shell_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/shell/v1/cloud_shell_connection.h b/google/cloud/shell/v1/cloud_shell_connection.h index aed82262ddea5..2cd391da2c49a 100644 --- a/google/cloud/shell/v1/cloud_shell_connection.h +++ b/google/cloud/shell/v1/cloud_shell_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_V1_CLOUD_SHELL_CONNECTION_H #include "google/cloud/shell/v1/cloud_shell_connection_idempotency_policy.h" +#include "google/cloud/shell/v1/cloudshell.pb.h" #include "google/cloud/shell/v1/internal/cloud_shell_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -29,8 +30,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/shell/v1/cloud_shell_connection_idempotency_policy.h b/google/cloud/shell/v1/cloud_shell_connection_idempotency_policy.h index a6b33729e2ed0..10940b4954703 100644 --- a/google/cloud/shell/v1/cloud_shell_connection_idempotency_policy.h +++ b/google/cloud/shell/v1/cloud_shell_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_V1_CLOUD_SHELL_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_V1_CLOUD_SHELL_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/shell/v1/cloudshell.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.cc b/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.cc index a743647351ce7..65f424a19eaea 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/shell/v1/cloudshell.proto #include "google/cloud/shell/v1/internal/cloud_shell_auth_decorator.h" -#include +#include "google/cloud/shell/v1/cloudshell.grpc.pb.h" #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.h b/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.h index 088a3df6f32ac..7985bdf1ed368 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.h +++ b/google/cloud/shell/v1/internal/cloud_shell_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/shell/v1/internal/cloud_shell_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_connection_impl.h b/google/cloud/shell/v1/internal/cloud_shell_connection_impl.h index 0a49b3527da72..d5ede1ba54551 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_connection_impl.h +++ b/google/cloud/shell/v1/internal/cloud_shell_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.cc b/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.cc index 27c942031b1f5..d1e52865e9386 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/shell/v1/cloudshell.proto #include "google/cloud/shell/v1/internal/cloud_shell_logging_decorator.h" +#include "google/cloud/shell/v1/cloudshell.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.h b/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.h index de103279e3e28..b249557f94aee 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.h +++ b/google/cloud/shell/v1/internal/cloud_shell_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/shell/v1/internal/cloud_shell_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.cc b/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.cc index 30d24903ef250..8b223d408424c 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/shell/v1/cloudshell.proto #include "google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.h" +#include "google/cloud/shell/v1/cloudshell.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 #include #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.h b/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.h index e9051d4aaab58..6e31ad5ce7112 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.h +++ b/google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/shell/v1/internal/cloud_shell_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_stub.cc b/google/cloud/shell/v1/internal/cloud_shell_stub.cc index 8af6fc920f1b0..17be9d21e1ac5 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_stub.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/shell/v1/cloudshell.proto #include "google/cloud/shell/v1/internal/cloud_shell_stub.h" +#include "google/cloud/shell/v1/cloudshell.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_stub.h b/google/cloud/shell/v1/internal/cloud_shell_stub.h index 05af3728101cf..1fc23bd0b9d01 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_stub.h +++ b/google/cloud/shell/v1/internal/cloud_shell_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_V1_INTERNAL_CLOUD_SHELL_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_V1_INTERNAL_CLOUD_SHELL_STUB_H +#include "google/cloud/shell/v1/cloudshell.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_stub_factory.cc b/google/cloud/shell/v1/internal/cloud_shell_stub_factory.cc index 6dd87e4aa6503..b119406fc0f58 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_stub_factory.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/shell/v1/cloudshell.proto #include "google/cloud/shell/v1/internal/cloud_shell_stub_factory.h" +#include "google/cloud/shell/v1/cloudshell.grpc.pb.h" #include "google/cloud/shell/v1/internal/cloud_shell_auth_decorator.h" #include "google/cloud/shell/v1/internal/cloud_shell_logging_decorator.h" #include "google/cloud/shell/v1/internal/cloud_shell_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc b/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc index 9dadcf10c557e..02ea117f21807 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace shell_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudShellServiceTracingConnection::CloudShellServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -158,17 +156,13 @@ CloudShellServiceTracingConnection::RemovePublicKey( return internal::EndSpan(std::move(span), child_->RemovePublicKey(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudShellServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.h b/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.h index 14374d7da46ca..d9cdb82c18539 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.h +++ b/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace shell_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudShellServiceTracingConnection : public shell_v1::CloudShellServiceConnection { public: @@ -94,8 +92,6 @@ class CloudShellServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc b/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc index 0c8f5d3047a19..21de4b60df1a2 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace shell_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudShellServiceTracingStub::CloudShellServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -179,15 +177,9 @@ future CloudShellServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudShellServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.h b/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.h index d71f6e3329fac..631beb2f9725e 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.h +++ b/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace shell_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudShellServiceTracingStub : public CloudShellServiceStub { public: ~CloudShellServiceTracingStub() override = default; @@ -105,8 +103,6 @@ class CloudShellServiceTracingStub : public CloudShellServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/spanner/BUILD.bazel b/google/cloud/spanner/BUILD.bazel index 97913dd76b11d..068904c83d386 100644 --- a/google/cloud/spanner/BUILD.bazel +++ b/google/cloud/spanner/BUILD.bazel @@ -40,16 +40,16 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_google_absl//absl/container:fixed_array", - "@com_google_absl//absl/numeric:int128", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", - "@com_google_googleapis//google/spanner/admin/database/v1:database_cc_grpc", - "@com_google_googleapis//google/spanner/admin/instance/v1:instance_cc_grpc", - "@com_google_googleapis//google/spanner/v1:spanner_cc_grpc", + "@abseil-cpp//absl/container:fixed_array", + "@abseil-cpp//absl/numeric:int128", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@googleapis//google/longrunning:longrunning_cc_grpc", + "@googleapis//google/spanner/admin/database/v1:database_cc_grpc", + "@googleapis//google/spanner/admin/instance/v1:instance_cc_grpc", + "@googleapis//google/spanner/v1:spanner_cc_grpc", # Do not sort: grpc++ must come last - "@com_github_grpc_grpc//:grpc++", + "@grpc//:grpc++", ], ) @@ -87,7 +87,7 @@ cc_library( ":google_cloud_cpp_spanner", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -104,10 +104,9 @@ cc_library( ":google_cloud_cpp_spanner_mocks", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", "//protos/google/cloud/spanner/testing:singer_cc_proto", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest_main", ], ) @@ -135,10 +134,9 @@ cc_library( "//google/cloud:google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", "//protos/google/cloud/spanner/testing:singer_cc_proto", - "@com_google_absl//absl/numeric:int128", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/numeric:int128", + "@googletest//:gtest_main", ], ) for test in spanner_client_unit_tests] diff --git a/google/cloud/spanner/CMakeLists.txt b/google/cloud/spanner/CMakeLists.txt index acb029537fecb..a4b54cf773fd7 100644 --- a/google/cloud/spanner/CMakeLists.txt +++ b/google/cloud/spanner/CMakeLists.txt @@ -88,7 +88,6 @@ add_library( admin/internal/instance_admin_tracing_connection.h admin/internal/instance_admin_tracing_stub.cc admin/internal/instance_admin_tracing_stub.h - admin/retry_traits.h backoff_policy.h backup.cc backup.h @@ -97,7 +96,6 @@ add_library( bytes.h client.cc client.h - client_options.h commit_options.cc commit_options.h commit_result.h @@ -108,20 +106,12 @@ add_library( create_instance_request_builder.h database.cc database.h - database_admin_client.cc - database_admin_client.h - database_admin_connection.cc - database_admin_connection.h date.h directed_read_replicas.h encryption_config.h iam_updater.h instance.cc instance.h - instance_admin_client.cc - instance_admin_client.h - instance_admin_connection.cc - instance_admin_connection.h internal/channel.h internal/connection_impl.cc internal/connection_impl.h @@ -363,8 +353,6 @@ if (GOOGLE_CLOUD_CPP_WITH_MOCKS) # cmake-format: sort admin/mocks/mock_database_admin_connection.h admin/mocks/mock_instance_admin_connection.h - mocks/mock_database_admin_connection.h - mocks/mock_instance_admin_connection.h mocks/mock_spanner_connection.h mocks/row.h) export_list_to_bazel("google_cloud_cpp_spanner_mocks.bzl" @@ -456,16 +444,11 @@ function (spanner_client_define_tests) # cmake-format: sort backup_test.cc bytes_test.cc - client_options_test.cc client_test.cc commit_options_test.cc connection_options_test.cc create_instance_request_builder_test.cc - database_admin_client_test.cc - database_admin_connection_test.cc database_test.cc - instance_admin_client_test.cc - instance_admin_connection_test.cc instance_test.cc internal/connection_impl_test.cc internal/database_admin_logging_test.cc diff --git a/google/cloud/spanner/admin/database_admin_client.h b/google/cloud/spanner/admin/database_admin_client.h index ea7db34c66e35..4486e562d7d95 100644 --- a/google/cloud/spanner/admin/database_admin_client.h +++ b/google/cloud/spanner/admin/database_admin_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/database_admin_connection.h b/google/cloud/spanner/admin/database_admin_connection.h index 6437d3716673f..2ecb4de7d93a2 100644 --- a/google/cloud/spanner/admin/database_admin_connection.h +++ b/google/cloud/spanner/admin/database_admin_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/database_admin_connection_idempotency_policy.h b/google/cloud/spanner/admin/database_admin_connection_idempotency_policy.h index e37f4113a9d48..8558a23be856e 100644 --- a/google/cloud/spanner/admin/database_admin_connection_idempotency_policy.h +++ b/google/cloud/spanner/admin/database_admin_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/instance_admin_client.h b/google/cloud/spanner/admin/instance_admin_client.h index 519a213ef299b..6113ccbe1b4d5 100644 --- a/google/cloud/spanner/admin/instance_admin_client.h +++ b/google/cloud/spanner/admin/instance_admin_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/instance_admin_connection.h b/google/cloud/spanner/admin/instance_admin_connection.h index 17b3e1ecdcf77..b1e158853647e 100644 --- a/google/cloud/spanner/admin/instance_admin_connection.h +++ b/google/cloud/spanner/admin/instance_admin_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/instance_admin_connection_idempotency_policy.h b/google/cloud/spanner/admin/instance_admin_connection_idempotency_policy.h index 09360562e83be..e84e94176c6e7 100644 --- a/google/cloud/spanner/admin/instance_admin_connection_idempotency_policy.h +++ b/google/cloud/spanner/admin/instance_admin_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/integration_tests/BUILD.bazel b/google/cloud/spanner/admin/integration_tests/BUILD.bazel index affef991023c5..6f9755cdb236b 100644 --- a/google/cloud/spanner/admin/integration_tests/BUILD.bazel +++ b/google/cloud/spanner/admin/integration_tests/BUILD.bazel @@ -30,7 +30,7 @@ licenses(["notice"]) # Apache 2.0 "//:spanner", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_admin_integration_tests] @@ -46,6 +46,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/spanner:google_cloud_cpp_spanner_rest", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_admin_integration_tests_rest] diff --git a/google/cloud/spanner/admin/internal/database_admin_auth_decorator.cc b/google/cloud/spanner/admin/internal/database_admin_auth_decorator.cc index 7a9effadf8b8a..383583987d95d 100644 --- a/google/cloud/spanner/admin/internal/database_admin_auth_decorator.cc +++ b/google/cloud/spanner/admin/internal/database_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/spanner/admin/database/v1/spanner_database_admin.proto #include "google/cloud/spanner/admin/internal/database_admin_auth_decorator.h" -#include +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_auth_decorator.h b/google/cloud/spanner/admin/internal/database_admin_auth_decorator.h index 2d2d8acb4cb3a..bdf41eec61c26 100644 --- a/google/cloud/spanner/admin/internal/database_admin_auth_decorator.h +++ b/google/cloud/spanner/admin/internal/database_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/spanner/admin/internal/database_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_connection_impl.h b/google/cloud/spanner/admin/internal/database_admin_connection_impl.h index ab6ab5b4d4a6c..18c8f4d9a38af 100644 --- a/google/cloud/spanner/admin/internal/database_admin_connection_impl.h +++ b/google/cloud/spanner/admin/internal/database_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/internal/database_admin_logging_decorator.cc b/google/cloud/spanner/admin/internal/database_admin_logging_decorator.cc index 2bf7d8a4aad50..982c711d50847 100644 --- a/google/cloud/spanner/admin/internal/database_admin_logging_decorator.cc +++ b/google/cloud/spanner/admin/internal/database_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/spanner/admin/internal/database_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_logging_decorator.h b/google/cloud/spanner/admin/internal/database_admin_logging_decorator.h index d32a38b9c7457..7e360cbacfd1e 100644 --- a/google/cloud/spanner/admin/internal/database_admin_logging_decorator.h +++ b/google/cloud/spanner/admin/internal/database_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/spanner/admin/internal/database_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.cc b/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.cc index 2a2f223d17bf7..f0fea61eefa22 100644 --- a/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.cc +++ b/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.h b/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.h index ee9ebd142d999..1e6ca90bda73c 100644 --- a/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.h +++ b/google/cloud/spanner/admin/internal/database_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/spanner/admin/internal/database_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_rest_connection_impl.h b/google/cloud/spanner/admin/internal/database_admin_rest_connection_impl.h index a2b12feac3fd4..53ddc0a4ffa77 100644 --- a/google/cloud/spanner/admin/internal/database_admin_rest_connection_impl.h +++ b/google/cloud/spanner/admin/internal/database_admin_rest_connection_impl.h @@ -30,7 +30,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/internal/database_admin_rest_logging_decorator.h b/google/cloud/spanner/admin/internal/database_admin_rest_logging_decorator.h index 6ffd3976fed32..236b25e842a6c 100644 --- a/google/cloud/spanner/admin/internal/database_admin_rest_logging_decorator.h +++ b/google/cloud/spanner/admin/internal/database_admin_rest_logging_decorator.h @@ -24,8 +24,8 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_rest_metadata_decorator.h b/google/cloud/spanner/admin/internal/database_admin_rest_metadata_decorator.h index de4a4ebce4dfd..9e51d91518bed 100644 --- a/google/cloud/spanner/admin/internal/database_admin_rest_metadata_decorator.h +++ b/google/cloud/spanner/admin/internal/database_admin_rest_metadata_decorator.h @@ -23,8 +23,8 @@ #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_rest_stub.cc b/google/cloud/spanner/admin/internal/database_admin_rest_stub.cc index 83ccbb0c35c0c..3b2af6f69dcba 100644 --- a/google/cloud/spanner/admin/internal/database_admin_rest_stub.cc +++ b/google/cloud/spanner/admin/internal/database_admin_rest_stub.cc @@ -21,8 +21,8 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_rest_stub.h b/google/cloud/spanner/admin/internal/database_admin_rest_stub.h index 909157bc41860..c66257d16e824 100644 --- a/google/cloud/spanner/admin/internal/database_admin_rest_stub.h +++ b/google/cloud/spanner/admin/internal/database_admin_rest_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/internal/database_admin_stub.cc b/google/cloud/spanner/admin/internal/database_admin_stub.cc index b1f01bff5033a..78bcfd5686083 100644 --- a/google/cloud/spanner/admin/internal/database_admin_stub.cc +++ b/google/cloud/spanner/admin/internal/database_admin_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/spanner/admin/internal/database_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_stub.h b/google/cloud/spanner/admin/internal/database_admin_stub.h index dc65472c5867a..aee9d554587f7 100644 --- a/google/cloud/spanner/admin/internal/database_admin_stub.h +++ b/google/cloud/spanner/admin/internal/database_admin_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc b/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc index a11c9d8b1535f..240ed7fe3de90 100644 --- a/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc +++ b/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc b/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc index e162841b83920..c6fb018613466 100644 --- a/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc +++ b/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatabaseAdminTracingConnection::DatabaseAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -450,16 +448,12 @@ Status DatabaseAdminTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatabaseAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/spanner/admin/internal/database_admin_tracing_connection.h b/google/cloud/spanner/admin/internal/database_admin_tracing_connection.h index e100b8543b75d..bb0b6c61646e9 100644 --- a/google/cloud/spanner/admin/internal/database_admin_tracing_connection.h +++ b/google/cloud/spanner/admin/internal/database_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatabaseAdminTracingConnection : public spanner_admin::DatabaseAdminConnection { public: @@ -218,8 +216,6 @@ class DatabaseAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc b/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc index b196593eab748..3ad27f7cdaed8 100644 --- a/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc +++ b/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - DatabaseAdminTracingStub::DatabaseAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -518,15 +516,9 @@ future DatabaseAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeDatabaseAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/spanner/admin/internal/database_admin_tracing_stub.h b/google/cloud/spanner/admin/internal/database_admin_tracing_stub.h index 713af527d5a30..cd6c274aefcd6 100644 --- a/google/cloud/spanner/admin/internal/database_admin_tracing_stub.h +++ b/google/cloud/spanner/admin/internal/database_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class DatabaseAdminTracingStub : public DatabaseAdminStub { public: ~DatabaseAdminTracingStub() override = default; @@ -251,8 +249,6 @@ class DatabaseAdminTracingStub : public DatabaseAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.cc b/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.cc index fd72f79b6bdc0..b0dbfd7a02cc8 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/spanner/admin/instance/v1/spanner_instance_admin.proto #include "google/cloud/spanner/admin/internal/instance_admin_auth_decorator.h" -#include +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.h b/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.h index 44de21d1dda76..95f13b8312ae7 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.h +++ b/google/cloud/spanner/admin/internal/instance_admin_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/spanner/admin/internal/instance_admin_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_connection_impl.h b/google/cloud/spanner/admin/internal/instance_admin_connection_impl.h index 341b2a3ee10f6..de8201cc54c1a 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_connection_impl.h +++ b/google/cloud/spanner/admin/internal/instance_admin_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.cc b/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.cc index fc23fdae84002..f84477479b445 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/spanner/admin/internal/instance_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.h b/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.h index e50a21b2be37e..10369891589d1 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.h +++ b/google/cloud/spanner/admin/internal/instance_admin_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/spanner/admin/internal/instance_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.cc b/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.cc index ececec6fa18dd..5fa2d9cf8dd3c 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.h b/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.h index ba980eefaea01..ee083c3f6d19d 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.h +++ b/google/cloud/spanner/admin/internal/instance_admin_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/spanner/admin/internal/instance_admin_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_rest_connection_impl.h b/google/cloud/spanner/admin/internal/instance_admin_rest_connection_impl.h index 4dc4af03a8ccb..59dac0328c462 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_rest_connection_impl.h +++ b/google/cloud/spanner/admin/internal/instance_admin_rest_connection_impl.h @@ -30,7 +30,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/internal/instance_admin_rest_logging_decorator.h b/google/cloud/spanner/admin/internal/instance_admin_rest_logging_decorator.h index 7e97c2d7b5945..43b9e2785ce4b 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_rest_logging_decorator.h +++ b/google/cloud/spanner/admin/internal/instance_admin_rest_logging_decorator.h @@ -24,8 +24,8 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_rest_metadata_decorator.h b/google/cloud/spanner/admin/internal/instance_admin_rest_metadata_decorator.h index fc7bff64c6c9b..b2b9497e972e8 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_rest_metadata_decorator.h +++ b/google/cloud/spanner/admin/internal/instance_admin_rest_metadata_decorator.h @@ -23,8 +23,8 @@ #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc b/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc index c99ebe8c7859a..ceb42088359a7 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc @@ -21,8 +21,8 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_rest_stub.h b/google/cloud/spanner/admin/internal/instance_admin_rest_stub.h index 969b72a42239d..5a5f91778ce61 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_rest_stub.h +++ b/google/cloud/spanner/admin/internal/instance_admin_rest_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include namespace google { diff --git a/google/cloud/spanner/admin/internal/instance_admin_stub.cc b/google/cloud/spanner/admin/internal/instance_admin_stub.cc index ce1a3040e144d..588cd4bc75cab 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_stub.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/spanner/admin/internal/instance_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_stub.h b/google/cloud/spanner/admin/internal/instance_admin_stub.h index 539b05644915f..2c18a0ae12206 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_stub.h +++ b/google/cloud/spanner/admin/internal/instance_admin_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_stub_factory.cc b/google/cloud/spanner/admin/internal/instance_admin_stub_factory.cc index 9e843bf4e3641..2aab964cc4d6d 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_stub_factory.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc b/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc index b107fccbcb89c..a09f84d2791e2 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceAdminTracingConnection::InstanceAdminTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -434,16 +432,12 @@ Status InstanceAdminTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceAdminTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.h b/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.h index 688ccd004bbe7..8f77694ed9d35 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.h +++ b/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceAdminTracingConnection : public spanner_admin::InstanceAdminConnection { public: @@ -205,8 +203,6 @@ class InstanceAdminTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc b/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc index 5aa8b0d3eeeb8..f79807cc26c8f 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - InstanceAdminTracingStub::InstanceAdminTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -492,15 +490,9 @@ future InstanceAdminTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeInstanceAdminTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.h b/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.h index 7e24e58a73094..813485e46d040 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.h +++ b/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace spanner_admin_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class InstanceAdminTracingStub : public InstanceAdminStub { public: ~InstanceAdminTracingStub() override = default; @@ -232,8 +230,6 @@ class InstanceAdminTracingStub : public InstanceAdminStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/spanner/admin/retry_traits.h b/google/cloud/spanner/admin/retry_traits.h deleted file mode 100644 index c0460f752763d..0000000000000 --- a/google/cloud/spanner/admin/retry_traits.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_ADMIN_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_ADMIN_RETRY_TRAITS_H - -#include "google/cloud/spanner/admin/internal/database_admin_retry_traits.h" -#include "google/cloud/spanner/admin/internal/instance_admin_retry_traits.h" -#warning "This header is deprecated, it provided internal-only symbols" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_ADMIN_RETRY_TRAITS_H diff --git a/google/cloud/spanner/benchmarks/BUILD.bazel b/google/cloud/spanner/benchmarks/BUILD.bazel index 69b5801d80a7c..359a4783dbac1 100644 --- a/google/cloud/spanner/benchmarks/BUILD.bazel +++ b/google/cloud/spanner/benchmarks/BUILD.bazel @@ -30,7 +30,7 @@ cc_library( "//:spanner_mocks", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/spanner/benchmarks/multiple_rows_cpu_benchmark.cc b/google/cloud/spanner/benchmarks/multiple_rows_cpu_benchmark.cc index c97c92d158068..f9ab60755b4e3 100644 --- a/google/cloud/spanner/benchmarks/multiple_rows_cpu_benchmark.cc +++ b/google/cloud/spanner/benchmarks/multiple_rows_cpu_benchmark.cc @@ -29,7 +29,7 @@ #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/testing_util/timer.h" #include "absl/time/civil_time.h" -#include +#include "google/spanner/v1/result_set.pb.h" #include #include #include diff --git a/google/cloud/spanner/client.h b/google/cloud/spanner/client.h index d87f459f724e3..af5b64d8872f6 100644 --- a/google/cloud/spanner/client.h +++ b/google/cloud/spanner/client.h @@ -16,7 +16,6 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_H #include "google/cloud/spanner/batch_dml_result.h" -#include "google/cloud/spanner/client_options.h" #include "google/cloud/spanner/commit_options.h" #include "google/cloud/spanner/commit_result.h" #include "google/cloud/spanner/connection.h" @@ -41,7 +40,7 @@ #include "google/cloud/options.h" #include "google/cloud/status.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include #include @@ -717,15 +716,6 @@ class Client { StatusOr ExecutePartitionedDml(SqlStatement statement, Options opts = {}); - ///@{ - /// @name Backwards compatibility for ClientOptions. - explicit Client(std::shared_ptr conn, ClientOptions const& opts) - : Client(std::move(conn), Options(opts)) {} - explicit Client(std::shared_ptr conn, - std::initializer_list) - : Client(std::move(conn)) {} - ///@} - ///@{ /// @name Backwards compatibility for ReadOptions. /** diff --git a/google/cloud/spanner/client_options.cc b/google/cloud/spanner/client_options.cc deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/google/cloud/spanner/client_options.h b/google/cloud/spanner/client_options.h deleted file mode 100644 index 05b383f979d35..0000000000000 --- a/google/cloud/spanner/client_options.h +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H - -#include "google/cloud/spanner/query_options.h" -#include "google/cloud/spanner/version.h" -#include "google/cloud/options.h" - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * ClientOptions allows the caller to set a variety of options when - * constructing a `Client` instance. - * - * @deprecated Use [`Options`](@ref google::cloud::Options) instead, - * and set (as needed) - * [`QueryOptimizerVersionOption`]( - * @ref google::cloud::spanner::QueryOptimizerVersionOption), - * [`QueryOptimizerStatisticsPackageOption`]( - * @ref google::cloud::spanner::QueryOptimizerStatisticsPackageOption), - * [`RequestPriorityOption`]( - * @ref google::cloud::spanner::RequestPriorityOption), or - * [`RequestTagOption`]( - * @ref google::cloud::spanner::RequestTagOption). - */ -class ClientOptions { - public: - ClientOptions() = default; - ClientOptions(ClientOptions const&) = default; - ClientOptions& operator=(ClientOptions const&) = default; - ClientOptions(ClientOptions&&) = default; - ClientOptions& operator=(ClientOptions&&) = default; - - /** - * Convert the `ClientOptions` to the new, recommended way to represent - * options of all varieties, `google::cloud::Options`. - */ - explicit operator Options() const { return Options(query_options_); } - - /// Returns the `QueryOptions` - QueryOptions const& query_options() const { return query_options_; } - - /// Sets the `QueryOptions` - ClientOptions& set_query_options(QueryOptions qo) { - query_options_ = std::move(qo); - return *this; - } - - friend bool operator==(ClientOptions const& a, ClientOptions const& b) { - return a.query_options_ == b.query_options_; - } - - friend bool operator!=(ClientOptions const& a, ClientOptions const& b) { - return !(a == b); - } - - private: - QueryOptions query_options_; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H diff --git a/google/cloud/spanner/client_options_test.cc b/google/cloud/spanner/client_options_test.cc deleted file mode 100644 index 0fb24f2896570..0000000000000 --- a/google/cloud/spanner/client_options_test.cc +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/spanner/client_options.h" -#include "google/cloud/spanner/options.h" -#include "google/cloud/spanner/query_options.h" -#include "google/cloud/spanner/version.h" -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -TEST(ClientOptionsTest, OptimizerVersion) { - ClientOptions const default_constructed{}; - EXPECT_EQ(QueryOptions{}, default_constructed.query_options()); - - auto copy = default_constructed; - EXPECT_EQ(copy, default_constructed); - - copy.set_query_options(QueryOptions{}.set_optimizer_version("foo")); - EXPECT_NE(copy, default_constructed); - - copy.set_query_options(QueryOptions{}); - EXPECT_EQ(copy, default_constructed); -} - -TEST(ClientOptionsTest, OptionsConversionEmpty) { - ClientOptions const client_options; - auto const options = Options(client_options); - EXPECT_FALSE(options.has()); - EXPECT_FALSE(options.has()); - EXPECT_FALSE(options.has()); - EXPECT_FALSE(options.has()); -} - -TEST(ClientOptionsTest, OptionsConversionFull) { - auto query_options = QueryOptions{} - .set_optimizer_version("1") - .set_optimizer_statistics_package("latest") - .set_request_priority(RequestPriority::kHigh) - .set_request_tag("tag"); - ClientOptions client_options; - client_options.set_query_options(std::move(query_options)); - auto const options = Options(client_options); - EXPECT_TRUE(options.has()); - EXPECT_EQ(options.get(), "1"); - EXPECT_TRUE(options.has()); - EXPECT_EQ(options.get(), "latest"); - EXPECT_TRUE(options.has()); - EXPECT_EQ(options.get(), RequestPriority::kHigh); - EXPECT_TRUE(options.has()); - EXPECT_EQ(options.get(), "tag"); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/client_test.cc b/google/cloud/spanner/client_test.cc index 6f628eb43c9bc..626b6e207479f 100644 --- a/google/cloud/spanner/client_test.cc +++ b/google/cloud/spanner/client_test.cc @@ -1313,26 +1313,6 @@ TEST(ClientTest, UsesConnectionOptions) { EXPECT_STATUS_OK(rollback); } -TEST(ClientTest, UsesClientOptions) { - auto conn = std::make_shared(); - auto txn = MakeReadWriteTransaction(); - - EXPECT_CALL(*conn, options).WillOnce([] { - return Options{}.set("connection"); - }); - EXPECT_CALL(*conn, Rollback) - .WillOnce([txn](Connection::RollbackParams const& params) { - auto const& options = internal::CurrentOptions(); - EXPECT_THAT(options.get(), Eq("client")); - EXPECT_THAT(params.transaction, Eq(txn)); - return Status(); - }); - - Client client(conn, Options{}.set("client")); - auto rollback = client.Rollback(txn, Options{}); - EXPECT_STATUS_OK(rollback); -} - TEST(ClientTest, UsesOperationOptions) { auto conn = std::make_shared(); auto txn = MakeReadWriteTransaction(); diff --git a/google/cloud/spanner/create_instance_request_builder.h b/google/cloud/spanner/create_instance_request_builder.h index 4749192a45bd3..241ada42450d4 100644 --- a/google/cloud/spanner/create_instance_request_builder.h +++ b/google/cloud/spanner/create_instance_request_builder.h @@ -17,8 +17,8 @@ #include "google/cloud/spanner/instance.h" #include "google/cloud/spanner/version.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include -#include #include #include diff --git a/google/cloud/spanner/database_admin_client.cc b/google/cloud/spanner/database_admin_client.cc deleted file mode 100644 index 60a21f2e65faa..0000000000000 --- a/google/cloud/spanner/database_admin_client.cc +++ /dev/null @@ -1,252 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/database_admin_client.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/options.h" -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -namespace gsad = ::google::spanner::admin::database; - -DatabaseAdminClient::DatabaseAdminClient(ConnectionOptions const& options) - : conn_(MakeDatabaseAdminConnection(options)) {} - -future> DatabaseAdminClient::CreateDatabase( - Database db, std::vector extra_statements, - EncryptionConfig encryption_config) { - internal::OptionsSpan span(conn_->options()); - return conn_->CreateDatabase({std::move(db), std::move(extra_statements), - std::move(encryption_config)}); -} - -StatusOr DatabaseAdminClient::GetDatabase(Database db) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetDatabase({std::move(db)}); -} - -StatusOr DatabaseAdminClient::GetDatabaseDdl( - Database db) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetDatabaseDdl({std::move(db)}); -} - -future> -DatabaseAdminClient::UpdateDatabase(Database db, - std::vector statements) { - internal::OptionsSpan span(conn_->options()); - return conn_->UpdateDatabase({std::move(db), std::move(statements)}); -} - -ListDatabaseRange DatabaseAdminClient::ListDatabases(Instance in) { - internal::OptionsSpan span(conn_->options()); - return conn_->ListDatabases({std::move(in)}); -} - -Status DatabaseAdminClient::DropDatabase(Database db) { - internal::OptionsSpan span(conn_->options()); - return conn_->DropDatabase({std::move(db)}); -} - -future> DatabaseAdminClient::RestoreDatabase( - Database db, Backup const& backup, EncryptionConfig encryption_config) { - internal::OptionsSpan span(conn_->options()); - return conn_->RestoreDatabase( - {std::move(db), backup.FullName(), std::move(encryption_config)}); -} - -future> DatabaseAdminClient::RestoreDatabase( - Database db, google::spanner::admin::database::v1::Backup const& backup, - EncryptionConfig encryption_config) { - internal::OptionsSpan span(conn_->options()); - return conn_->RestoreDatabase( - {std::move(db), backup.name(), std::move(encryption_config)}); -} - -StatusOr DatabaseAdminClient::GetIamPolicy( - Database db) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetIamPolicy({std::move(db)}); -} - -StatusOr DatabaseAdminClient::SetIamPolicy( - Database db, google::iam::v1::Policy policy) { - internal::OptionsSpan span(conn_->options()); - return conn_->SetIamPolicy({std::move(db), std::move(policy)}); -} - -StatusOr DatabaseAdminClient::SetIamPolicy( - Database const& db, IamUpdater const& updater) { - auto const rerun_maximum_duration = std::chrono::minutes(15); - auto default_rerun_policy = - LimitedTimeTransactionRerunPolicy(rerun_maximum_duration).clone(); - - auto const backoff_initial_delay = std::chrono::milliseconds(1000); - auto const backoff_maximum_delay = std::chrono::minutes(5); - auto const backoff_scaling = 2.0; - auto default_backoff_policy = - ExponentialBackoffPolicy(backoff_initial_delay, backoff_maximum_delay, - backoff_scaling) - .clone(); - - return SetIamPolicy(db, updater, std::move(default_rerun_policy), - std::move(default_backoff_policy)); -} - -StatusOr DatabaseAdminClient::SetIamPolicy( - Database const& db, IamUpdater const& updater, - std::unique_ptr rerun_policy, - std::unique_ptr backoff_policy) { - internal::OptionsSpan span(conn_->options()); - using RerunnablePolicy = spanner_internal::SafeTransactionRerun; - - Status last_status; - do { - auto current_policy = conn_->GetIamPolicy({db}); - if (!current_policy) { - last_status = std::move(current_policy).status(); - } else { - auto etag = current_policy->etag(); - auto desired = updater(*current_policy); - if (!desired.has_value()) { - return current_policy; - } - desired->set_etag(std::move(etag)); - auto result = conn_->SetIamPolicy({db, *std::move(desired)}); - if (RerunnablePolicy::IsOk(result.status())) { - return result; - } - last_status = std::move(result).status(); - } - if (!rerun_policy->OnFailure(last_status)) break; - std::this_thread::sleep_for(backoff_policy->OnCompletion()); - } while (!rerun_policy->IsExhausted()); - return last_status; -} - -StatusOr -DatabaseAdminClient::TestIamPermissions(Database db, - std::vector permissions) { - internal::OptionsSpan span(conn_->options()); - return conn_->TestIamPermissions({std::move(db), std::move(permissions)}); -} - -future> DatabaseAdminClient::CreateBackup( - Database db, std::string backup_id, Timestamp expire_time, - absl::optional version_time, - EncryptionConfig encryption_config) { - internal::OptionsSpan span(conn_->options()); - auto expire_time_point = - expire_time.get(); - if (!expire_time_point) { - expire_time_point = std::chrono::system_clock::time_point::max(); - } - return conn_->CreateBackup( - {std::move(db), std::move(backup_id), *std::move(expire_time_point), - expire_time, std::move(version_time), std::move(encryption_config)}); -} - -future> DatabaseAdminClient::CreateBackup( - Database db, std::string backup_id, - std::chrono::system_clock::time_point expire_time) { - internal::OptionsSpan span(conn_->options()); - auto ts = MakeTimestamp(expire_time); - if (!ts) return make_ready_future(StatusOr(ts.status())); - return CreateBackup(std::move(db), std::move(backup_id), *ts); -} - -StatusOr DatabaseAdminClient::GetBackup( - Backup const& backup) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetBackup({backup.FullName()}); -} - -Status DatabaseAdminClient::DeleteBackup( - google::spanner::admin::database::v1::Backup const& backup) { - internal::OptionsSpan span(conn_->options()); - return conn_->DeleteBackup({backup.name()}); -} - -Status DatabaseAdminClient::DeleteBackup(Backup const& backup) { - internal::OptionsSpan span(conn_->options()); - return conn_->DeleteBackup({backup.FullName()}); -} - -ListBackupsRange DatabaseAdminClient::ListBackups(Instance in, - std::string filter) { - internal::OptionsSpan span(conn_->options()); - return conn_->ListBackups({std::move(in), std::move(filter)}); -} - -StatusOr DatabaseAdminClient::UpdateBackupExpireTime( - google::spanner::admin::database::v1::Backup const& backup, - Timestamp expire_time) { - internal::OptionsSpan span(conn_->options()); - google::spanner::admin::database::v1::UpdateBackupRequest request; - request.mutable_backup()->set_name(backup.name()); - *request.mutable_backup()->mutable_expire_time() = - expire_time.get().value(); - request.mutable_update_mask()->add_paths("expire_time"); - return conn_->UpdateBackup({request}); -} - -StatusOr DatabaseAdminClient::UpdateBackupExpireTime( - Backup const& backup, Timestamp expire_time) { - internal::OptionsSpan span(conn_->options()); - google::spanner::admin::database::v1::UpdateBackupRequest request; - request.mutable_backup()->set_name(backup.FullName()); - *request.mutable_backup()->mutable_expire_time() = - expire_time.get().value(); - request.mutable_update_mask()->add_paths("expire_time"); - return conn_->UpdateBackup({request}); -} - -StatusOr DatabaseAdminClient::UpdateBackupExpireTime( - google::spanner::admin::database::v1::Backup const& backup, - std::chrono::system_clock::time_point const& expire_time) { - auto ts = MakeTimestamp(expire_time); - if (!ts) return ts.status(); - return UpdateBackupExpireTime(backup, *ts); -} - -StatusOr DatabaseAdminClient::UpdateBackupExpireTime( - Backup const& backup, - std::chrono::system_clock::time_point const& expire_time) { - auto ts = MakeTimestamp(expire_time); - if (!ts) return ts.status(); - return UpdateBackupExpireTime(backup, *ts); -} - -ListBackupOperationsRange DatabaseAdminClient::ListBackupOperations( - Instance in, std::string filter) { - internal::OptionsSpan span(conn_->options()); - return conn_->ListBackupOperations({std::move(in), std::move(filter)}); -} - -ListDatabaseOperationsRange DatabaseAdminClient::ListDatabaseOperations( - Instance in, std::string filter) { - internal::OptionsSpan span(conn_->options()); - return conn_->ListDatabaseOperations({std::move(in), std::move(filter)}); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/database_admin_client.h b/google/cloud/spanner/database_admin_client.h deleted file mode 100644 index 9ee3db0d35493..0000000000000 --- a/google/cloud/spanner/database_admin_client.h +++ /dev/null @@ -1,604 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_DATABASE_ADMIN_CLIENT_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_DATABASE_ADMIN_CLIENT_H - -#include "google/cloud/spanner/backup.h" -#include "google/cloud/spanner/connection_options.h" -#include "google/cloud/spanner/database.h" -#include "google/cloud/spanner/database_admin_connection.h" -#include "google/cloud/spanner/encryption_config.h" -#include "google/cloud/spanner/iam_updater.h" -#include "google/cloud/spanner/instance.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/spanner/version.h" -#include "google/cloud/future.h" -#include "google/cloud/status_or.h" -#include "absl/types/optional.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * Performs database administration operations on Spanner. - * - * @deprecated Please use #google::cloud::spanner_admin::InstanceAdminClient - * instead. - * - * Applications use this class to perform administrative operations on spanner - * [Databases][database-doc-link]. - * - * @par Performance - * - * Creating a new `DatabaseAdminClient` is a relatively expensive operation, new - * objects establish new connections to the service. In contrast, copying or - * moving an existing `DatabaseAdminClient` object is a relatively cheap - * operation. Copied clients share the underlying resources. - * - * @par Thread Safety - * - * Instances of this class created via copy-construction or copy-assignment - * share the underlying pool of connections. Access to these copies via multiple - * threads is guaranteed to work. Two threads operating on the same instance of - * this class is not guaranteed to work. - * - * @par Error Handling - * - * This class uses `StatusOr` to report errors. When an operation fails to - * perform its work the returned `StatusOr` contains the error details. If - * the `ok()` member function in the `StatusOr` returns `true` then it - * contains the expected result. For more information, see the - * [Error Handling Guide](#spanner-error-handling). - * - * @code - * namespace spanner = ::google::cloud::spanner; - * using ::google::cloud::StatusOr; - * spanner::DatabaseAdminClient client = ...; - * StatusOr db = - * client.CreateDatabase(...).get(); - * - * if (!db) { - * std::cerr << "Error in CreateDatabase: " << db.status() << "\n"; - * return; - * } - * - * // Use `db` as a smart pointer here, e.g.: - * std::cout << "The database fully qualified name is: " << db->name() << "\n"; - * @endcode - * - * @par Long running operations - * - * Some operations in this class can take minutes to complete. In this case the - * class returns a `google::cloud::future>`, the application can - * then poll the `future` or associate a callback to be invoked when the - * operation completes: - * - * @code - * namespace spanner = ::google::cloud::spanner; - * spanner::DatabaseAdminClient client = ...; - * // Make example less verbose. - * using ::google::cloud::future; - * using ::google::cloud::StatusOr; - * using std::chrono::chrono_literals; // C++14 - * - * auto database = client.CreateDatabase(...); - * if (database.wait_for(5m) == std::future_state::ready) { - * std::cout << "Database created in under 5 minutes, yay!\n"; - * return; - * } - * // Too slow, setup a callback instead: - * database.then([](auto f) { - * StatusOr db = f.get(); - * if (!db) { - * std::cout << "Failed creating a database!\n"; - * return; - * } - * std::cout << "Database created!\n"; - * }); - * @endcode - * - * [database-doc-link]: - * https://cloud.google.com/spanner/docs/schema-and-data-model - */ -class GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("DatabaseAdminClient") - DatabaseAdminClient { - public: - explicit DatabaseAdminClient( - ConnectionOptions const& options = ConnectionOptions()); - - /** - * Creates a new Cloud Spanner database in the given project and instance. - * - * This function creates a database (using the "CREATE DATABASE" DDL - * statement) in the given Google Cloud Project and Cloud Spanner instance. - * The application can provide an optional list of additional DDL statements - * to atomically create tables and indices as well as the new database. - * - * Note that the database id must be between 2 and 30 characters long, it must - * start with a lowercase letter (`[a-z]`), it must end with a lowercase - * letter or a number (`[a-z0-9]`) and any characters between the beginning - * and ending characters must be lower case letters, numbers, underscore (`_`) - * or dashes (`-`), that is, they must belong to the `[a-z0-9_-]` character - * set. - * - * @p encryption_config How to encrypt the database. - * - * @return A `google::cloud::future` that becomes satisfied when the operation - * completes on the service. Note that this can take minutes in some cases. - * - * @par Example - * @snippet samples.cc create-database - * - * @see https://cloud.google.com/spanner/docs/data-definition-language for a - * full list of the DDL operations - * - * @see - * https://cloud.google.com/spanner/docs/data-definition-language#create_database - * for the regular expression that must be satisfied by the database id. - */ - future> - CreateDatabase(Database db, std::vector extra_statements = {}, - EncryptionConfig encryption_config = DefaultEncryption()); - - /** - * Retrieve metadata information about a database. - * - * @par Idempotency - * This is a read-only operation and therefore always idempotent. Transient - * failures are automatically retried. - * - * @par Example - * @snippet samples.cc get-database - */ - StatusOr GetDatabase( - Database db); - - /** - * Retrieve a database schema. - * - * @par Idempotency - * This is a read-only operation and therefore always idempotent. Transient - * failures are automatically retried. - * - * @par Example - * @snippet samples.cc get-database-ddl - */ - StatusOr - GetDatabaseDdl(Database db); - - /** - * Updates the database using a series of DDL statements. - * - * This function schedules a series of updates to the database using a - * sequence of DDL statements. - * - * @return A `google::cloud::future` that becomes satisfied when all the - * statements complete. Note that Cloud Spanner may fail to execute some of - * the statements. - * - * @par Example - * @snippet samples.cc add-column - * - * @see https://cloud.google.com/spanner/docs/data-definition-language for a - * full list of the DDL operations - */ - future< - StatusOr> - UpdateDatabase(Database db, std::vector statements); - - /** - * Drops (deletes) an existing Cloud Spanner database. - * - * @warning Dropping a database deletes all the tables and other data in the - * database. This is an unrecoverable operation. - * - * @par Example - * @snippet samples.cc drop-database - */ - Status DropDatabase(Database db); - - /** - * List all the databases in a give project and instance. - * - * @par Idempotency - * This operation is read-only and therefore always idempotent. - * - * @par Example - * @snippet samples.cc list-databases - */ - ListDatabaseRange ListDatabases(Instance in); - - /** - * Create a new database by restoring from a completed backup. - * - * @par Idempotency - * This is not an idempotent operation. Transient failures are not retried. - * - * The new database must be in the same project and in an instance with the - * same instance configuration as the instance containing the backup. - * - * @p encryption_config How to encrypt the database. - * - * @return A `google::cloud::future` that becomes satisfied when the operation - * completes on the service. Note that this can take minutes in some cases. - * - * @par Example - * @snippet samples.cc restore-database - */ - future> - RestoreDatabase(Database db, Backup const& backup, - EncryptionConfig encryption_config = DefaultEncryption()); - - /** - * Create a new database by restoring from a completed backup. - * - * @par Idempotency - * This is not an idempotent operation. Transient failures are not retried. - * - * The new database must be in the same project and in an instance with the - * same instance configuration as the instance containing the backup. - * - * @p encryption_config How to encrypt the database. - * - * @return A `google::cloud::future` that becomes satisfied when the operation - * completes on the service. Note that this can take minutes in some cases. - */ - future> - RestoreDatabase(Database db, - google::spanner::admin::database::v1::Backup const& backup, - EncryptionConfig encryption_config = DefaultEncryption()); - - /** - * Gets the IAM policy for a database. - * - * @par Idempotency - * This operation is read-only and therefore always idempotent. - * - * @par Example - * @snippet samples.cc database-get-iam-policy - */ - StatusOr GetIamPolicy(Database db); - - /** - * Set the IAM policy for the given database. - * - * This function changes the IAM policy configured in the given database to - * the value of @p policy. - * - * @par Idempotency - * This function is only idempotent if the `etag` field in @p policy is set. - * Therefore, the underlying RPCs are only retried if the field is set, and - * the function returns the first RPC error in any other case. - * - * @see The [Cloud Spanner - * documentation](https://cloud.google.com/spanner/docs/iam) for a - * description of the roles and permissions supported by Cloud Spanner. - * @see [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions) - * for an introduction to Identity and Access Management in Google Cloud - * Platform. - */ - StatusOr SetIamPolicy( - Database db, google::iam::v1::Policy policy); - - /** - * Updates the IAM policy for an instance using an optimistic concurrency - * control loop. - * - * This function repeatedly reads the current IAM policy in @p db, and then - * calls the @p updater with the this policy. The @p updater returns an empty - * optional if no changes are required, or it returns the new desired value - * for the IAM policy. This function then updates the policy. - * - * Updating an IAM policy can fail with retryable errors or can be aborted - * because there were simultaneous changes the to IAM policy. In these cases - * this function reruns the loop until it succeeds. - * - * The function returns the final IAM policy, or an error if the rerun policy - * for the underlying connection has expired. - * - * @par Idempotency - * This function always sets the `etag` field on the policy, so the underlying - * RPCs are retried automatically. - * - * @par Example - * @snippet samples.cc add-database-reader-on-database - * - * @param db the identifier for the database where you want to change the IAM - * policy. - * @param updater a callback to modify the policy. Return an unset optional - * to indicate that no changes to the policy are needed. - */ - StatusOr SetIamPolicy(Database const& db, - IamUpdater const& updater); - - /** - * @copydoc SetIamPolicy(Database const&,IamUpdater const&) - * - * @param rerun_policy controls for how long (or how many times) the updater - * will be rerun after the IAM policy update aborts. - * @param backoff_policy controls how long `SetIamPolicy` waits between - * reruns. - */ - StatusOr SetIamPolicy( - Database const& db, IamUpdater const& updater, - std::unique_ptr rerun_policy, - std::unique_ptr backoff_policy); - - /** - * Get the subset of the permissions the caller has on the given database. - * - * This function compares the given list of permissions against those - * permissions granted to the caller, and returns the subset of the list that - * the caller actually holds. - * - * @note Permission wildcards, such as `spanner.*` are not allowed. - * - * @par Idempotency - * This operation is read-only and therefore always idempotent. - * - * @par Example - * @snippet samples.cc database-test-iam-permissions - * - * @see The [Cloud Spanner - * documentation](https://cloud.google.com/spanner/docs/iam) for a description - * of the roles and permissions supported by Cloud Spanner. - * @see [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions) - * for an introduction to Identity and Access Management in Google Cloud - * Platform. - */ - StatusOr TestIamPermissions( - Database db, std::vector permissions); - - /** - * Creates a new Cloud Spanner backup for the given database. - * - * @par Idempotency - * This is not an idempotent operation. Transient failures are not retried. - * - * This function creates a database backup for the given Google Cloud Spanner - * database. - * - * Note that the @p backup_id must be unique within the same instance, it must - * be between 2 and 60 characters long, it must start with a lowercase letter - * (`[a-z]`), it must end with a lowercase letter or a number (`[a-z0-9]`) and - * any characters between the beginning and ending characters must be lower - * case letters, numbers, underscore (`_`) or dashes (`-`), that is, they must - * belong to the `[a-z0-9_-]` character set. - * - * The @p expire_time must be at least 6 hours and at most 366 days from the - * time the `CreateBackup()` request is processed. - * - * The backup will contain an externally consistent copy of the database - * at @p version_time, if set. Otherwise, the version_time will be the - * create_time of the backup. - * - * @p encryption_config How to encrypt the backup. - * - * @return A `google::cloud::future` that becomes satisfied when the operation - * completes on the service. Note that this can take minutes in some cases. - * - * @par Example - * @snippet samples.cc create-backup - */ - future> CreateBackup( - Database db, std::string backup_id, Timestamp expire_time, - absl::optional version_time = absl::nullopt, - EncryptionConfig encryption_config = DefaultEncryption()); - - /** - * Creates a new Cloud Spanner backup for the given database. - * - * @deprecated this overload is deprecated; use the `Timestamp` overload - * instead. - * - * @par Idempotency - * This is not an idempotent operation. Transient failures are not retried. - * - * This function creates a database backup for the given Google Cloud Spanner - * database. - * - * Note that the @p backup_id must be unique within the same instance, it must - * be between 2 and 60 characters long, it must start with a lowercase letter - * (`[a-z]`), it must end with a lowercase letter or a number (`[a-z0-9]`) and - * any characters between the beginning and ending characters must be lower - * case letters, numbers, underscore (`_`) or dashes (`-`), that is, they must - * belong to the `[a-z0-9_-]` character set. - * - * The @p expire_time must be at least 6 hours and at most 366 days from the - * time the `CreateBackup()` request is processed. - * - * @return A `google::cloud::future` that becomes satisfied when the operation - * completes on the service. Note that this can take minutes in some cases. - */ - future> CreateBackup( - Database db, std::string backup_id, - std::chrono::system_clock::time_point expire_time); - - /** - * Retrieve metadata information about a Backup. - * - * @par Idempotency - * This is a read-only operation and therefore always idempotent. Transient - * failures are automatically retried. - * - * @par Example - * @snippet samples.cc get-backup - */ - StatusOr GetBackup( - Backup const& backup); - - /** - * Deletes a pending or completed Backup. - * - * @par Idempotency - * We treat this operation as idempotent. Transient failures are automatically - * retried. - */ - Status DeleteBackup( - google::spanner::admin::database::v1::Backup const& backup); - - /** - * Deletes a pending or completed Backup. - * - * @par Idempotency - * We treat this operation as idempotent. Transient failures are automatically - * retried. - * - * @par Example - * @snippet samples.cc delete-backup - */ - Status DeleteBackup(Backup const& backup); - - /** - * List all the backups in a given project and instance that match - * the filter. - * - * @par Idempotency - * This operation is read-only and therefore always idempotent. - * - * @param in An instance where the backup operations belong to. - * @param filter A filter expression that filters backups listed in the - * response. See [this documentation][spanner-api-reference-link] for the - * syntax of the filter expression. - * - * @par Example - * @snippet samples.cc list-backups - * - * [spanner-api-reference-link]: - * https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.ListBackupsRequest - */ - ListBackupsRange ListBackups(Instance in, std::string filter = {}); - - /** - * Update backup's @p expire_time. - * - * @par Idempotency - * This operation is idempotent as its result does not depend on the previous - * state of the backup. Note that, as is the case with all operations, it is - * subject to race conditions if multiple tasks are attempting to change the - * expire time in the same backup. - */ - StatusOr UpdateBackupExpireTime( - google::spanner::admin::database::v1::Backup const& backup, - Timestamp expire_time); - - /** - * Update backup's @p expire_time. - * - * @par Idempotency - * This operation is idempotent as its result does not depend on the previous - * state of the backup. Note that, as is the case with all operations, it is - * subject to race conditions if multiple tasks are attempting to change the - * expire time in the same backup. - * - * @par Example - * @snippet samples.cc update-backup - */ - StatusOr UpdateBackupExpireTime( - Backup const& backup, Timestamp expire_time); - - /** - * Update backup's @p expire_time. - * - * @deprecated this overload is deprecated; use the `Timestamp` overload - * instead. - * - * @par Idempotency - * This operation is idempotent as its result does not depend on the previous - * state of the backup. Note that, as is the case with all operations, it is - * subject to race conditions if multiple tasks are attempting to change the - * expire time in the same backup. - */ - StatusOr UpdateBackupExpireTime( - google::spanner::admin::database::v1::Backup const& backup, - std::chrono::system_clock::time_point const& expire_time); - - /** - * Update backup's @p expire_time. - * - * @deprecated this overload is deprecated; use the `Timestamp` overload - * instead. - * - * @par Idempotency - * This operation is idempotent as its result does not depend on the previous - * state of the backup. Note that, as is the case with all operations, it is - * subject to race conditions if multiple tasks are attempting to change the - * expire time in the same backup. - */ - StatusOr UpdateBackupExpireTime( - Backup const& backup, - std::chrono::system_clock::time_point const& expire_time); - - /** - * List all the backup operations in a given project and instance that match - * the filter. - * - * @par Idempotency - * This operation is read-only and therefore always idempotent. - * - * @param in An instance where the backup operations belong to. - * @param filter A filter expression that filters what operations are returned - * in the response. See [this documentation][spanner-api-reference-link] for - * the syntax of the filter expression. - * - * @par Example - * @snippet samples.cc list-backup-operations - * - * [spanner-api-reference-link]: - * https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.ListBackupOperationsRequest - */ - ListBackupOperationsRange ListBackupOperations(Instance in, - std::string filter = {}); - - /** - * List all the database operations in a given project and instance that match - * the filter. - * - * @par Idempotency - * This operation is read-only and therefore always idempotent. - * - * @param in An instance where the database operations belong to. - * @param filter A filter expression that filters what operations are returned - * in the response. See [this documentation][spanner-api-reference-link] for - * the syntax of the filter expression. - * - * @par Example - * @snippet samples.cc list-database-operations - * - * [spanner-api-reference-link]: - * https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.ListDatabaseOperationsRequest - */ - ListDatabaseOperationsRange ListDatabaseOperations(Instance in, - std::string filter = {}); - - /// Create a new client with the given stub. For testing only. - explicit DatabaseAdminClient(std::shared_ptr c) - : conn_(std::move(c)) {} - - private: - std::shared_ptr conn_; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_DATABASE_ADMIN_CLIENT_H diff --git a/google/cloud/spanner/database_admin_client_test.cc b/google/cloud/spanner/database_admin_client_test.cc deleted file mode 100644 index 0f178d89e355e..0000000000000 --- a/google/cloud/spanner/database_admin_client_test.cc +++ /dev/null @@ -1,725 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/database_admin_client.h" -#include "google/cloud/spanner/mocks/mock_database_admin_connection.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/time/clock.h" -#include "absl/time/time.h" -#include "absl/types/optional.h" -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace gsad = ::google::spanner::admin::database; - -using ::google::cloud::spanner_mocks::MockDatabaseAdminConnection; -using ::google::cloud::testing_util::StatusIs; -using ::testing::AtLeast; -using ::testing::ElementsAre; -using ::testing::HasSubstr; - -/// @test Verify DatabaseAdminClient uses CreateDatabase() correctly. -TEST(DatabaseAdminClientTest, CreateDatabase) { - auto mock = std::make_shared(); - - Database dbase("test-project", "test-instance", "test-db"); - - EXPECT_CALL(*mock, CreateDatabase) - .WillOnce( - [&dbase](DatabaseAdminConnection::CreateDatabaseParams const& p) { - EXPECT_EQ(p.database, dbase); - EXPECT_THAT(p.extra_statements, ElementsAre("-- NOT SQL for test")); - gsad::v1::Database database; - database.set_name(dbase.FullName()); - database.set_state(gsad::v1::Database::CREATING); - return make_ready_future(make_status_or(database)); - }); - - DatabaseAdminClient client(std::move(mock)); - auto fut = client.CreateDatabase(dbase, {"-- NOT SQL for test"}); - ASSERT_EQ(std::future_status::ready, fut.wait_for(std::chrono::seconds(0))); - auto db = fut.get(); - ASSERT_STATUS_OK(db); - - EXPECT_EQ(dbase.FullName(), db->name()); - EXPECT_EQ(gsad::v1::Database::CREATING, db->state()); -} - -/// @test Verify DatabaseAdminClient uses GetDatabase() correctly. -TEST(DatabaseAdminClientTest, GetDatabase) { - auto mock = std::make_shared(); - Database dbase("test-project", "test-instance", "test-db"); - - EXPECT_CALL(*mock, GetDatabase) - .WillOnce([&dbase](DatabaseAdminConnection::GetDatabaseParams const& p) { - EXPECT_EQ(dbase, p.database); - gsad::v1::Database response; - response.set_name(p.database.FullName()); - response.set_state(gsad::v1::Database::READY); - return response; - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.GetDatabase(dbase); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Database::READY, response->state()); - EXPECT_EQ(dbase.FullName(), response->name()); -} - -/// @test Verify DatabaseAdminClient uses GetDatabaseDdl() correctly. -TEST(DatabaseAdminClientTest, GetDatabaseDdl) { - auto mock = std::make_shared(); - Database const expected_name("test-project", "test-instance", - "test-database"); - - EXPECT_CALL(*mock, GetDatabaseDdl) - .WillOnce([&expected_name]( - DatabaseAdminConnection::GetDatabaseDdlParams const& p) { - EXPECT_EQ(expected_name, p.database); - gsad::v1::GetDatabaseDdlResponse response; - response.add_statements("CREATE DATABASE test-database"); - return response; - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.GetDatabaseDdl(expected_name); - ASSERT_STATUS_OK(response); - ASSERT_EQ(1, response->statements_size()); - EXPECT_EQ("CREATE DATABASE test-database", response->statements(0)); -} - -/// @test Verify DatabaseAdminClient uses UpdateDatabase() correctly. -TEST(DatabaseAdminClientTest, UpdateDatabase) { - auto mock = std::make_shared(); - - Database dbase("test-project", "test-instance", "test-db"); - - EXPECT_CALL(*mock, UpdateDatabase) - .WillOnce( - [&dbase](DatabaseAdminConnection::UpdateDatabaseParams const& p) { - EXPECT_EQ(p.database, dbase); - EXPECT_THAT(p.statements, ElementsAre("-- test only: NOT SQL")); - gsad::v1::UpdateDatabaseDdlMetadata metadata; - metadata.add_statements("-- test only: NOT SQL"); - return make_ready_future(make_status_or(metadata)); - }); - - DatabaseAdminClient client(std::move(mock)); - auto fut = client.UpdateDatabase(dbase, {"-- test only: NOT SQL"}); - ASSERT_EQ(std::future_status::ready, fut.wait_for(std::chrono::seconds(0))); - auto db = fut.get(); - ASSERT_STATUS_OK(db); - - EXPECT_THAT(db->statements(), ElementsAre("-- test only: NOT SQL")); -} - -TEST(DatabaseAdminClientTest, ListDatabases) { - auto mock = std::make_shared(); - Instance const expected_instance("test-project", "test-instance"); - EXPECT_CALL(*mock, ListDatabases) - .WillOnce([&expected_instance]( - DatabaseAdminConnection::ListDatabasesParams const& p) { - EXPECT_EQ(expected_instance, p.instance); - - return google::cloud::internal::MakePaginationRange( - gsad::v1::ListDatabasesRequest{}, - [](gsad::v1::ListDatabasesRequest const&) { - return StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh")); - }, - [](gsad::v1::ListDatabasesResponse const&) { - return std::vector{}; - }); - }); - - DatabaseAdminClient client(mock); - auto range = client.ListDatabases(expected_instance); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify DatabaseAdminClient uses GetIamPolicy() correctly. -TEST(DatabaseAdminClientTest, GetIamPolicy) { - auto mock = std::make_shared(); - Database const expected_db("test-project", "test-instance", "test-database"); - std::string const expected_role = "roles/spanner.databaseReader"; - std::string const expected_member = "user:foobar@example.com"; - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([&expected_db, &expected_role, &expected_member]( - DatabaseAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ(expected_db, p.database); - google::iam::v1::Policy response; - auto& binding = *response.add_bindings(); - binding.set_role(expected_role); - *binding.add_members() = expected_member; - return response; - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.GetIamPolicy(expected_db); - ASSERT_STATUS_OK(response); - ASSERT_EQ(1, response->bindings().size()); - EXPECT_EQ(expected_role, response->bindings().Get(0).role()); - ASSERT_EQ(1, response->bindings().Get(0).members().size()); - EXPECT_EQ(expected_member, response->bindings().Get(0).members().Get(0)); -} - -/// @test Verify DatabaseAdminClient uses SetIamPolicy() correctly. -TEST(DatabaseAdminClientTest, SetIamPolicy) { - auto mock = std::make_shared(); - Database const expected_db("test-project", "test-instance", "test-database"); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce( - [&expected_db](DatabaseAdminConnection::SetIamPolicyParams const& p) { - EXPECT_EQ(expected_db, p.database); - return p.policy; - }); - DatabaseAdminClient client(std::move(mock)); - auto response = client.SetIamPolicy(expected_db, google::iam::v1::Policy{}); - EXPECT_STATUS_OK(response); -} - -TEST(DatabaseAdminClientTest, SetIamPolicyOccGetFailure) { - Database const db("test-project", "test-instance", "test-database"); - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([&db](DatabaseAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - DatabaseAdminClient client(mock); - auto actual = client.SetIamPolicy(db, [](google::iam::v1::Policy const&) { - return absl::optional{}; - }); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(DatabaseAdminClientTest, SetIamPolicyOccNoUpdates) { - Database const db("test-project", "test-instance", "test-database"); - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([&db](DatabaseAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - google::iam::v1::Policy r; - r.set_etag("test-etag"); - return r; - }); - EXPECT_CALL(*mock, SetIamPolicy).Times(0); - - DatabaseAdminClient client(mock); - auto actual = client.SetIamPolicy(db, [](google::iam::v1::Policy const& p) { - EXPECT_EQ("test-etag", p.etag()); - return absl::optional{}; - }); - ASSERT_STATUS_OK(actual); - EXPECT_EQ("test-etag", actual->etag()); -} - -std::unique_ptr RerunPolicyForTesting() { - return LimitedErrorCountTransactionRerunPolicy(/*maximum_failures=*/3) - .clone(); -} - -std::unique_ptr BackoffPolicyForTesting() { - return ExponentialBackoffPolicy( - /*initial_delay=*/std::chrono::microseconds(1), - /*maximum_delay=*/std::chrono::microseconds(1), /*scaling=*/2.0) - .clone(); -} - -TEST(DatabaseAdminClientTest, SetIamPolicyOccRetryAborted) { - Database const db("test-project", "test-instance", "test-database"); - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([&db](DatabaseAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - google::iam::v1::Policy r; - r.set_etag("test-etag-1"); - return r; - }) - .WillOnce([&db](DatabaseAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - google::iam::v1::Policy r; - r.set_etag("test-etag-2"); - return r; - }); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce([&db](DatabaseAdminConnection::SetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - EXPECT_EQ("test-etag-1", p.policy.etag()); - return Status(StatusCode::kAborted, "aborted"); - }) - .WillOnce([&db](DatabaseAdminConnection::SetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - EXPECT_EQ("test-etag-2", p.policy.etag()); - google::iam::v1::Policy r; - r.set_etag("test-etag-3"); - return r; - }); - - DatabaseAdminClient client(mock); - int counter = 0; - auto actual = client.SetIamPolicy( - db, - [&counter](google::iam::v1::Policy p) { - EXPECT_EQ("test-etag-" + std::to_string(++counter), p.etag()); - return p; - }, - RerunPolicyForTesting(), BackoffPolicyForTesting()); - ASSERT_STATUS_OK(actual); - EXPECT_EQ("test-etag-3", actual->etag()); -} - -TEST(DatabaseAdminClientTest, SetIamPolicyOccRetryAbortedTooManyFailures) { - Database const db("test-project", "test-instance", "test-database"); - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillRepeatedly( - [&db](DatabaseAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - google::iam::v1::Policy r; - r.set_etag("test-etag-1"); - return r; - }); - EXPECT_CALL(*mock, SetIamPolicy) - .Times(AtLeast(2)) - .WillRepeatedly( - [&db](DatabaseAdminConnection::SetIamPolicyParams const& p) { - EXPECT_EQ(db, p.database); - EXPECT_EQ("test-etag-1", p.policy.etag()); - return Status(StatusCode::kAborted, "test-msg"); - }); - - DatabaseAdminClient client(mock); - auto actual = client.SetIamPolicy( - db, [](google::iam::v1::Policy p) { return p; }, RerunPolicyForTesting(), - BackoffPolicyForTesting()); - EXPECT_THAT(actual, StatusIs(StatusCode::kAborted, HasSubstr("test-msg"))); -} - -/// @test Verify DatabaseAdminClient uses TestIamPermissions() correctly. -TEST(DatabaseAdminClientTest, TestIamPermissions) { - auto mock = std::make_shared(); - Database const expected_db("test-project", "test-instance", "test-database"); - std::string expected_permission = "spanner.databases.read"; - EXPECT_CALL(*mock, TestIamPermissions) - .WillOnce( - [&expected_db, &expected_permission]( - DatabaseAdminConnection::TestIamPermissionsParams const& p) { - EXPECT_EQ(expected_db, p.database); - EXPECT_EQ(1, p.permissions.size()); - EXPECT_EQ(expected_permission, p.permissions.at(0)); - google::iam::v1::TestIamPermissionsResponse response; - response.add_permissions(expected_permission); - return response; - }); - DatabaseAdminClient client(std::move(mock)); - auto response = client.TestIamPermissions(expected_db, {expected_permission}); - ASSERT_STATUS_OK(response); - ASSERT_EQ(1, response->permissions_size()); - EXPECT_EQ(expected_permission, response->permissions(0)); -} - -/// @test Verify DatabaseAdminClient uses CreateBackup() correctly. -TEST(DatabaseAdminClientTest, CreateBackup) { - auto mock = std::make_shared(); - - Database dbase("test-project", "test-instance", "test-db"); - std::string backup_id = "test-backup"; - auto now = absl::Now(); - auto expire_time = MakeTimestamp(now + absl::Hours(7)).value(); - auto version_time = MakeTimestamp(now - absl::Hours(7)).value(); - Backup backup_name(dbase.instance(), backup_id); - EXPECT_CALL(*mock, CreateBackup) - .WillOnce([&dbase, &expire_time, &version_time, &backup_id, &backup_name]( - DatabaseAdminConnection::CreateBackupParams const& p) { - EXPECT_EQ(p.database, dbase); - EXPECT_EQ(MakeTimestamp(p.expire_time).value(), - MakeTimestamp( - expire_time.get() - .value()) - .value()); - EXPECT_EQ(p.expire_timestamp, expire_time); - EXPECT_EQ(p.version_time, version_time); - EXPECT_EQ(p.backup_id, backup_id); - gsad::v1::Backup backup; - backup.set_name(backup_name.FullName()); - backup.set_state(gsad::v1::Backup::CREATING); - return make_ready_future(make_status_or(backup)); - }) - .WillOnce([&dbase, &expire_time, &backup_id, &backup_name]( - DatabaseAdminConnection::CreateBackupParams const& p) { - EXPECT_EQ(p.database, dbase); - EXPECT_EQ(MakeTimestamp(p.expire_time).value(), - MakeTimestamp( - expire_time.get() - .value()) - .value()); - EXPECT_EQ(p.expire_timestamp, - MakeTimestamp( - expire_time.get() - .value()) - .value()); // loss of precision - EXPECT_FALSE(p.version_time.has_value()); - EXPECT_EQ(p.backup_id, backup_id); - gsad::v1::Backup backup; - backup.set_name(backup_name.FullName()); - backup.set_state(gsad::v1::Backup::CREATING); - return make_ready_future(make_status_or(backup)); - }); - - DatabaseAdminClient client(std::move(mock)); - auto fut = client.CreateBackup(dbase, backup_id, expire_time, version_time); - ASSERT_EQ(std::future_status::ready, fut.wait_for(std::chrono::seconds(0))); - auto backup = fut.get(); - ASSERT_STATUS_OK(backup); - EXPECT_EQ(backup_name.FullName(), backup->name()); - EXPECT_EQ(gsad::v1::Backup::CREATING, backup->state()); - - // Exercise the old interface with just a `time_point` expiration parameter. - fut = client.CreateBackup( - dbase, backup_id, - expire_time.get().value()); - ASSERT_EQ(std::future_status::ready, fut.wait_for(std::chrono::seconds(0))); - backup = fut.get(); - ASSERT_STATUS_OK(backup); - EXPECT_EQ(backup_name.FullName(), backup->name()); - EXPECT_EQ(gsad::v1::Backup::CREATING, backup->state()); -} - -/// @test Verify DatabaseAdminClient uses RestoreDatabase() correctly. -TEST(DatabaseAdminClientTest, RestoreDatabase) { - auto mock = std::make_shared(); - - Database dbase("test-project", "test-instance", "test-db"); - Backup backup(dbase.instance(), "test-backup"); - EXPECT_CALL(*mock, RestoreDatabase) - .WillOnce([&dbase, &backup]( - DatabaseAdminConnection::RestoreDatabaseParams const& p) { - EXPECT_EQ(p.database, dbase); - EXPECT_EQ(p.backup_full_name, backup.FullName()); - gsad::v1::Database database; - database.set_name(dbase.FullName()); - database.set_state(gsad::v1::Database::READY_OPTIMIZING); - return make_ready_future(make_status_or(database)); - }); - - DatabaseAdminClient client(std::move(mock)); - auto fut = client.RestoreDatabase(dbase, backup); - ASSERT_EQ(std::future_status::ready, fut.wait_for(std::chrono::seconds(0))); - auto database = fut.get(); - ASSERT_STATUS_OK(database); - - EXPECT_EQ(dbase.FullName(), database->name()); - EXPECT_EQ(gsad::v1::Database::READY_OPTIMIZING, database->state()); -} - -/// @test Verify DatabaseAdminClient uses RestoreDatabase() correctly. -TEST(DatabaseAdminClientTest, RestoreDatabaseOverload) { - auto mock = std::make_shared(); - - Database dbase("test-project", "test-instance", "test-db"); - Backup backup_name(dbase.instance(), "test-backup"); - gsad::v1::Backup backup; - backup.set_name(backup_name.FullName()); - EXPECT_CALL(*mock, RestoreDatabase) - .WillOnce([&dbase, &backup_name]( - DatabaseAdminConnection::RestoreDatabaseParams const& p) { - EXPECT_EQ(p.database, dbase); - EXPECT_EQ(p.backup_full_name, backup_name.FullName()); - gsad::v1::Database database; - database.set_name(dbase.FullName()); - database.set_state(gsad::v1::Database::READY_OPTIMIZING); - return make_ready_future(make_status_or(database)); - }); - - DatabaseAdminClient client(std::move(mock)); - auto fut = client.RestoreDatabase(dbase, backup); - ASSERT_EQ(std::future_status::ready, fut.wait_for(std::chrono::seconds(0))); - auto database = fut.get(); - ASSERT_STATUS_OK(database); - - EXPECT_EQ(dbase.FullName(), database->name()); - EXPECT_EQ(gsad::v1::Database::READY_OPTIMIZING, database->state()); -} - -/// @test Verify DatabaseAdminClient uses GetBackup() correctly. -TEST(DatabaseAdminClientTest, GetBackup) { - auto mock = std::make_shared(); - Backup backup(Instance("test-project", "test-instance"), "test-backup"); - - EXPECT_CALL(*mock, GetBackup) - .WillOnce([&backup](DatabaseAdminConnection::GetBackupParams const& p) { - EXPECT_EQ(backup.FullName(), p.backup_full_name); - gsad::v1::Backup response; - response.set_name(p.backup_full_name); - response.set_state(gsad::v1::Backup::READY); - return response; - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.GetBackup(backup); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(backup.FullName(), response->name()); -} - -/// @test Verify DatabaseAdminClient uses DeleteBackup() correctly. -TEST(DatabaseAdminClientTest, DeleteBackup) { - auto mock = std::make_shared(); - Backup backup(Instance("test-project", "test-instance"), "test-backup"); - - EXPECT_CALL(*mock, DeleteBackup) - .WillOnce( - [&backup](DatabaseAdminConnection::DeleteBackupParams const& p) { - EXPECT_EQ(backup.FullName(), p.backup_full_name); - return Status(); - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.DeleteBackup(backup); - EXPECT_STATUS_OK(response); -} - -/// @test Verify DatabaseAdminClient uses DeleteBackup() correctly. -TEST(DatabaseAdminClientTest, DeleteBackupOverload) { - auto mock = std::make_shared(); - Backup backup_name(Instance("test-project", "test-instance"), "test-backup"); - gsad::v1::Backup backup; - backup.set_name(backup_name.FullName()); - - EXPECT_CALL(*mock, DeleteBackup) - .WillOnce( - [&backup_name](DatabaseAdminConnection::DeleteBackupParams const& p) { - EXPECT_EQ(backup_name.FullName(), p.backup_full_name); - return Status(); - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.DeleteBackup(backup); - EXPECT_STATUS_OK(response); -} - -TEST(DatabaseAdminClientTest, ListBackups) { - auto mock = std::make_shared(); - Instance const expected_instance("test-project", "test-instance"); - std::string expected_filter("test-filter"); - EXPECT_CALL(*mock, ListBackups) - .WillOnce([&expected_instance, &expected_filter]( - DatabaseAdminConnection::ListBackupsParams const& p) { - EXPECT_EQ(expected_instance, p.instance); - EXPECT_EQ(expected_filter, p.filter); - - return google::cloud::internal::MakePaginationRange( - gsad::v1::ListBackupsRequest{}, - [](gsad::v1::ListBackupsRequest const&) { - return StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh")); - }, - [](gsad::v1::ListBackupsResponse const&) { - return std::vector{}; - }); - }); - - DatabaseAdminClient client(mock); - auto range = client.ListBackups(expected_instance, expected_filter); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify DatabaseAdminClient uses GetBackup() correctly. -TEST(DatabaseAdminClientTest, UpdateBackupExpireTime) { - auto mock = std::make_shared(); - Backup backup(Instance("test-project", "test-instance"), "test-backup"); - auto expire_time = MakeTimestamp(absl::Now() + absl::Hours(7)).value(); - - EXPECT_CALL(*mock, UpdateBackup) - .WillOnce([&backup, &expire_time]( - DatabaseAdminConnection::UpdateBackupParams const& p) { - EXPECT_EQ(backup.FullName(), p.request.backup().name()); - EXPECT_THAT(expire_time, - MakeTimestamp(p.request.backup().expire_time()).value()); - gsad::v1::Backup response; - response.set_name(p.request.backup().name()); - *response.mutable_expire_time() = p.request.backup().expire_time(); - response.set_state(gsad::v1::Backup::READY); - return response; - }) - .WillOnce([&backup, &expire_time]( - DatabaseAdminConnection::UpdateBackupParams const& p) { - EXPECT_EQ(backup.FullName(), p.request.backup().name()); - EXPECT_THAT(MakeTimestamp( - expire_time.get() - .value()) - .value(), // loss of precision - MakeTimestamp(p.request.backup().expire_time()).value()); - gsad::v1::Backup response; - response.set_name(p.request.backup().name()); - *response.mutable_expire_time() = p.request.backup().expire_time(); - response.set_state(gsad::v1::Backup::READY); - return response; - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.UpdateBackupExpireTime(backup, expire_time); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(backup.FullName(), response->name()); - EXPECT_THAT(expire_time, MakeTimestamp(response->expire_time()).value()); - - // Exercise the old interface with a `time_point` expiration parameter. - response = client.UpdateBackupExpireTime( - backup, expire_time.get().value()); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(backup.FullName(), response->name()); - EXPECT_THAT( - MakeTimestamp( - expire_time.get().value()) - .value(), // loss of precision - MakeTimestamp(response->expire_time()).value()); -} - -/// @test Verify DatabaseAdminClient uses GetBackup() correctly. -TEST(DatabaseAdminClientTest, UpdateBackupExpireTimeOverload) { - auto mock = std::make_shared(); - Backup backup_name(Instance("test-project", "test-instance"), "test-backup"); - gsad::v1::Backup backup; - backup.set_name(backup_name.FullName()); - auto expire_time = MakeTimestamp(absl::Now() + absl::Hours(7)).value(); - - EXPECT_CALL(*mock, UpdateBackup) - .WillOnce([&backup_name, &expire_time]( - DatabaseAdminConnection::UpdateBackupParams const& p) { - EXPECT_EQ(backup_name.FullName(), p.request.backup().name()); - EXPECT_THAT(expire_time, - MakeTimestamp(p.request.backup().expire_time()).value()); - gsad::v1::Backup response; - response.set_name(p.request.backup().name()); - *response.mutable_expire_time() = p.request.backup().expire_time(); - response.set_state(gsad::v1::Backup::READY); - return response; - }) - .WillOnce([&backup_name, &expire_time]( - DatabaseAdminConnection::UpdateBackupParams const& p) { - EXPECT_EQ(backup_name.FullName(), p.request.backup().name()); - EXPECT_THAT(MakeTimestamp( - expire_time.get() - .value()) - .value(), // loss of precision - MakeTimestamp(p.request.backup().expire_time()).value()); - gsad::v1::Backup response; - response.set_name(p.request.backup().name()); - *response.mutable_expire_time() = p.request.backup().expire_time(); - response.set_state(gsad::v1::Backup::READY); - return response; - }); - - DatabaseAdminClient client(std::move(mock)); - auto response = client.UpdateBackupExpireTime(backup, expire_time); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(backup_name.FullName(), response->name()); - EXPECT_THAT(expire_time, MakeTimestamp(response->expire_time()).value()); - - // Exercise the old interface with a `time_point` expiration parameter. - response = client.UpdateBackupExpireTime( - backup, expire_time.get().value()); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(backup_name.FullName(), response->name()); - EXPECT_THAT( - MakeTimestamp( - expire_time.get().value()) - .value(), // loss of precision - MakeTimestamp(response->expire_time()).value()); -} - -TEST(DatabaseAdminClientTest, ListBackupOperations) { - auto mock = std::make_shared(); - Instance const expected_instance("test-project", "test-instance"); - std::string expected_filter("test-filter"); - EXPECT_CALL(*mock, ListBackupOperations) - .WillOnce( - [&expected_instance, &expected_filter]( - DatabaseAdminConnection::ListBackupOperationsParams const& p) { - EXPECT_EQ(expected_instance, p.instance); - EXPECT_EQ(expected_filter, p.filter); - - return google::cloud::internal::MakePaginationRange< - ListBackupOperationsRange>( - gsad::v1::ListBackupOperationsRequest{}, - [](gsad::v1::ListBackupOperationsRequest const&) { - return StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh")); - }, - [](gsad::v1::ListBackupOperationsResponse const&) { - return std::vector{}; - }); - }); - - DatabaseAdminClient client(mock); - auto range = client.ListBackupOperations(expected_instance, expected_filter); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(DatabaseAdminClientTest, ListDatabaseOperations) { - auto mock = std::make_shared(); - Instance const expected_instance("test-project", "test-instance"); - std::string expected_filter("test-filter"); - EXPECT_CALL(*mock, ListDatabaseOperations) - .WillOnce( - [&expected_instance, &expected_filter]( - DatabaseAdminConnection::ListDatabaseOperationsParams const& p) { - EXPECT_EQ(expected_instance, p.instance); - EXPECT_EQ(expected_filter, p.filter); - - return google::cloud::internal::MakePaginationRange< - ListDatabaseOperationsRange>( - gsad::v1::ListDatabaseOperationsRequest{}, - [](gsad::v1::ListDatabaseOperationsRequest const&) { - return StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh")); - }, - [](gsad::v1::ListDatabaseOperationsResponse const&) { - return std::vector{}; - }); - }); - - DatabaseAdminClient client(mock); - auto range = - client.ListDatabaseOperations(expected_instance, expected_filter); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/database_admin_connection.cc b/google/cloud/spanner/database_admin_connection.cc deleted file mode 100644 index 310585993fd58..0000000000000 --- a/google/cloud/spanner/database_admin_connection.cc +++ /dev/null @@ -1,680 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/database_admin_connection.h" -#include "google/cloud/spanner/internal/defaults.h" -#include "google/cloud/spanner/options.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/common_options.h" -#include "google/cloud/grpc_options.h" -#include "google/cloud/internal/async_long_running_operation.h" -#include "google/cloud/internal/retry_loop.h" -#include "google/cloud/options.h" -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -namespace gsad = ::google::spanner::admin::database; - -using ::google::cloud::Idempotency; -using ::google::cloud::internal::RetryLoop; - -future> -// NOLINTNEXTLINE(performance-unnecessary-value-param) -DatabaseAdminConnection::CreateBackup(CreateBackupParams) { - return google::cloud::make_ready_future(StatusOr( - Status(StatusCode::kUnimplemented, "not implemented"))); -} - -future> -// NOLINTNEXTLINE(performance-unnecessary-value-param) -DatabaseAdminConnection::RestoreDatabase(RestoreDatabaseParams) { - return google::cloud::make_ready_future(StatusOr( - Status(StatusCode::kUnimplemented, "not implemented"))); -} - -StatusOr -// NOLINTNEXTLINE(performance-unnecessary-value-param) -DatabaseAdminConnection::GetBackup(GetBackupParams) { - return Status(StatusCode::kUnimplemented, "not implemented"); -} - -// NOLINTNEXTLINE(performance-unnecessary-value-param) -Status DatabaseAdminConnection::DeleteBackup(DeleteBackupParams) { - return Status(StatusCode::kUnimplemented, "not implemented"); -} - -// NOLINTNEXTLINE(performance-unnecessary-value-param) -ListBackupsRange DatabaseAdminConnection::ListBackups(ListBackupsParams) { - return google::cloud::internal::MakePaginationRange( - gsad::v1::ListBackupsRequest{}, - [](gsad::v1::ListBackupsRequest const&) { - return StatusOr( - Status(StatusCode::kUnimplemented, "not implemented")); - }, - [](gsad::v1::ListBackupsResponse const&) { - return std::vector{}; - }); -} - -StatusOr -// NOLINTNEXTLINE(performance-unnecessary-value-param) -DatabaseAdminConnection::UpdateBackup(UpdateBackupParams) { - return Status(StatusCode::kUnimplemented, "not implemented"); -} - -ListBackupOperationsRange DatabaseAdminConnection::ListBackupOperations( - // NOLINTNEXTLINE(performance-unnecessary-value-param) - ListBackupOperationsParams) { - return google::cloud::internal::MakePaginationRange< - ListBackupOperationsRange>( - gsad::v1::ListBackupOperationsRequest{}, - [](gsad::v1::ListBackupOperationsRequest const&) { - return StatusOr( - Status(StatusCode::kUnimplemented, "not implemented")); - }, - [](gsad::v1::ListBackupOperationsResponse const&) { - return std::vector{}; - }); -} - -ListDatabaseOperationsRange DatabaseAdminConnection::ListDatabaseOperations( - // NOLINTNEXTLINE(performance-unnecessary-value-param) - ListDatabaseOperationsParams) { - return google::cloud::internal::MakePaginationRange< - ListDatabaseOperationsRange>( - gsad::v1::ListDatabaseOperationsRequest{}, - [](gsad::v1::ListDatabaseOperationsRequest const&) { - return StatusOr( - Status(StatusCode::kUnimplemented, "not implemented")); - }, - [](gsad::v1::ListDatabaseOperationsResponse const&) { - return std::vector{}; - }); -} - -namespace { - -class DatabaseAdminConnectionImpl : public DatabaseAdminConnection { - public: - // Note all the policies will be set to their default non-null values in the - // `MakeDatabaseAdminConnection()` function below. - explicit DatabaseAdminConnectionImpl( - std::shared_ptr stub, Options opts) - : stub_(std::move(stub)), - opts_(std::move(opts)), - retry_policy_prototype_(opts_.get()->clone()), - backoff_policy_prototype_( - opts_.get()->clone()), - polling_policy_prototype_( - opts_.get()->clone()), - background_threads_(internal::MakeBackgroundThreadsFactory(opts_)()) {} - - ~DatabaseAdminConnectionImpl() override = default; - - Options options() override { return opts_; } - - future> - CreateDatabase(CreateDatabaseParams p) override { - gsad::v1::CreateDatabaseRequest request; - request.set_parent(p.database.instance().FullName()); - request.set_create_statement("CREATE DATABASE `" + - p.database.database_id() + "`"); - struct EncryptionVisitor { - explicit EncryptionVisitor(gsad::v1::CreateDatabaseRequest& request) - : request_(request) {} - void operator()(DefaultEncryption const&) const { - // No encryption_config => GOOGLE_DEFAULT_ENCRYPTION. - } - void operator()(GoogleEncryption const&) const { - // No encryption_config => GOOGLE_DEFAULT_ENCRYPTION. - } - void operator()(CustomerManagedEncryption const& cme) const { - auto* config = request_.mutable_encryption_config(); - config->set_kms_key_name(cme.encryption_key().FullName()); - } - gsad::v1::CreateDatabaseRequest& request_; - }; - absl::visit(EncryptionVisitor(request), p.encryption_config); - for (auto& s : p.extra_statements) { - *request.add_extra_statements() = std::move(s); - } - return google::cloud::internal::AsyncLongRunningOperation< - gsad::v1::Database>( - background_threads_->cq(), internal::SaveCurrentOptions(), - std::move(request), - [stub = stub_](google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - gsad::v1::CreateDatabaseRequest const& request) { - return stub->AsyncCreateDatabase(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::GetOperationRequest const& request) { - return stub->AsyncGetOperation(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::CancelOperationRequest const& request) { - return stub->AsyncCancelOperation(cq, std::move(context), request); - }, - &google::cloud::internal::ExtractLongRunningResultResponse< - gsad::v1::Database>, - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kNonIdempotent, polling_policy_prototype_->clone(), - __func__); - } - - StatusOr GetDatabase( - GetDatabaseParams p) override { - gsad::v1::GetDatabaseRequest request; - request.set_name(p.database.FullName()); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsad::v1::GetDatabaseRequest const& request) { - return stub_->GetDatabase(context, request); - }, - request, __func__); - } - - StatusOr - GetDatabaseDdl(GetDatabaseDdlParams p) override { - gsad::v1::GetDatabaseDdlRequest request; - request.set_database(p.database.FullName()); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsad::v1::GetDatabaseDdlRequest const& request) { - return stub_->GetDatabaseDdl(context, request); - }, - request, __func__); - } - - future< - StatusOr> - UpdateDatabase(UpdateDatabaseParams p) override { - gsad::v1::UpdateDatabaseDdlRequest request; - request.set_database(p.database.FullName()); - for (auto& s : p.statements) { - *request.add_statements() = std::move(s); - } - return google::cloud::internal::AsyncLongRunningOperation< - gsad::v1::UpdateDatabaseDdlMetadata>( - background_threads_->cq(), internal::SaveCurrentOptions(), - std::move(request), - [stub = stub_](google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - gsad::v1::UpdateDatabaseDdlRequest const& request) { - return stub->AsyncUpdateDatabaseDdl(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::GetOperationRequest const& request) { - return stub->AsyncGetOperation(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::CancelOperationRequest const& request) { - return stub->AsyncCancelOperation(cq, std::move(context), request); - }, - &google::cloud::internal::ExtractLongRunningResultMetadata< - gsad::v1::UpdateDatabaseDdlMetadata>, - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kNonIdempotent, polling_policy_prototype_->clone(), - __func__); - } - - Status DropDatabase(DropDatabaseParams p) override { - google::spanner::admin::database::v1::DropDatabaseRequest request; - request.set_database(p.database.FullName()); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsad::v1::DropDatabaseRequest const& request) { - return stub_->DropDatabase(context, request); - }, - request, __func__); - } - - ListDatabaseRange ListDatabases(ListDatabasesParams p) override { - gsad::v1::ListDatabasesRequest request; - request.set_parent(p.instance.FullName()); - request.clear_page_token(); - auto& stub = stub_; - // Because we do not have C++14 generalized lambda captures we cannot just - // use the unique_ptr<> here, so convert to shared_ptr<> instead. - auto retry = - std::shared_ptr(retry_policy_prototype_->clone()); - auto backoff = std::shared_ptr( - backoff_policy_prototype_->clone()); - - char const* function_name = __func__; - return google::cloud::internal::MakePaginationRange( - std::move(request), - [stub, retry, backoff, - function_name](gsad::v1::ListDatabasesRequest const& r) { - return RetryLoop( - retry->clone(), backoff->clone(), Idempotency::kIdempotent, - [stub](grpc::ClientContext& context, - gsad::v1::ListDatabasesRequest const& request) { - return stub->ListDatabases(context, request); - }, - r, function_name); - }, - [](gsad::v1::ListDatabasesResponse r) { - std::vector result(r.databases().size()); - auto& dbs = *r.mutable_databases(); - std::move(dbs.begin(), dbs.end(), result.begin()); - return result; - }); - } - - future> - RestoreDatabase(RestoreDatabaseParams p) override { - gsad::v1::RestoreDatabaseRequest request; - request.set_parent(p.database.instance().FullName()); - request.set_database_id(p.database.database_id()); - request.set_backup(std::move(p.backup_full_name)); - struct EncryptionVisitor { - explicit EncryptionVisitor(gsad::v1::RestoreDatabaseRequest& request) - : request_(request) {} - void operator()(DefaultEncryption const&) const { - // No encryption_config => USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPTION. - // That is, use the same encryption configuration as the backup. - } - void operator()(GoogleEncryption const&) const { - auto* config = request_.mutable_encryption_config(); - config->set_encryption_type(gsad::v1::RestoreDatabaseEncryptionConfig:: - GOOGLE_DEFAULT_ENCRYPTION); - } - void operator()(CustomerManagedEncryption const& cme) const { - auto* config = request_.mutable_encryption_config(); - config->set_encryption_type(gsad::v1::RestoreDatabaseEncryptionConfig:: - CUSTOMER_MANAGED_ENCRYPTION); - config->set_kms_key_name(cme.encryption_key().FullName()); - } - gsad::v1::RestoreDatabaseRequest& request_; - }; - absl::visit(EncryptionVisitor(request), p.encryption_config); - return google::cloud::internal::AsyncLongRunningOperation< - gsad::v1::Database>( - background_threads_->cq(), internal::SaveCurrentOptions(), - std::move(request), - [stub = stub_](google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - gsad::v1::RestoreDatabaseRequest const& request) { - return stub->AsyncRestoreDatabase(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::GetOperationRequest const& request) { - return stub->AsyncGetOperation(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::CancelOperationRequest const& request) { - return stub->AsyncCancelOperation(cq, std::move(context), request); - }, - &google::cloud::internal::ExtractLongRunningResultResponse< - gsad::v1::Database>, - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kNonIdempotent, polling_policy_prototype_->clone(), - __func__); - } - - StatusOr GetIamPolicy( - GetIamPolicyParams p) override { - google::iam::v1::GetIamPolicyRequest request; - request.set_resource(p.database.FullName()); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - google::iam::v1::GetIamPolicyRequest const& request) { - return stub_->GetIamPolicy(context, request); - }, - request, __func__); - } - - StatusOr SetIamPolicy( - SetIamPolicyParams p) override { - google::iam::v1::SetIamPolicyRequest request; - request.set_resource(p.database.FullName()); - *request.mutable_policy() = std::move(p.policy); - auto const idempotency = request.policy().etag().empty() - ? Idempotency::kNonIdempotent - : Idempotency::kIdempotent; - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - idempotency, - [this](grpc::ClientContext& context, - google::iam::v1::SetIamPolicyRequest const& request) { - return stub_->SetIamPolicy(context, request); - }, - request, __func__); - } - - StatusOr TestIamPermissions( - TestIamPermissionsParams p) override { - google::iam::v1::TestIamPermissionsRequest request; - request.set_resource(p.database.FullName()); - for (auto& permission : p.permissions) { - request.add_permissions(std::move(permission)); - } - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - google::iam::v1::TestIamPermissionsRequest const& request) { - return stub_->TestIamPermissions(context, request); - }, - request, __func__); - } - - future> CreateBackup( - CreateBackupParams p) override { - gsad::v1::CreateBackupRequest request; - request.set_parent(p.database.instance().FullName()); - request.set_backup_id(p.backup_id); - auto& backup = *request.mutable_backup(); - backup.set_database(p.database.FullName()); - // `p.expire_time` is deprecated and ignored here. - *backup.mutable_expire_time() = - p.expire_timestamp.get().value(); - if (p.version_time) { - *backup.mutable_version_time() = - p.version_time->get().value(); - } - struct EncryptionVisitor { - explicit EncryptionVisitor(gsad::v1::CreateBackupRequest& request) - : request_(request) {} - void operator()(DefaultEncryption const&) const { - // No encryption_config => USE_DATABASE_ENCRYPTION. - // That is, use the same encryption configuration as the database. - } - void operator()(GoogleEncryption const&) const { - auto* config = request_.mutable_encryption_config(); - config->set_encryption_type( - gsad::v1::CreateBackupEncryptionConfig::GOOGLE_DEFAULT_ENCRYPTION); - } - void operator()(CustomerManagedEncryption const& cme) const { - auto* config = request_.mutable_encryption_config(); - config->set_encryption_type(gsad::v1::CreateBackupEncryptionConfig:: - CUSTOMER_MANAGED_ENCRYPTION); - config->set_kms_key_name(cme.encryption_key().FullName()); - } - gsad::v1::CreateBackupRequest& request_; - }; - absl::visit(EncryptionVisitor(request), p.encryption_config); - return google::cloud::internal::AsyncLongRunningOperation( - background_threads_->cq(), internal::SaveCurrentOptions(), - std::move(request), - [stub = stub_](google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - gsad::v1::CreateBackupRequest const& request) { - return stub->AsyncCreateBackup(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::GetOperationRequest const& request) { - return stub->AsyncGetOperation(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::CancelOperationRequest const& request) { - return stub->AsyncCancelOperation(cq, std::move(context), request); - }, - &google::cloud::internal::ExtractLongRunningResultResponse< - gsad::v1::Backup>, - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kNonIdempotent, polling_policy_prototype_->clone(), - __func__); - } - - StatusOr GetBackup( - GetBackupParams p) override { - gsad::v1::GetBackupRequest request; - request.set_name(p.backup_full_name); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsad::v1::GetBackupRequest const& request) { - return stub_->GetBackup(context, request); - }, - request, __func__); - } - - Status DeleteBackup(DeleteBackupParams p) override { - google::spanner::admin::database::v1::DeleteBackupRequest request; - request.set_name(p.backup_full_name); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsad::v1::DeleteBackupRequest const& request) { - return stub_->DeleteBackup(context, request); - }, - request, __func__); - } - - ListBackupsRange ListBackups(ListBackupsParams p) override { - gsad::v1::ListBackupsRequest request; - request.set_parent(p.instance.FullName()); - request.set_filter(std::move(p.filter)); - auto& stub = stub_; - // Because we do not have C++14 generalized lambda captures we cannot just - // use the unique_ptr<> here, so convert to shared_ptr<> instead. - auto retry = - std::shared_ptr(retry_policy_prototype_->clone()); - auto backoff = std::shared_ptr( - backoff_policy_prototype_->clone()); - - char const* function_name = __func__; - return google::cloud::internal::MakePaginationRange( - std::move(request), - [stub, retry, backoff, - function_name](gsad::v1::ListBackupsRequest const& r) { - return RetryLoop( - retry->clone(), backoff->clone(), Idempotency::kIdempotent, - [stub](grpc::ClientContext& context, - gsad::v1::ListBackupsRequest const& request) { - return stub->ListBackups(context, request); - }, - r, function_name); - }, - [](gsad::v1::ListBackupsResponse r) { - std::vector result(r.backups().size()); - auto& backups = *r.mutable_backups(); - std::move(backups.begin(), backups.end(), result.begin()); - return result; - }); - } - - StatusOr UpdateBackup( - UpdateBackupParams p) override { - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsad::v1::UpdateBackupRequest const& request) { - return stub_->UpdateBackup(context, request); - }, - p.request, __func__); - } - - ListBackupOperationsRange ListBackupOperations( - ListBackupOperationsParams p) override { - gsad::v1::ListBackupOperationsRequest request; - request.set_parent(p.instance.FullName()); - request.set_filter(std::move(p.filter)); - auto& stub = stub_; - // Because we do not have C++14 generalized lambda captures we cannot just - // use the unique_ptr<> here, so convert to shared_ptr<> instead. - auto retry = - std::shared_ptr(retry_policy_prototype_->clone()); - auto backoff = std::shared_ptr( - backoff_policy_prototype_->clone()); - - char const* function_name = __func__; - return google::cloud::internal::MakePaginationRange< - ListBackupOperationsRange>( - std::move(request), - [stub, retry, backoff, - function_name](gsad::v1::ListBackupOperationsRequest const& r) { - return RetryLoop( - retry->clone(), backoff->clone(), Idempotency::kIdempotent, - [stub](grpc::ClientContext& context, - gsad::v1::ListBackupOperationsRequest const& request) { - return stub->ListBackupOperations(context, request); - }, - r, function_name); - }, - [](gsad::v1::ListBackupOperationsResponse r) { - std::vector result( - r.operations().size()); - auto& operations = *r.mutable_operations(); - std::move(operations.begin(), operations.end(), result.begin()); - return result; - }); - } - - ListDatabaseOperationsRange ListDatabaseOperations( - ListDatabaseOperationsParams p) override { - gsad::v1::ListDatabaseOperationsRequest request; - request.set_parent(p.instance.FullName()); - request.set_filter(std::move(p.filter)); - auto& stub = stub_; - // Because we do not have C++14 generalized lambda captures we cannot just - // use the unique_ptr<> here, so convert to shared_ptr<> instead. - auto retry = - std::shared_ptr(retry_policy_prototype_->clone()); - auto backoff = std::shared_ptr( - backoff_policy_prototype_->clone()); - - char const* function_name = __func__; - return google::cloud::internal::MakePaginationRange< - ListDatabaseOperationsRange>( - std::move(request), - [stub, retry, backoff, - function_name](gsad::v1::ListDatabaseOperationsRequest const& r) { - return RetryLoop( - retry->clone(), backoff->clone(), Idempotency::kIdempotent, - [stub](grpc::ClientContext& context, - gsad::v1::ListDatabaseOperationsRequest const& request) { - return stub->ListDatabaseOperations(context, request); - }, - r, function_name); - }, - [](gsad::v1::ListDatabaseOperationsResponse r) { - std::vector result( - r.operations().size()); - auto& operations = *r.mutable_operations(); - std::move(operations.begin(), operations.end(), result.begin()); - return result; - }); - } - - private: - std::shared_ptr stub_; - Options opts_; - std::unique_ptr retry_policy_prototype_; - std::unique_ptr backoff_policy_prototype_; - std::unique_ptr polling_policy_prototype_; - - // Implementations of `BackgroundThreads` typically create a pool of - // threads that are joined during destruction, so, to avoid ownership - // cycles, those threads should never assume ownership of this object - // (e.g., via a `std::shared_ptr<>`). - std::unique_ptr background_threads_; -}; - -} // namespace - -DatabaseAdminConnection::~DatabaseAdminConnection() = default; - -std::shared_ptr MakeDatabaseAdminConnection( - Options opts) { - internal::CheckExpectedOptions(opts, __func__); - opts = spanner_internal::DefaultAdminOptions(std::move(opts)); - auto stub = spanner_internal::CreateDefaultDatabaseAdminStub(opts); - return std::make_shared( - std::move(stub), std::move(opts)); -} - -std::shared_ptr MakeDatabaseAdminConnection( - ConnectionOptions const& options) { - return MakeDatabaseAdminConnection(internal::MakeOptions(options)); -} - -std::shared_ptr MakeDatabaseAdminConnection( - ConnectionOptions const& options, std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - std::unique_ptr polling_policy) { - auto opts = internal::MakeOptions(options); - opts.set(std::move(retry_policy)); - opts.set(std::move(backoff_policy)); - opts.set(std::move(polling_policy)); - return MakeDatabaseAdminConnection(std::move(opts)); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner - -namespace spanner_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -std::shared_ptr -MakeDatabaseAdminConnectionForTesting(std::shared_ptr stub, - Options opts) { - opts = spanner_internal::DefaultAdminOptions(std::move(opts)); - return std::make_shared( - std::move(stub), std::move(opts)); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner_internal -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/database_admin_connection.h b/google/cloud/spanner/database_admin_connection.h deleted file mode 100644 index 588d5b6305e36..0000000000000 --- a/google/cloud/spanner/database_admin_connection.h +++ /dev/null @@ -1,419 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_DATABASE_ADMIN_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_DATABASE_ADMIN_CONNECTION_H - -#include "google/cloud/spanner/backoff_policy.h" -#include "google/cloud/spanner/backup.h" -#include "google/cloud/spanner/database.h" -#include "google/cloud/spanner/encryption_config.h" -#include "google/cloud/spanner/instance.h" -#include "google/cloud/spanner/internal/database_admin_stub.h" -#include "google/cloud/spanner/polling_policy.h" -#include "google/cloud/spanner/retry_policy.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/spanner/version.h" -#include "google/cloud/backoff_policy.h" -#include "google/cloud/internal/pagination_range.h" -#include "google/cloud/options.h" -#include "absl/types/optional.h" -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * An input range to stream all the databases in a Cloud Spanner instance. - * - * This type models an [input range][cppref-input-range] of - * `google::spanner::admin::v1::Database` objects. Applications can make a - * single pass through the results. - * - * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range - */ -using ListDatabaseRange = ::google::cloud::internal::PaginationRange< - google::spanner::admin::database::v1::Database>; - -/** - * An input range to stream backup operations in Cloud Spanner instance. - * - * This type models an [input range][cppref-input-range] of - * `google::longrunning::Operation` objects. Applications can make a - * single pass through the results. - * - * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range - */ -using ListBackupOperationsRange = - google::cloud::internal::PaginationRange; - -/** - * An input range to stream database operations in Cloud Spanner instance. - * - * This type models an [input range][cppref-input-range] of - * `google::longrunning::Operation` objects. Applications can make a - * single pass through the results. - * - * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range - */ -using ListDatabaseOperationsRange = - google::cloud::internal::PaginationRange; - -/** - * An input range to stream backups in Cloud Spanner instance. - * - * This type models an [input range][cppref-input-range] of - * `google::longrunning::Operation` objects. Applications can make a - * single pass through the results. - * - * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range - */ -using ListBackupsRange = ::google::cloud::internal::PaginationRange< - google::spanner::admin::database::v1::Backup>; - -/** - * A connection to the Cloud Spanner instance administration service. - * - * @deprecated Please use #google::cloud::spanner_admin::DatabaseAdminClient - * and #google::cloud::spanner_admin::DatabaseAdminConnection instead. - * - * This interface defines pure-virtual methods for each of the user-facing - * overload sets in `DatabaseAdminClient`. This allows users to inject custom - * behavior (e.g., with a Google Mock object) in a `DatabaseAdminClient` object - * for use in their own tests. - * - * To create a concrete instance that connects you to a real Cloud Spanner - * instance administration service, see `MakeDatabaseAdminConnection()`. - */ -class GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("DatabaseAdminConnection") - DatabaseAdminConnection { - public: - virtual ~DatabaseAdminConnection() = 0; - - ///@{ - /** - * @name Define the arguments for each member function. - * - * Applications may define classes derived from `DatabaseAdminConnection`, for - * example, because they want to mock the class. To avoid breaking all such - * derived classes when we change the number or type of the arguments to the - * member functions we define light weight structures to pass the arguments. - */ - /// Wrap the arguments for `CreateDatabase()`. - struct CreateDatabaseParams { - /// The name of the database. - Database database; - /// Any additional statements to execute after creating the database. - std::vector extra_statements; - /// How to encrypt the database. - EncryptionConfig encryption_config; - }; - - /// Wrap the arguments for `GetDatabase()`. - struct GetDatabaseParams { - /// The name of the database. - Database database; - }; - - /// Wrap the arguments for `GetDatabaseDdl()`. - struct GetDatabaseDdlParams { - /// The name of the database. - Database database; - }; - - /// Wrap the arguments for `UpdateDatabase()`. - struct UpdateDatabaseParams { - /// The name of the database. - Database database; - /// The DDL statements updating the database schema. - std::vector statements; - }; - - /// Wrap the arguments for `DropDatabase()`. - struct DropDatabaseParams { - /// The name of the database. - Database database; - }; - - /// Wrap the arguments for `ListDatabases()`. - struct ListDatabasesParams { - /// The name of the instance. - Instance instance; - }; - - /// Wrap the arguments for `GetIamPolicy()`. - struct GetIamPolicyParams { - /// The name of the database. - Database database; - }; - - /// Wrap the arguments for `SetIamPolicy()`. - struct SetIamPolicyParams { - /// The name of the database. - Database database; - google::iam::v1::Policy policy; - }; - - /// Wrap the arguments for `TestIamPermissions()`. - struct TestIamPermissionsParams { - /// The name of the database. - Database database; - std::vector permissions; - }; - - /// Wrap the arguments for `CreateBackup()`. - struct CreateBackupParams { - /// The name of the database. - Database database; - std::string backup_id; - /// @deprecated `DatabaseAdminClient::CreateBackup()` initializes - /// `expire_time`, but `DatabaseAdminConnection::CreateBackup()` now - /// ignores it. Use `expire_timestamp` instead. - std::chrono::system_clock::time_point expire_time; - Timestamp expire_timestamp; - /// The backup will contain an externally consistent copy of the database - /// at `version_time`. If `version_time` is not specified, the system will - /// set `version_time` to the `create_time` of the backup. - absl::optional version_time; - /// How to encrypt the backup. - EncryptionConfig encryption_config; - }; - - /// Wrap the arguments for `GetBackup()`. - struct GetBackupParams { - /// The name of the backup. - std::string backup_full_name; - }; - - /// Wrap the arguments for `DeleteBackup()`. - struct DeleteBackupParams { - /// The name of the backup. - std::string backup_full_name; - }; - - /// Wrap the arguments for `ListBackups()`. - struct ListBackupsParams { - /// The name of the instance. - Instance instance; - std::string filter; - }; - - /// Wrap the arguments for `RestoreDatabase()`. - struct RestoreDatabaseParams { - /// The name of the database. - Database database; - /// The source backup for the restore. - std::string backup_full_name; - /// How to encrypt the database. - EncryptionConfig encryption_config; - }; - - /// Wrap the arguments for `UpdateBackup()`. - struct UpdateBackupParams { - google::spanner::admin::database::v1::UpdateBackupRequest request; - }; - - /// Wrap the arguments for `ListBackupOperations()`. - struct ListBackupOperationsParams { - /// The name of the instance. - Instance instance; - std::string filter; - }; - - /// Wrap the arguments for `ListDatabaseOperations()`. - struct ListDatabaseOperationsParams { - /// The name of the instance. - Instance instance; - std::string filter; - }; - ///@} - - virtual Options options() { return Options{}; } - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.CreateDatabase - /// RPC. - virtual future> - CreateDatabase(CreateDatabaseParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.GetDatabase - /// RPC. - virtual StatusOr GetDatabase( - GetDatabaseParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.GetDatabaseDdl - /// RPC. - virtual StatusOr - GetDatabaseDdl(GetDatabaseDdlParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.UpdateDatabase - /// RPC. - virtual future< - StatusOr> - UpdateDatabase(UpdateDatabaseParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.DropDatabase - /// RPC. - virtual Status DropDatabase(DropDatabaseParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.DropDatabase - /// RPC. - virtual ListDatabaseRange ListDatabases(ListDatabasesParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.RestoreDatabase - /// RPC. - virtual future> - RestoreDatabase(RestoreDatabaseParams); - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.GetIamPolicy - /// RPC. - virtual StatusOr GetIamPolicy( - GetIamPolicyParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.SetIamPolicy - /// RPC. - virtual StatusOr SetIamPolicy( - SetIamPolicyParams) = 0; - - /// Define the interface for a - /// google.spanner.v1.DatabaseAdmin.TestIamPermissions RPC. - virtual StatusOr - TestIamPermissions(TestIamPermissionsParams) = 0; - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.CreateBackup - /// RPC. - virtual future> - CreateBackup(CreateBackupParams); - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.GetBackup RPC. - virtual StatusOr GetBackup( - GetBackupParams); - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.DeleteBackup - /// RPC. - virtual Status DeleteBackup(DeleteBackupParams); - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.ListBackups - /// RPC. - virtual ListBackupsRange ListBackups(ListBackupsParams); - - /// Define the interface for a google.spanner.v1.DatabaseAdmin.UpdateBackup - /// RPC. - virtual StatusOr UpdateBackup( - UpdateBackupParams); - - /// Define the interface for a - /// google.spanner.v1.DatabaseAdmin.ListBackupOperations RPC. - virtual ListBackupOperationsRange ListBackupOperations( - ListBackupOperationsParams); - - /// Define the interface for a - /// google.spanner.v1.DatabaseAdmin.ListDatabaseOperations RPC. - virtual ListDatabaseOperationsRange ListDatabaseOperations( - ListDatabaseOperationsParams); -}; - -/** - * Returns a DatabaseAdminConnection object that can be used for interacting - * with Cloud Spanner's admin APIs. - * - * The returned connection object should not be used directly; instead it - * should be given to a `DatabaseAdminClient` instance. - * - * The optional @p opts argument may be used to configure aspects of the - * returned `DatabaseAdminConnection`. Expected options are any of types in the - * following option lists. - * - * - `google::cloud::CommonOptionList` - * - `google::cloud::GrpcOptionList` - * - `google::cloud::SpannerPolicyOptionList` - * - * @see `DatabaseAdminConnection` - * - * @param opts (optional) configure the `DatabaseAdminConnection` created by - * this function. - */ -GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("MakeDatabaseAdminConnection()") -std::shared_ptr MakeDatabaseAdminConnection( - Options opts = {}); - -/** - * Returns a DatabaseAdminConnection object that can be used for interacting - * with Cloud Spanner's admin APIs. - * - * The returned connection object should not be used directly, rather it should - * be given to a `DatabaseAdminClient` instance. - * - * @note Prefer using the `MakeDatabaseAdminConnection()` overload that accepts - * `google::cloud::Options`. - * - * @see `DatabaseAdminConnection` - * - * @param options configure the `DatabaseAdminConnection` created by this - * function. - */ -GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("MakeDatabaseAdminConnection()") -std::shared_ptr MakeDatabaseAdminConnection( - ConnectionOptions const& options); - -/** - * Returns a DatabaseAdminConnection object that can be used for interacting - * with Cloud Spanner's admin APIs. - * - * The returned connection object should not be used directly, rather it should - * be given to a `DatabaseAdminClient` instance. - * - * @note Prefer using the `MakeDatabaseAdminConnection()` overload that accepts - * `google::cloud::Options`. - * - * @param options configure the `DatabaseAdminConnection` created by this - * function. - * @param retry_policy control for how long (or how many times) are retryable - * RPCs attempted - * @param backoff_policy controls the backoff behavior between retry attempts, - * typically some form of exponential backoff with jitter - * @param polling_policy controls for how often, and how quickly, are long - * running checked for completion - * - * @par Example - * @snippet samples.cc custom-database-admin-policies - */ -GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("MakeDatabaseAdminConnection()") -std::shared_ptr MakeDatabaseAdminConnection( - ConnectionOptions const& options, std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - std::unique_ptr polling_policy); - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner - -namespace spanner_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/// Internal-only factory that allows us to inject mock stubs for testing. -std::shared_ptr -MakeDatabaseAdminConnectionForTesting(std::shared_ptr stub, - Options opts); - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner_internal - -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_DATABASE_ADMIN_CONNECTION_H diff --git a/google/cloud/spanner/database_admin_connection_test.cc b/google/cloud/spanner/database_admin_connection_test.cc deleted file mode 100644 index 4ed83b5ee61cf..0000000000000 --- a/google/cloud/spanner/database_admin_connection_test.cc +++ /dev/null @@ -1,1576 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/database_admin_connection.h" -#include "google/cloud/spanner/internal/defaults.h" -#include "google/cloud/spanner/options.h" -#include "google/cloud/spanner/testing/mock_database_admin_stub.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/kms_key_name.h" -#include "google/cloud/options.h" -#include "google/cloud/testing_util/is_proto_equal.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/time/clock.h" -#include "absl/time/time.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace gsad = ::google::spanner::admin::database; - -using ::google::cloud::spanner_testing::MockDatabaseAdminStub; -using ::google::cloud::testing_util::IsProtoEqual; -using ::google::cloud::testing_util::StatusIs; -using ::google::protobuf::TextFormat; -using ::testing::AnyOf; -using ::testing::AtLeast; -using ::testing::AtMost; -using ::testing::ElementsAre; -using ::testing::IsEmpty; -using ::testing::Return; - -std::shared_ptr CreateTestingConnection( - std::shared_ptr mock) { - LimitedErrorCountRetryPolicy retry(/*maximum_failures=*/2); - ExponentialBackoffPolicy backoff( - /*initial_delay=*/std::chrono::microseconds(1), - /*maximum_delay=*/std::chrono::microseconds(1), - /*scaling=*/2.0); - GenericPollingPolicy polling(retry, backoff); - Options opts; - opts.set(retry.clone()); - opts.set(backoff.clone()); - opts.set(polling.clone()); - return spanner_internal::MakeDatabaseAdminConnectionForTesting( - std::move(mock), std::move(opts)); -} - -/// @test Verify that successful case works. -TEST(DatabaseAdminConnectionTest, CreateDatabaseSuccess) { - auto mock = std::make_shared(); - std::string const database_name = - "projects/test-project/instances/test-instance/databases/test-database"; - - EXPECT_CALL(*mock, AsyncCreateDatabase) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::CreateDatabaseRequest const& request) { - EXPECT_FALSE(request.has_encryption_config()); - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce( - [&database_name](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::Database response; - response.set_name(database_name); - response.set_state(gsad::v1::Database::READY); - op.mutable_response()->PackFrom(response); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - EXPECT_EQ(dbase.FullName(), database_name); - auto fut = conn->CreateDatabase({dbase, {}, {}}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), database_name); - EXPECT_EQ(response->state(), gsad::v1::Database::READY); - EXPECT_FALSE(response->has_encryption_config()); -} - -/// @test Verify creating a database with an encryption key. -TEST(DatabaseAdminClientTest, CreateDatabaseWithEncryption) { - auto mock = std::make_shared(); - std::string const database_name = - "projects/test-project/instances/test-instance/databases/test-database"; - - EXPECT_CALL(*mock, AsyncCreateDatabase) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::CreateDatabaseRequest const& request) { - EXPECT_TRUE(request.has_encryption_config()); - if (request.has_encryption_config()) { - EXPECT_EQ(request.encryption_config().kms_key_name(), - "projects/test-project/locations/some-location/keyRings/" - "a-key-ring/cryptoKeys/a-key-name"); - } - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce( - [&database_name](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::Database response; - response.set_name(database_name); - response.set_state(gsad::v1::Database::READY); - response.mutable_encryption_config()->set_kms_key_name( - "projects/test-project/locations/some-location/keyRings/" - "a-key-ring/cryptoKeys/some-key-name"); - op.mutable_response()->PackFrom(response); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - EXPECT_EQ(dbase.FullName(), database_name); - KmsKeyName encryption_key("test-project", "some-location", "a-key-ring", - "a-key-name"); - auto fut = conn->CreateDatabase( - {dbase, {}, CustomerManagedEncryption(std::move(encryption_key))}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), database_name); - EXPECT_EQ(response->state(), gsad::v1::Database::READY); - EXPECT_TRUE(response->has_encryption_config()); - if (response->has_encryption_config()) { - EXPECT_EQ( - response->encryption_config().kms_key_name(), - "projects/test-project/locations/some-location/keyRings/a-key-ring/" - "cryptoKeys/some-key-name"); - } -} - -/// @test Verify that a permanent error in CreateDatabase is immediately -/// reported. -TEST(DatabaseAdminConnectionTest, HandleCreateDatabaseError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncCreateDatabase) - .WillOnce( - [](CompletionQueue&, auto, gsad::v1::CreateDatabaseRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh"))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto fut = conn->CreateDatabase({dbase, {}, {}}); - auto response = fut.get(); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, GetDatabase) { - auto constexpr kResponseText = R"pb( - name: "projects/project/instances/instance/databases/database" - state: READY - create_time { seconds: 1625696199 nanos: 123456789 } - restore_info { - source_type: BACKUP - backup_info { - backup: "projects/project/instances/instance/backups/backup" - create_time { seconds: 1625696099 nanos: 987564321 } - source_database: "projects/project/instances/instance/databases/database" - version_time { seconds: 1625696099 nanos: 987564321 } - } - } - encryption_config { - kms_key_name: "projects/project/locations/location/keyRings/ring/cryptoKeys/key" - } - version_retention_period: "7d" - earliest_version_time { seconds: 1625696199 nanos: 123456789 } - default_leader: "us-east5" - )pb"; - gsad::v1::Database expected_response; - ASSERT_TRUE(TextFormat::ParseFromString(kResponseText, &expected_response)); - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetDatabase) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&](grpc::ClientContext&, - gsad::v1::GetDatabaseRequest const& request) { - EXPECT_EQ(request.name(), expected_response.name()); - return expected_response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = - conn->GetDatabase({Database("project", "instance", "database")}); - EXPECT_THAT(response, IsOkAndHolds(IsProtoEqual(expected_response))); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, GetDatabasePermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetDatabase) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetDatabase( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, GetDatabaseTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetDatabase) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetDatabase( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, GetDatabaseDdlSuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/databases/test-database"; - - EXPECT_CALL(*mock, GetDatabaseDdl) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce( - [&expected_name](grpc::ClientContext&, - gsad::v1::GetDatabaseDdlRequest const& request) { - EXPECT_EQ(expected_name, request.database()); - gsad::v1::GetDatabaseDdlResponse response; - response.add_statements("CREATE DATABASE test-database"); - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetDatabaseDdl( - {Database("test-project", "test-instance", "test-database")}); - ASSERT_STATUS_OK(response); - ASSERT_EQ(1, response->statements_size()); - EXPECT_EQ("CREATE DATABASE test-database", response->statements(0)); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, GetDatabaseDdlPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetDatabaseDdl) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetDatabaseDdl( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, GetDatabaseDdlTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetDatabaseDdl) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetDatabaseDdl( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that successful case works. -TEST(DatabaseAdminConnectionTest, UpdateDatabaseSuccess) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncUpdateDatabaseDdl) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::UpdateDatabaseDdlRequest const&) { - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce([](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::UpdateDatabaseDdlMetadata metadata; - metadata.set_database("test-database"); - op.mutable_metadata()->PackFrom(metadata); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto fut = conn->UpdateDatabase( - {dbase, {"ALTER TABLE Albums ADD COLUMN MarketingBudget INT64"}}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->database(), "test-database"); -} - -/// @test Verify that a permanent error in UpdateDatabase is immediately -/// reported. -TEST(DatabaseAdminConnectionTest, UpdateDatabaseErrorInPoll) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncUpdateDatabaseDdl) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::UpdateDatabaseDdlRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh"))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto fut = conn->UpdateDatabase( - {dbase, {"ALTER TABLE Albums ADD COLUMN MarketingBudget INT64"}}); - auto response = fut.get(); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that errors in the polling loop are reported. -TEST(DatabaseAdminConnectionTest, CreateDatabaseErrorInPoll) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncCreateDatabase) - .WillOnce( - [](CompletionQueue&, auto, gsad::v1::CreateDatabaseRequest const&) { - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce([](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_done(true); - op.mutable_error()->set_code( - static_cast(grpc::StatusCode::PERMISSION_DENIED)); - op.mutable_error()->set_message("uh-oh"); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto response = conn->CreateDatabase({dbase, {}, {}}).get(); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that errors in the polling loop are reported. -TEST(DatabaseAdminConnectionTest, UpdateDatabaseGetOperationError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncUpdateDatabaseDdl) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::UpdateDatabaseDdlRequest const&) { - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce([](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_done(true); - op.mutable_error()->set_code( - static_cast(grpc::StatusCode::PERMISSION_DENIED)); - op.mutable_error()->set_message("uh-oh"); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto response = - conn->UpdateDatabase( - {dbase, {"ALTER TABLE Albums ADD COLUMN MarketingBudget INT64"}}) - .get(); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that we can list databases in multiple pages. -TEST(DatabaseAdminConnectionTest, ListDatabases) { - constexpr char const* kDatabaseText[5] = { - R"pb( - name: "projects/project/instances/instance/databases/db-1" - state: READY - create_time { seconds: 1625696199 nanos: 111111111 } - restore_info { - source_type: BACKUP - backup_info { - backup: "projects/project/instances/instance/backups/backup" - create_time { seconds: 1625696099 nanos: 111111111 } - source_database: "projects/project/instances/instance/databases/db" - version_time { seconds: 1625696099 nanos: 111111111 } - } - } - encryption_config { - kms_key_name: "projects/project/locations/location/keyRings/ring/cryptoKeys/key" - } - version_retention_period: "1d" - earliest_version_time { seconds: 1625696199 nanos: 111111111 } - default_leader: "us-east1" - )pb", - R"pb( - name: "projects/project/instances/instance/databases/db-2" - state: READY - create_time { seconds: 1625696199 nanos: 222222222 } - restore_info { - source_type: BACKUP - backup_info { - backup: "projects/project/instances/instance/backups/backup" - create_time { seconds: 1625696099 nanos: 222222222 } - source_database: "projects/project/instances/instance/databases/db" - version_time { seconds: 1625696099 nanos: 222222222 } - } - } - encryption_config { - kms_key_name: "projects/project/locations/location/keyRings/ring/cryptoKeys/key" - } - version_retention_period: "2d" - earliest_version_time { seconds: 1625696199 nanos: 222222222 } - default_leader: "us-east2" - )pb", - R"pb( - name: "projects/project/instances/instance/databases/db-3" - state: READY - create_time { seconds: 1625696199 nanos: 333333333 } - restore_info { - source_type: BACKUP - backup_info { - backup: "projects/project/instances/instance/backups/backup" - create_time { seconds: 1625696099 nanos: 333333333 } - source_database: "projects/project/instances/instance/databases/db" - version_time { seconds: 1625696099 nanos: 333333333 } - } - } - encryption_config { - kms_key_name: "projects/project/locations/location/keyRings/ring/cryptoKeys/key" - } - version_retention_period: "3d" - earliest_version_time { seconds: 1625696199 nanos: 333333333 } - default_leader: "us-east3" - )pb", - R"pb( - name: "projects/project/instances/instance/databases/db-4" - state: READY - create_time { seconds: 1625696199 nanos: 444444444 } - restore_info { - source_type: BACKUP - backup_info { - backup: "projects/project/instances/instance/backups/backup" - create_time { seconds: 1625696099 nanos: 444444444 } - source_database: "projects/project/instances/instance/databases/db" - version_time { seconds: 1625696099 nanos: 444444444 } - } - } - encryption_config { - kms_key_name: "projects/project/locations/location/keyRings/ring/cryptoKeys/key" - } - version_retention_period: "4d" - earliest_version_time { seconds: 1625696199 nanos: 444444444 } - default_leader: "us-east4" - )pb", - R"pb( - name: "projects/project/instances/instance/databases/db-5" - state: READY - create_time { seconds: 1625696199 nanos: 555555555 } - restore_info { - source_type: BACKUP - backup_info { - backup: "projects/project/instances/instance/backups/backup" - create_time { seconds: 1625696099 nanos: 555555555 } - source_database: "projects/project/instances/instance/databases/db" - version_time { seconds: 1625696099 nanos: 555555555 } - } - } - encryption_config { - kms_key_name: "projects/project/locations/location/keyRings/ring/cryptoKeys/key" - } - version_retention_period: "5d" - earliest_version_time { seconds: 1625696199 nanos: 555555555 } - default_leader: "us-east5" - )pb", - }; - gsad::v1::Database expected_databases[5]; - ASSERT_TRUE( - TextFormat::ParseFromString(kDatabaseText[0], &expected_databases[0])); - ASSERT_TRUE( - TextFormat::ParseFromString(kDatabaseText[1], &expected_databases[1])); - ASSERT_TRUE( - TextFormat::ParseFromString(kDatabaseText[2], &expected_databases[2])); - ASSERT_TRUE( - TextFormat::ParseFromString(kDatabaseText[3], &expected_databases[3])); - ASSERT_TRUE( - TextFormat::ParseFromString(kDatabaseText[4], &expected_databases[4])); - - Instance in("project", "instance"); - std::string const expected_parent = in.FullName(); - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListDatabases) - .WillOnce([&](grpc::ClientContext&, - gsad::v1::ListDatabasesRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_TRUE(request.page_token().empty()); - - gsad::v1::ListDatabasesResponse page; - page.set_next_page_token("page-1"); - *page.add_databases() = expected_databases[0]; - *page.add_databases() = expected_databases[1]; - return make_status_or(page); - }) - .WillOnce([&](grpc::ClientContext&, - gsad::v1::ListDatabasesRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-1", request.page_token()); - - gsad::v1::ListDatabasesResponse page; - page.set_next_page_token("page-2"); - *page.add_databases() = expected_databases[2]; - *page.add_databases() = expected_databases[3]; - return make_status_or(page); - }) - .WillOnce([&](grpc::ClientContext&, - gsad::v1::ListDatabasesRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-2", request.page_token()); - - gsad::v1::ListDatabasesResponse page; - page.clear_next_page_token(); - *page.add_databases() = expected_databases[4]; - return make_status_or(page); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - std::vector actual_databases; - for (auto const& database : conn->ListDatabases({in})) { - ASSERT_STATUS_OK(database); - actual_databases.push_back(*database); - } - EXPECT_THAT(actual_databases, - ElementsAre(IsProtoEqual(expected_databases[0]), - IsProtoEqual(expected_databases[1]), - IsProtoEqual(expected_databases[2]), - IsProtoEqual(expected_databases[3]), - IsProtoEqual(expected_databases[4]))); -} - -TEST(DatabaseAdminConnectionTest, ListDatabasesPermanentFailure) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListDatabases) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListDatabases({in}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(DatabaseAdminConnectionTest, ListDatabasesTooManyFailures) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListDatabases) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListDatabases({in}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that successful case works. -TEST(DatabaseAdminConnectionTest, RestoreDatabaseSuccess) { - auto mock = std::make_shared(); - std::string const database_name = - "projects/test-project/instances/test-instance/databases/test-database"; - - EXPECT_CALL(*mock, AsyncRestoreDatabase) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::RestoreDatabaseRequest const& request) { - EXPECT_EQ(request.database_id(), "test-database"); - EXPECT_FALSE(request.has_encryption_config()); - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce( - [&database_name](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::Database response; - response.set_name(database_name); - response.set_state(gsad::v1::Database::READY); - op.mutable_response()->PackFrom(response); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - EXPECT_EQ(dbase.FullName(), database_name); - Backup backup(Instance("test-project", "test-instance"), "test-backup"); - auto fut = conn->RestoreDatabase({dbase, backup.FullName(), {}}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), database_name); - EXPECT_EQ(response->state(), gsad::v1::Database::READY); - EXPECT_FALSE(response->has_encryption_config()); -} - -/// @test Verify that using an encryption key works. -TEST(DatabaseAdminClientTest, RestoreDatabaseWithEncryption) { - auto mock = std::make_shared(); - std::string const database_name = - "projects/test-project/instances/test-instance/databases/test-database"; - - EXPECT_CALL(*mock, AsyncRestoreDatabase) - .WillOnce([](CompletionQueue&, auto, - gsad::v1::RestoreDatabaseRequest const& request) { - EXPECT_EQ(request.database_id(), "test-database"); - EXPECT_TRUE(request.has_encryption_config()); - if (request.has_encryption_config()) { - EXPECT_EQ(request.encryption_config().encryption_type(), - gsad::v1::RestoreDatabaseEncryptionConfig:: - CUSTOMER_MANAGED_ENCRYPTION); - EXPECT_EQ(request.encryption_config().kms_key_name(), - "projects/test-project/locations/some-location/keyRings/" - "a-key-ring/cryptoKeys/restore-key-name"); - } - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce( - [&database_name](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::Database response; - response.set_name(database_name); - response.set_state(gsad::v1::Database::READY); - response.mutable_encryption_config()->set_kms_key_name( - "projects/test-project/locations/some-location/keyRings/" - "a-key-ring/cryptoKeys/restore-key-name"); - op.mutable_response()->PackFrom(response); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Instance instance("test-project", "test-instance"); - Database dbase(instance, "test-database"); - Backup backup(instance, "test-backup"); - KmsKeyName encryption_key("test-project", "some-location", "a-key-ring", - "restore-key-name"); - auto fut = conn->RestoreDatabase( - {dbase, backup.FullName(), - CustomerManagedEncryption(std::move(encryption_key))}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), database_name); - EXPECT_EQ(response->state(), gsad::v1::Database::READY); - EXPECT_TRUE(response->has_encryption_config()); - if (response->has_encryption_config()) { - EXPECT_EQ( - response->encryption_config().kms_key_name(), - "projects/test-project/locations/some-location/keyRings/a-key-ring/" - "cryptoKeys/restore-key-name"); - } -} - -/// @test Verify that a permanent error in RestoreDatabase is immediately -/// reported. -TEST(DatabaseAdminConnectionTest, HandleRestoreDatabaseError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncRestoreDatabase) - .WillOnce( - [](CompletionQueue&, auto, gsad::v1::RestoreDatabaseRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh"))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - Backup backup(Instance("test-project", "test-instance"), "test-backup"); - auto fut = conn->RestoreDatabase({dbase, backup.FullName(), {}}); - auto response = fut.get(); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, GetIamPolicySuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/databases/test-database"; - std::string const expected_role = "roles/spanner.databaseReader"; - std::string const expected_member = "user:foobar@example.com"; - - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&expected_name, &expected_role, &expected_member]( - grpc::ClientContext&, - google::iam::v1::GetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - google::iam::v1::Policy response; - auto& binding = *response.add_bindings(); - binding.set_role(expected_role); - *binding.add_members() = expected_member; - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetIamPolicy( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_STATUS_OK(response); - ASSERT_EQ(1, response->bindings().size()); - EXPECT_EQ(expected_role, response->bindings().Get(0).role()); - ASSERT_EQ(1, response->bindings().Get(0).members().size()); - EXPECT_EQ(expected_member, response->bindings().Get(0).members().Get(0)); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, GetIamPolicyPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetIamPolicy( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, GetIamPolicyTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetIamPolicy) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetIamPolicy( - {Database("test-project", "test-instance", "test-database")}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, SetIamPolicySuccess) { - std::string const expected_name = - "projects/test-project/instances/test-instance/databases/test-database"; - auto constexpr kPolicyText = R"pb( - etag: "request-etag" - bindings { - role: "roles/spanner.databaseReader" - members: "user:test-user-1@example.com" - members: "user:test-user-2@example.com" - } - )pb"; - google::iam::v1::Policy expected_policy; - ASSERT_TRUE(TextFormat::ParseFromString(kPolicyText, &expected_policy)); - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce([&expected_name]( - grpc::ClientContext&, - google::iam::v1::SetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&expected_name, &expected_policy]( - grpc::ClientContext&, - google::iam::v1::SetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - EXPECT_THAT(request.policy(), IsProtoEqual(expected_policy)); - auto response = expected_policy; - response.set_etag("response-etag"); - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->SetIamPolicy( - {Database("test-project", "test-instance", "test-database"), - expected_policy}); - ASSERT_STATUS_OK(response); - expected_policy.set_etag("response-etag"); - EXPECT_THAT(*response, IsProtoEqual(expected_policy)); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, SetIamPolicyPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->SetIamPolicy( - {Database("test-project", "test-instance", "test-database"), {}}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that request without the Etag field should fail with the first -/// transient error. -TEST(DatabaseAdminConnectionTest, SetIamPolicyNonIdempotent) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - google::iam::v1::Policy policy; - auto response = conn->SetIamPolicy( - {Database("test-project", "test-instance", "test-database"), policy}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that request with the Etag field is retried for transient -/// errors. -TEST(DatabaseAdminConnectionTest, SetIamPolicyIdempotent) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, SetIamPolicy) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - google::iam::v1::Policy policy; - policy.set_etag("test-etag-value"); - auto response = conn->SetIamPolicy( - {Database("test-project", "test-instance", "test-database"), policy}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, TestIamPermissionsSuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/databases/test-database"; - std::string const expected_permission = "spanner.databases.read"; - - EXPECT_CALL(*mock, TestIamPermissions) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&expected_name, &expected_permission]( - grpc::ClientContext&, - google::iam::v1::TestIamPermissionsRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - EXPECT_EQ(1, request.permissions_size()); - EXPECT_EQ(expected_permission, request.permissions(0)); - google::iam::v1::TestIamPermissionsResponse response; - response.add_permissions(expected_permission); - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->TestIamPermissions( - {Database("test-project", "test-instance", "test-database"), - {expected_permission}}); - ASSERT_STATUS_OK(response); - ASSERT_EQ(1, response->permissions_size()); - EXPECT_EQ(expected_permission, response->permissions(0)); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, TestIamPermissionsPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, TestIamPermissions) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->TestIamPermissions( - {Database("test-project", "test-instance", "test-database"), {}}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, TestIamPermissionsTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, TestIamPermissions) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->TestIamPermissions( - {Database("test-project", "test-instance", "test-database"), {}}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that successful case works. -TEST(DatabaseAdminConnectionTest, CreateBackupSuccess) { - auto mock = std::make_shared(); - Database dbase("test-project", "test-instance", "test-database"); - auto now = absl::Now(); - auto expire_time = MakeTimestamp(now + absl::Hours(7)).value(); - auto version_time = MakeTimestamp(now - absl::Hours(7)).value(); - - EXPECT_CALL(*mock, AsyncCreateBackup) - .WillOnce([&dbase, &expire_time, &version_time]( - CompletionQueue&, auto, - gsad::v1::CreateBackupRequest const& request) { - EXPECT_EQ(request.parent(), dbase.instance().FullName()); - EXPECT_EQ(request.backup_id(), "test-backup"); - auto const& backup = request.backup(); - EXPECT_EQ(backup.database(), dbase.FullName()); - EXPECT_EQ(MakeTimestamp(backup.expire_time()).value(), expire_time); - EXPECT_EQ(MakeTimestamp(backup.version_time()).value(), version_time); - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce([&expire_time, &version_time]( - CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::Backup response; - response.set_name("test-backup"); - response.set_state(gsad::v1::Backup::READY); - *response.mutable_expire_time() = - expire_time.get().value(); - *response.mutable_version_time() = - version_time.get().value(); - *response.mutable_create_time() = MakeTimestamp(absl::Now()) - .value() - .get() - .value(); - op.mutable_response()->PackFrom(response); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto fut = conn->CreateBackup( - {dbase, "test-backup", {}, expire_time, version_time, {}}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), "test-backup"); - EXPECT_EQ(response->state(), gsad::v1::Backup::READY); - EXPECT_EQ(MakeTimestamp(response->expire_time()).value(), expire_time); - EXPECT_EQ(MakeTimestamp(response->version_time()).value(), version_time); - EXPECT_GT(MakeTimestamp(response->create_time()).value(), version_time); - EXPECT_FALSE(response->has_encryption_info()); -} - -/// @test Verify that using an encryption key works. -TEST(DatabaseAdminClientTest, CreateBackupWithEncryption) { - auto mock = std::make_shared(); - Database dbase("test-project", "test-instance", "test-database"); - - EXPECT_CALL(*mock, AsyncCreateBackup) - .WillOnce([&dbase](CompletionQueue&, auto, - gsad::v1::CreateBackupRequest const& request) { - EXPECT_EQ(request.parent(), dbase.instance().FullName()); - EXPECT_EQ(request.backup_id(), "test-backup"); - EXPECT_EQ(request.backup().database(), dbase.FullName()); - EXPECT_TRUE(request.has_encryption_config()); - if (request.has_encryption_config()) { - EXPECT_EQ(request.encryption_config().encryption_type(), - gsad::v1::CreateBackupEncryptionConfig:: - GOOGLE_DEFAULT_ENCRYPTION); - EXPECT_THAT(request.encryption_config().kms_key_name(), IsEmpty()); - } - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce([](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsad::v1::Backup response; - response.set_name("test-backup"); - response.set_state(gsad::v1::Backup::READY); - response.mutable_encryption_info()->set_encryption_type( - gsad::v1::EncryptionInfo::GOOGLE_DEFAULT_ENCRYPTION); - op.mutable_response()->PackFrom(response); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto fut = conn->CreateBackup( - {dbase, "test-backup", {}, {}, absl::nullopt, GoogleEncryption()}); - auto response = fut.get(); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), "test-backup"); - EXPECT_EQ(response->state(), gsad::v1::Backup::READY); - EXPECT_TRUE(response->has_encryption_info()); - if (response->has_encryption_info()) { - EXPECT_EQ(response->encryption_info().encryption_type(), - gsad::v1::EncryptionInfo::GOOGLE_DEFAULT_ENCRYPTION); - EXPECT_THAT(response->encryption_info().kms_key_version(), IsEmpty()); - } -} - -/// @test Verify cancellation. -TEST(DatabaseAdminConnectionTest, CreateBackupCancel) { - auto mock = std::make_shared(); - promise p; - - EXPECT_CALL(*mock, AsyncCreateBackup) - .WillOnce( - [](CompletionQueue&, auto, gsad::v1::CreateBackupRequest const&) { - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - EXPECT_CALL(*mock, AsyncCancelOperation) - .Times(AtMost(1)) - .WillRepeatedly( - [](CompletionQueue&, auto, - google::longrunning::CancelOperationRequest const& request) { - EXPECT_EQ("test-operation-name", request.name()); - return make_ready_future(Status()); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce([&p](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(false); - p.set_value(); // enable `cancel()` call in the main thread. - return make_ready_future(make_status_or(std::move(op))); - }) - .WillRepeatedly([](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(false); - return make_ready_future(make_status_or(std::move(op))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto fut = - conn->CreateBackup({dbase, "test-backup", {}, {}, absl::nullopt, {}}); - p.get_future().get(); // await first poll before `cancel()` - fut.cancel(); - auto backup = fut.get(); - EXPECT_THAT(backup, StatusIs(AnyOf(StatusCode::kCancelled, - StatusCode::kDeadlineExceeded))); -} - -/// @test Verify that a permanent error in CreateBackup is immediately -/// reported. -TEST(DatabaseAdminConnectionTest, HandleCreateBackupError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncCreateBackup) - .WillOnce( - [](CompletionQueue&, auto, gsad::v1::CreateBackupRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh"))); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - Database dbase("test-project", "test-instance", "test-database"); - auto fut = - conn->CreateBackup({dbase, "test-backup", {}, {}, absl::nullopt, {}}); - auto backup = fut.get(); - EXPECT_THAT(backup, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, GetBackupSuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/backups/test-backup"; - - EXPECT_CALL(*mock, GetBackup) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&expected_name](grpc::ClientContext&, - gsad::v1::GetBackupRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - gsad::v1::Backup response; - response.set_name(request.name()); - response.set_state(gsad::v1::Backup::READY); - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetBackup( - {Backup(Instance("test-project", "test-instance"), "test-backup") - .FullName()}); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(expected_name, response->name()); - EXPECT_FALSE(response->has_encryption_info()); -} - -/// @test Verify that GetBackup can return encryption info and key version. -TEST(DatabaseAdminClientTest, GetBackupWithEncryption) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/backups/test-backup"; - - EXPECT_CALL(*mock, GetBackup) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&expected_name](grpc::ClientContext&, - gsad::v1::GetBackupRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - gsad::v1::Backup response; - response.set_name(request.name()); - response.set_state(gsad::v1::Backup::READY); - response.mutable_encryption_info()->set_encryption_type( - gsad::v1::EncryptionInfo::CUSTOMER_MANAGED_ENCRYPTION); - response.mutable_encryption_info()->set_kms_key_version( - "projects/test-project/locations/some-location/keyRings/a-key-ring/" - "cryptoKeys/a-key-name/cryptoKeyVersions/1"); - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetBackup( - {Backup(Instance("test-project", "test-instance"), "test-backup") - .FullName()}); - ASSERT_STATUS_OK(response); - EXPECT_EQ(response->name(), expected_name); - EXPECT_EQ(response->state(), gsad::v1::Backup::READY); - EXPECT_TRUE(response->has_encryption_info()); - if (response->has_encryption_info()) { - EXPECT_EQ(response->encryption_info().encryption_type(), - gsad::v1::EncryptionInfo::CUSTOMER_MANAGED_ENCRYPTION); - EXPECT_EQ( - response->encryption_info().kms_key_version(), - "projects/test-project/locations/some-location/keyRings/a-key-ring/" - "cryptoKeys/a-key-name/cryptoKeyVersions/1"); - } -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, GetBackupPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetBackup) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetBackup( - {Backup(Instance("test-project", "test-instance"), "test-backup") - .FullName()}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, GetBackupTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, GetBackup) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto response = conn->GetBackup( - {Backup(Instance("test-project", "test-instance"), "test-backup") - .FullName()}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, DeleteBackupSuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/backups/test-backup"; - - EXPECT_CALL(*mock, DeleteBackup) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&expected_name](grpc::ClientContext&, - gsad::v1::DeleteBackupRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return google::cloud::Status(); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - auto status = conn->DeleteBackup({expected_name}); - EXPECT_STATUS_OK(status); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, DeleteBackupPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, DeleteBackup) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto status = conn->DeleteBackup( - {"projects/test-project/instances/test-instance/backups/test-backup"}); - EXPECT_THAT(status, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, DeleteBackupTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, DeleteBackup) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto status = conn->DeleteBackup( - {"projects/test-project/instances/test-instance/backups/test-backup"}); - EXPECT_THAT(status, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that we can list backups in multiple pages. -TEST(DatabaseAdminConnectionTest, ListBackups) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - std::string const expected_parent = in.FullName(); - - EXPECT_CALL(*mock, ListBackups) - .WillOnce( - [&expected_parent](grpc::ClientContext&, - gsad::v1::ListBackupsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_TRUE(request.page_token().empty()); - - gsad::v1::ListBackupsResponse page; - page.set_next_page_token("page-1"); - page.add_backups()->set_name("backup-1"); - page.add_backups()->set_name("backup-2"); - return make_status_or(page); - }) - .WillOnce( - [&expected_parent](grpc::ClientContext&, - gsad::v1::ListBackupsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-1", request.page_token()); - - gsad::v1::ListBackupsResponse page; - page.set_next_page_token("page-2"); - page.add_backups()->set_name("backup-3"); - page.add_backups()->set_name("backup-4"); - return make_status_or(page); - }) - .WillOnce( - [&expected_parent](grpc::ClientContext&, - gsad::v1::ListBackupsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-2", request.page_token()); - - gsad::v1::ListBackupsResponse page; - page.clear_next_page_token(); - page.add_backups()->set_name("backup-5"); - return make_status_or(page); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - std::vector actual_names; - for (auto const& backup : conn->ListBackups({in, ""})) { - ASSERT_STATUS_OK(backup); - actual_names.push_back(backup->name()); - } - EXPECT_THAT(actual_names, ElementsAre("backup-1", "backup-2", "backup-3", - "backup-4", "backup-5")); -} - -TEST(DatabaseAdminConnectionTest, ListBackupsPermanentFailure) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListBackups) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListBackups({in, ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(DatabaseAdminConnectionTest, ListBackupsTooManyFailures) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListBackups) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListBackups({in, ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that the successful case works. -TEST(DatabaseAdminConnectionTest, UpdateBackupSuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance/backups/test-backup"; - - EXPECT_CALL(*mock, UpdateBackup) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))) - .WillOnce([&expected_name](grpc::ClientContext&, - gsad::v1::UpdateBackupRequest const& request) { - EXPECT_EQ(expected_name, request.backup().name()); - gsad::v1::Backup response; - response.set_name(request.backup().name()); - response.set_state(gsad::v1::Backup::READY); - return response; - }); - - auto conn = CreateTestingConnection(std::move(mock)); - google::spanner::admin::database::v1::UpdateBackupRequest request; - request.mutable_backup()->set_name( - Backup(Instance("test-project", "test-instance"), "test-backup") - .FullName()); - auto response = conn->UpdateBackup({request}); - ASSERT_STATUS_OK(response); - EXPECT_EQ(gsad::v1::Backup::READY, response->state()); - EXPECT_EQ(expected_name, response->name()); -} - -/// @test Verify that permanent errors are reported immediately. -TEST(DatabaseAdminConnectionTest, UpdateBackupPermanentError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, UpdateBackup) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - google::spanner::admin::database::v1::UpdateBackupRequest request; - auto response = conn->UpdateBackup({request}); - EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied)); -} - -/// @test Verify that too many transients errors are reported correctly. -TEST(DatabaseAdminConnectionTest, UpdateBackupTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, UpdateBackup) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - google::spanner::admin::database::v1::UpdateBackupRequest request; - auto response = conn->UpdateBackup({request}); - EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that we can list backup operations in multiple pages. -TEST(DatabaseAdminConnectionTest, ListBackupOperations) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - std::string const expected_parent = in.FullName(); - - EXPECT_CALL(*mock, ListBackupOperations) - .WillOnce([&expected_parent]( - grpc::ClientContext&, - gsad::v1::ListBackupOperationsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_TRUE(request.page_token().empty()); - - gsad::v1::ListBackupOperationsResponse page; - page.set_next_page_token("page-1"); - page.add_operations()->set_name("op-1"); - page.add_operations()->set_name("op-2"); - return make_status_or(page); - }) - .WillOnce([&expected_parent]( - grpc::ClientContext&, - gsad::v1::ListBackupOperationsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-1", request.page_token()); - - gsad::v1::ListBackupOperationsResponse page; - page.set_next_page_token("page-2"); - page.add_operations()->set_name("op-3"); - page.add_operations()->set_name("op-4"); - return make_status_or(page); - }) - .WillOnce([&expected_parent]( - grpc::ClientContext&, - gsad::v1::ListBackupOperationsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-2", request.page_token()); - - gsad::v1::ListBackupOperationsResponse page; - page.clear_next_page_token(); - page.add_operations()->set_name("op-5"); - return make_status_or(page); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - std::vector actual_names; - for (auto const& operation : conn->ListBackupOperations({in, ""})) { - ASSERT_STATUS_OK(operation); - actual_names.push_back(operation->name()); - } - EXPECT_THAT(actual_names, - ElementsAre("op-1", "op-2", "op-3", "op-4", "op-5")); -} - -TEST(DatabaseAdminConnectionTest, ListBackupOperationsPermanentFailure) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListBackupOperations) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListBackupOperations({in, ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(DatabaseAdminConnectionTest, ListBackupOperationsTooManyFailures) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListBackupOperations) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListBackupOperations({in, ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kUnavailable)); -} - -/// @test Verify that we can list database operations in multiple pages. -TEST(DatabaseAdminConnectionTest, ListDatabaseOperations) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - std::string const expected_parent = in.FullName(); - - EXPECT_CALL(*mock, ListDatabaseOperations) - .WillOnce([&expected_parent]( - grpc::ClientContext&, - gsad::v1::ListDatabaseOperationsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_TRUE(request.page_token().empty()); - - gsad::v1::ListDatabaseOperationsResponse page; - page.set_next_page_token("page-1"); - page.add_operations()->set_name("op-1"); - page.add_operations()->set_name("op-2"); - return make_status_or(page); - }) - .WillOnce([&expected_parent]( - grpc::ClientContext&, - gsad::v1::ListDatabaseOperationsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-1", request.page_token()); - - gsad::v1::ListDatabaseOperationsResponse page; - page.set_next_page_token("page-2"); - page.add_operations()->set_name("op-3"); - page.add_operations()->set_name("op-4"); - return make_status_or(page); - }) - .WillOnce([&expected_parent]( - grpc::ClientContext&, - gsad::v1::ListDatabaseOperationsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("page-2", request.page_token()); - - gsad::v1::ListDatabaseOperationsResponse page; - page.clear_next_page_token(); - page.add_operations()->set_name("op-5"); - return make_status_or(page); - }); - - auto conn = CreateTestingConnection(std::move(mock)); - std::vector actual_names; - for (auto const& operation : conn->ListDatabaseOperations({in, ""})) { - ASSERT_STATUS_OK(operation); - actual_names.push_back(operation->name()); - } - EXPECT_THAT(actual_names, - ElementsAre("op-1", "op-2", "op-3", "op-4", "op-5")); -} - -TEST(DatabaseAdminConnectionTest, ListDatabaseOperationsPermanentFailure) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListDatabaseOperations) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListDatabaseOperations({in, ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(DatabaseAdminConnectionTest, ListDatabaseOperationsTooManyFailures) { - auto mock = std::make_shared(); - Instance in("test-project", "test-instance"); - - EXPECT_CALL(*mock, ListDatabaseOperations) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = CreateTestingConnection(std::move(mock)); - auto range = conn->ListDatabaseOperations({in, ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kUnavailable)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/google_cloud_cpp_spanner.bzl b/google/cloud/spanner/google_cloud_cpp_spanner.bzl index 2225628fa9d8e..4ee5cfe878095 100644 --- a/google/cloud/spanner/google_cloud_cpp_spanner.bzl +++ b/google/cloud/spanner/google_cloud_cpp_spanner.bzl @@ -45,28 +45,22 @@ google_cloud_cpp_spanner_hdrs = [ "admin/internal/instance_admin_stub_factory.h", "admin/internal/instance_admin_tracing_connection.h", "admin/internal/instance_admin_tracing_stub.h", - "admin/retry_traits.h", "backoff_policy.h", "backup.h", "batch_dml_result.h", "bytes.h", "client.h", - "client_options.h", "commit_options.h", "commit_result.h", "connection.h", "connection_options.h", "create_instance_request_builder.h", "database.h", - "database_admin_client.h", - "database_admin_connection.h", "date.h", "directed_read_replicas.h", "encryption_config.h", "iam_updater.h", "instance.h", - "instance_admin_client.h", - "instance_admin_connection.h", "internal/channel.h", "internal/connection_impl.h", "internal/database_admin_logging.h", @@ -159,11 +153,7 @@ google_cloud_cpp_spanner_srcs = [ "connection.cc", "connection_options.cc", "database.cc", - "database_admin_client.cc", - "database_admin_connection.cc", "instance.cc", - "instance_admin_client.cc", - "instance_admin_connection.cc", "internal/connection_impl.cc", "internal/database_admin_logging.cc", "internal/database_admin_metadata.cc", diff --git a/google/cloud/spanner/google_cloud_cpp_spanner_mocks.bzl b/google/cloud/spanner/google_cloud_cpp_spanner_mocks.bzl index c23e21f05027c..8cb589854248d 100644 --- a/google/cloud/spanner/google_cloud_cpp_spanner_mocks.bzl +++ b/google/cloud/spanner/google_cloud_cpp_spanner_mocks.bzl @@ -19,8 +19,6 @@ google_cloud_cpp_spanner_mocks_hdrs = [ "admin/mocks/mock_database_admin_connection.h", "admin/mocks/mock_instance_admin_connection.h", - "mocks/mock_database_admin_connection.h", - "mocks/mock_instance_admin_connection.h", "mocks/mock_spanner_connection.h", "mocks/row.h", ] diff --git a/google/cloud/spanner/instance_admin_client.cc b/google/cloud/spanner/instance_admin_client.cc deleted file mode 100644 index bbb4f3b6969b1..0000000000000 --- a/google/cloud/spanner/instance_admin_client.cc +++ /dev/null @@ -1,141 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/instance_admin_client.h" -#include "google/cloud/options.h" - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -StatusOr -InstanceAdminClient::GetInstance(Instance const& in) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetInstance({in.FullName()}); -} - -future> -InstanceAdminClient::CreateInstance( - google::spanner::admin::instance::v1::CreateInstanceRequest const& - request) { - internal::OptionsSpan span(conn_->options()); - return conn_->CreateInstance({request}); -} - -future> -InstanceAdminClient::UpdateInstance( - google::spanner::admin::instance::v1::UpdateInstanceRequest const& - request) { - internal::OptionsSpan span(conn_->options()); - return conn_->UpdateInstance({request}); -} - -Status InstanceAdminClient::DeleteInstance(Instance const& in) { - internal::OptionsSpan span(conn_->options()); - return conn_->DeleteInstance({in.FullName()}); -} - -StatusOr -InstanceAdminClient::GetInstanceConfig(std::string const& name) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetInstanceConfig({name}); -} - -ListInstanceConfigsRange InstanceAdminClient::ListInstanceConfigs( - std::string project_id) { - internal::OptionsSpan span(conn_->options()); - return conn_->ListInstanceConfigs({std::move(project_id)}); -} - -ListInstancesRange InstanceAdminClient::ListInstances(std::string project_id, - std::string filter) { - internal::OptionsSpan span(conn_->options()); - return conn_->ListInstances({std::move(project_id), std::move(filter)}); -} - -StatusOr InstanceAdminClient::GetIamPolicy( - Instance const& in) { - internal::OptionsSpan span(conn_->options()); - return conn_->GetIamPolicy({in.FullName()}); -} - -StatusOr InstanceAdminClient::SetIamPolicy( - Instance const& in, google::iam::v1::Policy policy) { - internal::OptionsSpan span(conn_->options()); - return conn_->SetIamPolicy({in.FullName(), std::move(policy)}); -} - -StatusOr InstanceAdminClient::SetIamPolicy( - Instance const& in, IamUpdater const& updater) { - auto const rerun_maximum_duration = std::chrono::minutes(15); - auto default_rerun_policy = - LimitedTimeTransactionRerunPolicy(rerun_maximum_duration).clone(); - - auto const backoff_initial_delay = std::chrono::milliseconds(1000); - auto const backoff_maximum_delay = std::chrono::minutes(5); - auto const backoff_scaling = 2.0; - auto default_backoff_policy = - ExponentialBackoffPolicy(backoff_initial_delay, backoff_maximum_delay, - backoff_scaling) - .clone(); - - return SetIamPolicy(in, updater, std::move(default_rerun_policy), - std::move(default_backoff_policy)); -} - -StatusOr InstanceAdminClient::SetIamPolicy( - Instance const& in, IamUpdater const& updater, - std::unique_ptr rerun_policy, - std::unique_ptr backoff_policy) { - internal::OptionsSpan span(conn_->options()); - using RerunnablePolicy = spanner_internal::SafeTransactionRerun; - - Status last_status; - do { - auto current_policy = conn_->GetIamPolicy({in.FullName()}); - if (!current_policy) { - last_status = std::move(current_policy).status(); - } else { - auto etag = current_policy->etag(); - auto desired = updater(*current_policy); - if (!desired.has_value()) { - return current_policy; - } - desired->set_etag(std::move(etag)); - auto result = conn_->SetIamPolicy({in.FullName(), *std::move(desired)}); - if (RerunnablePolicy::IsOk(result.status())) { - return result; - } - last_status = std::move(result).status(); - } - if (!rerun_policy->OnFailure(last_status)) break; - std::this_thread::sleep_for(backoff_policy->OnCompletion()); - } while (!rerun_policy->IsExhausted()); - return last_status; -} - -StatusOr -InstanceAdminClient::TestIamPermissions(Instance const& in, - std::vector permissions) { - internal::OptionsSpan span(conn_->options()); - return conn_->TestIamPermissions({in.FullName(), std::move(permissions)}); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/instance_admin_client.h b/google/cloud/spanner/instance_admin_client.h deleted file mode 100644 index 3a00e56a7b08a..0000000000000 --- a/google/cloud/spanner/instance_admin_client.h +++ /dev/null @@ -1,317 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_INSTANCE_ADMIN_CLIENT_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_INSTANCE_ADMIN_CLIENT_H - -#include "google/cloud/spanner/iam_updater.h" -#include "google/cloud/spanner/instance.h" -#include "google/cloud/spanner/instance_admin_connection.h" -#include "google/cloud/spanner/version.h" -#include "google/cloud/status_or.h" -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * Performs instance administration operations on Cloud Spanner. - * - * @deprecated Please use #google::cloud::spanner_admin::InstanceAdminClient - * instead. - * - * Applications use this class to perform operations on - * [Spanner Databases][spanner-doc-link]. - * - * @par Performance - * - * `InstanceAdminClient` objects are cheap to create, copy, and move. However, - * each `InstanceAdminClient` object must be created with a - * `std::shared_ptr`, which itself is relatively - * expensive to create. Therefore, connection instances should be shared when - * possible. See the `MakeInstanceAdminConnection()` method and the - * `InstanceAdminConnection` interface for more details. - * - * @par Thread Safety - * - * Instances of this class created via copy-construction or copy-assignment - * share the underlying pool of connections. Access to these copies via multiple - * threads is guaranteed to work. Two threads operating on the same instance of - * this class is not guaranteed to work. - * - * @par Error Handling - * - * This class uses `StatusOr` to report errors. When an operation fails to - * perform its work the returned `StatusOr` contains the error details. If - * the `ok()` member function in the `StatusOr` returns `true` then it - * contains the expected result. For more information, see the - * [Error Handling Guide](#spanner-error-handling). - * - * [spanner-doc-link]: - * https://cloud.google.com/spanner/docs/api-libraries-overview - */ -class GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("InstanceAdminClient") - InstanceAdminClient { - public: - explicit InstanceAdminClient(std::shared_ptr conn) - : conn_(std::move(conn)) {} - - /// No default construction. - /// Use `InstanceAdminClient(std::shared_ptr)` - InstanceAdminClient() = delete; - - ///@{ - /// @name Copy and move support - InstanceAdminClient(InstanceAdminClient const&) = default; - InstanceAdminClient& operator=(InstanceAdminClient const&) = default; - InstanceAdminClient(InstanceAdminClient&&) = default; - InstanceAdminClient& operator=(InstanceAdminClient&&) = default; - ///@} - - ///@{ - /// @name Equality - friend bool operator==(InstanceAdminClient const& a, - InstanceAdminClient const& b) { - return a.conn_ == b.conn_; - } - friend bool operator!=(InstanceAdminClient const& a, - InstanceAdminClient const& b) { - return !(a == b); - } - ///@} - - /** - * Retrieve metadata information about a Cloud Spanner Instance. - * - * @par Idempotency - * This is a read-only operation and therefore it is always treated as - * idempotent. - * - * @par Example - * @snippet samples.cc get-instance - */ - StatusOr GetInstance( - Instance const& in); - - /** - * Creates a new Cloud Spanner instance in the given project. - * - * Use CreateInstanceRequestBuilder to build the - * `google::spanner::admin::instance::v1::CreateInstanceRequest` object. - * - * Note that the instance id must be between 2 and 64 characters long, it must - * start with a lowercase letter (`[a-z]`), it must end with a lowercase - * letter or a number (`[a-z0-9]`) and any characters between the beginning - * and ending characters must be lower case letters, numbers, or dashes (`-`), - * that is, they must belong to the `[-a-z0-9]` character set. - * - * @par Example - * @snippet samples.cc create-instance - * - */ - future> - CreateInstance( - google::spanner::admin::instance::v1::CreateInstanceRequest const&); - - /** - * Updates a Cloud Spanner instance. - * - * Use `google::cloud::spanner::UpdateInstanceRequestBuilder` to build the - * `google::spanner::admin::instance::v1::UpdateInstanceRequest` object. - * - * @par Idempotency - * This operation is idempotent as its result does not depend on the previous - * state of the instance. Note that, as is the case with all operations, it is - * subject to race conditions if multiple tasks are attempting to change the - * same fields in the same instance. - * - * @par Example - * @snippet samples.cc update-instance - * - */ - future> - UpdateInstance( - google::spanner::admin::instance::v1::UpdateInstanceRequest const&); - - /** - * Deletes an existing Cloud Spanner instance. - * - * @warning Deleting an instance deletes all the databases in the - * instance. This is an unrecoverable operation. - * - * @par Example - * @snippet samples.cc delete-instance - */ - Status DeleteInstance(Instance const& in); - - /** - * Retrieve information about a Cloud Spanner Instance Config. - * - * @par Idempotency - * This is a read-only operation and therefore it is always treated as - * idempotent. - * - * @par Example - * @snippet samples.cc get-instance-config - */ - StatusOr - GetInstanceConfig(std::string const& name); - - /** - * Retrieve a list of instance configs for a given project. - * - * @par Idempotency - * This is a read-only operation and therefore it is always treated as - * idempotent. - * - * @par Example - * @snippet samples.cc list-instance-configs - */ - ListInstanceConfigsRange ListInstanceConfigs(std::string project_id); - - /** - * Retrieve a list of instances for a given project. - * - * @par Idempotency - * This is a read-only operation and therefore it is always treated as - * idempotent. - * - * @par Example - * @snippet samples.cc list-instances - */ - ListInstancesRange ListInstances(std::string project_id, std::string filter); - - /** - * Get the IAM policy in effect for the given instance. - * - * This function retrieves the IAM policy configured in the given instance, - * that is, which roles are enabled in the instance, and what entities are - * members of each role. - * - * @par Idempotency - * This is a read-only operation and therefore it is always treated as - * idempotent. - * - * @par Example - * @snippet samples.cc instance-get-iam-policy - * - * @see The [Cloud Spanner - * documentation](https://cloud.google.com/spanner/docs/iam) for a - * description of the roles and permissions supported by Cloud Spanner. - * @see [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions) - * for an introduction to Identity and Access Management in Google Cloud - * Platform. - */ - StatusOr GetIamPolicy(Instance const& in); - - /** - * Set the IAM policy for the given instance. - * - * This function changes the IAM policy configured in the given instance to - * the value of @p policy. - * - * @par Idempotency - * This function is only idempotent if the `etag` field in @p policy is set. - * Therefore, the underlying RPCs are only retried if the field is set, and - * the function returns the first RPC error in any other case. - * - * @par Example - * @snippet samples.cc add-database-reader - * - * @see The [Cloud Spanner - * documentation](https://cloud.google.com/spanner/docs/iam) for a - * description of the roles and permissions supported by Cloud Spanner. - * @see [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions) - * for an introduction to Identity and Access Management in Google Cloud - * Platform. - */ - StatusOr SetIamPolicy( - Instance const& in, google::iam::v1::Policy policy); - - /** - * Updates the IAM policy for an instance using an optimistic concurrency - * control loop. - * - * This function repeatedly reads the current IAM policy in @p in, and then - * calls the @p updater with the this policy. The @p updater returns an empty - * optional if no changes are required, or it returns the new desired value - * for the IAM policy. This function then updates the policy. - * - * Updating an IAM policy can fail with retryable errors or can be aborted - * because there were simultaneous changes the to IAM policy. In these cases - * this function reruns the loop until it succeeds. - * - * The function returns the final IAM policy, or an error if the rerun policy - * for the underlying connection has expired. - * - * @par Idempotency - * This function always sets the `etag` field on the policy, so the underlying - * RPCs are retried automatically. - * - * @param in the identifier for the instance where you want to change the IAM - * policy. - * @param updater a callback to modify the policy. Return an unset optional - * to indicate that no changes to the policy are needed. - */ - StatusOr SetIamPolicy(Instance const& in, - IamUpdater const& updater); - - /** - * @copydoc SetIamPolicy(Instance const&,IamUpdater const&) - * - * @param rerun_policy controls for how long (or how many times) the updater - * will be rerun after the IAM policy update aborts. - * @param backoff_policy controls how long `SetIamPolicy` waits between - * reruns. - */ - StatusOr SetIamPolicy( - Instance const& in, IamUpdater const& updater, - std::unique_ptr rerun_policy, - std::unique_ptr backoff_policy); - - /** - * Get the subset of the permissions the caller has on the given instance. - * - * This function compares the given list of permissions against those - * permissions granted to the caller, and returns the subset of the list that - * the caller actually holds. - * - * @note Permission wildcards, such as `spanner.*` are not allowed. - * - * @par Example - * @snippet samples.cc instance-test-iam-permissions - * - * @see The [Cloud Spanner - * documentation](https://cloud.google.com/spanner/docs/iam) for a description - * of the roles and permissions supported by Cloud Spanner. - * @see [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions) - * for an introduction to Identity and Access Management in Google Cloud - * Platform. - */ - StatusOr TestIamPermissions( - Instance const& in, std::vector permissions); - - private: - std::shared_ptr conn_; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_INSTANCE_ADMIN_CLIENT_H diff --git a/google/cloud/spanner/instance_admin_client_test.cc b/google/cloud/spanner/instance_admin_client_test.cc deleted file mode 100644 index 44f838f805fb5..0000000000000 --- a/google/cloud/spanner/instance_admin_client_test.cc +++ /dev/null @@ -1,320 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/instance_admin_client.h" -#include "google/cloud/spanner/mocks/mock_instance_admin_connection.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/types/optional.h" -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace gsai = ::google::spanner::admin::instance; - -using ::google::cloud::testing_util::StatusIs; -using spanner_mocks::MockInstanceAdminConnection; -using ::testing::AtLeast; -using ::testing::ElementsAre; -using ::testing::HasSubstr; - -TEST(InstanceAdminClientTest, CopyAndMove) { - auto conn1 = std::make_shared(); - auto conn2 = std::make_shared(); - - InstanceAdminClient c1(conn1); - InstanceAdminClient c2(conn2); - EXPECT_NE(c1, c2); - - // Copy construction - InstanceAdminClient c3 = c1; - EXPECT_EQ(c3, c1); - - // Copy assignment - c3 = c2; - EXPECT_EQ(c3, c2); - - // Move construction - InstanceAdminClient c4 = std::move(c3); - EXPECT_EQ(c4, c2); - - // Move assignment - c1 = std::move(c4); - EXPECT_EQ(c1, c2); -} - -TEST(InstanceAdminClientTest, GetInstance) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstance) - .WillOnce([](InstanceAdminConnection::GetInstanceParams const& p) { - EXPECT_EQ("projects/test-project/instances/test-instance", - p.instance_name); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - InstanceAdminClient client(mock); - auto actual = client.GetInstance(Instance("test-project", "test-instance")); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, GetInstanceConfig) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstanceConfig) - .WillOnce([](InstanceAdminConnection::GetInstanceConfigParams const& p) { - EXPECT_EQ("projects/test-project/instanceConfigs/test-config", - p.instance_config_name); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - InstanceAdminClient client(mock); - auto actual = client.GetInstanceConfig( - "projects/test-project/instanceConfigs/test-config"); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, ListInstanceConfigs) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstanceConfigs) - .WillOnce( - [](InstanceAdminConnection::ListInstanceConfigsParams const& p) { - EXPECT_EQ("test-project", p.project_id); - return google::cloud::internal::MakePaginationRange< - ListInstanceConfigsRange>( - gsai::v1::ListInstanceConfigsRequest{}, - [](gsai::v1::ListInstanceConfigsRequest const&) { - return StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh")); - }, - [](gsai::v1::ListInstanceConfigsResponse const&) { - return std::vector{}; - }); - }); - - InstanceAdminClient client(mock); - auto range = client.ListInstanceConfigs("test-project"); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, ListInstances) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, ListInstances) - .WillOnce([](InstanceAdminConnection::ListInstancesParams const& p) { - EXPECT_EQ("test-project", p.project_id); - EXPECT_EQ("labels.test-key:test-value", p.filter); - - return google::cloud::internal::MakePaginationRange( - gsai::v1::ListInstancesRequest{}, - [](gsai::v1::ListInstancesRequest const&) { - return StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh")); - }, - [](gsai::v1::ListInstancesResponse const&) { - return std::vector{}; - }); - }); - - InstanceAdminClient client(mock); - auto range = - client.ListInstances("test-project", "labels.test-key:test-value"); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, GetIamPolicy) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([](InstanceAdminConnection::GetIamPolicyParams const& p) { - EXPECT_EQ("projects/test-project/instances/test-instance", - p.instance_name); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - InstanceAdminClient client(mock); - auto actual = client.GetIamPolicy(Instance("test-project", "test-instance")); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, SetIamPolicy) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce([](InstanceAdminConnection::SetIamPolicyParams const& p) { - EXPECT_EQ("projects/test-project/instances/test-instance", - p.instance_name); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - InstanceAdminClient client(mock); - auto actual = client.SetIamPolicy(Instance("test-project", "test-instance"), - google::iam::v1::Policy{}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, SetIamPolicyOccGetFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([](InstanceAdminConnection::GetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - InstanceAdminClient client(mock); - auto actual = - client.SetIamPolicy(Instance("test-project", "test-instance"), - [](google::iam::v1::Policy const&) { - return absl::optional{}; - }); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, SetIamPolicyOccNoUpdates) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([](InstanceAdminConnection::GetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - google::iam::v1::Policy r; - r.set_etag("test-etag"); - return r; - }); - EXPECT_CALL(*mock, SetIamPolicy).Times(0); - - InstanceAdminClient client(mock); - auto actual = - client.SetIamPolicy(Instance("test-project", "test-instance"), - [](google::iam::v1::Policy const& p) { - EXPECT_EQ("test-etag", p.etag()); - return absl::optional{}; - }); - ASSERT_STATUS_OK(actual); - EXPECT_EQ("test-etag", actual->etag()); -} - -std::unique_ptr RerunPolicyForTesting() { - return LimitedErrorCountTransactionRerunPolicy(/*maximum_failures=*/3) - .clone(); -} - -std::unique_ptr BackoffPolicyForTesting() { - return ExponentialBackoffPolicy( - /*initial_delay=*/std::chrono::microseconds(1), - /*maximum_delay=*/std::chrono::microseconds(1), /*scaling=*/2.0) - .clone(); -} - -TEST(InstanceAdminClientTest, SetIamPolicyOccRetryAborted) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([](InstanceAdminConnection::GetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - google::iam::v1::Policy r; - r.set_etag("test-etag-1"); - return r; - }) - .WillOnce([](InstanceAdminConnection::GetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - google::iam::v1::Policy r; - r.set_etag("test-etag-2"); - return r; - }); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce([](InstanceAdminConnection::SetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - EXPECT_EQ("test-etag-1", p.policy.etag()); - return Status(StatusCode::kAborted, "aborted"); - }) - .WillOnce([](InstanceAdminConnection::SetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - EXPECT_EQ("test-etag-2", p.policy.etag()); - google::iam::v1::Policy r; - r.set_etag("test-etag-3"); - return r; - }); - - InstanceAdminClient client(mock); - int counter = 0; - auto actual = client.SetIamPolicy( - Instance("test-project", "test-instance"), - [&counter](google::iam::v1::Policy p) { - EXPECT_EQ("test-etag-" + std::to_string(++counter), p.etag()); - return p; - }, - RerunPolicyForTesting(), BackoffPolicyForTesting()); - ASSERT_STATUS_OK(actual); - EXPECT_EQ("test-etag-3", actual->etag()); -} - -TEST(InstanceAdminClientTest, SetIamPolicyOccRetryAbortedTooManyFailures) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillRepeatedly([](InstanceAdminConnection::GetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - google::iam::v1::Policy r; - r.set_etag("test-etag-1"); - return r; - }); - EXPECT_CALL(*mock, SetIamPolicy) - .Times(AtLeast(2)) - .WillRepeatedly([](InstanceAdminConnection::SetIamPolicyParams const& p) { - EXPECT_THAT(p.instance_name, HasSubstr("test-project")); - EXPECT_THAT(p.instance_name, HasSubstr("test-instance")); - EXPECT_EQ("test-etag-1", p.policy.etag()); - return Status(StatusCode::kAborted, "test-msg"); - }); - - InstanceAdminClient client(mock); - auto actual = client.SetIamPolicy( - Instance("test-project", "test-instance"), - [](google::iam::v1::Policy p) { return p; }, RerunPolicyForTesting(), - BackoffPolicyForTesting()); - EXPECT_THAT(actual, StatusIs(StatusCode::kAborted, HasSubstr("test-msg"))); -} - -TEST(InstanceAdminClientTest, TestIamPermissions) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, TestIamPermissions) - .WillOnce([](InstanceAdminConnection::TestIamPermissionsParams const& p) { - EXPECT_EQ("projects/test-project/instances/test-instance", - p.instance_name); - EXPECT_THAT(p.permissions, - ElementsAre("test.permission1", "test.permission2")); - return Status(StatusCode::kPermissionDenied, "uh-oh"); - }); - - InstanceAdminClient client(mock); - auto actual = - client.TestIamPermissions(Instance("test-project", "test-instance"), - {"test.permission1", "test.permission2"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/instance_admin_connection.cc b/google/cloud/spanner/instance_admin_connection.cc deleted file mode 100644 index 90685c40d55ca..0000000000000 --- a/google/cloud/spanner/instance_admin_connection.cc +++ /dev/null @@ -1,337 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/instance_admin_connection.h" -#include "google/cloud/spanner/instance.h" -#include "google/cloud/spanner/internal/defaults.h" -#include "google/cloud/spanner/options.h" -#include "google/cloud/internal/async_long_running_operation.h" -#include "google/cloud/internal/retry_loop.h" -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -namespace gsai = ::google::spanner::admin::instance; - -using ::google::cloud::Idempotency; - -namespace { - -class InstanceAdminConnectionImpl : public InstanceAdminConnection { - public: - InstanceAdminConnectionImpl( - std::shared_ptr stub, Options opts) - : stub_(std::move(stub)), - opts_(std::move(opts)), - retry_policy_prototype_(opts_.get()->clone()), - backoff_policy_prototype_( - opts_.get()->clone()), - polling_policy_prototype_( - opts_.get()->clone()), - background_threads_(internal::MakeBackgroundThreadsFactory(opts_)()) {} - - ~InstanceAdminConnectionImpl() override = default; - - Options options() override { return opts_; } - - StatusOr GetInstance(GetInstanceParams gip) override { - gsai::v1::GetInstanceRequest request; - request.set_name(std::move(gip.instance_name)); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsai::v1::GetInstanceRequest const& request) { - return stub_->GetInstance(context, request); - }, - request, __func__); - } - - future> CreateInstance( - CreateInstanceParams p) override { - return google::cloud::internal::AsyncLongRunningOperation< - gsai::v1::Instance>( - background_threads_->cq(), - google::cloud::internal::SaveCurrentOptions(), std::move(p.request), - [stub = stub_](google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - gsai::v1::CreateInstanceRequest const& request) { - return stub->AsyncCreateInstance(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::GetOperationRequest const& request) { - return stub->AsyncGetOperation(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::CancelOperationRequest const& request) { - return stub->AsyncCancelOperation(cq, std::move(context), request); - }, - &google::cloud::internal::ExtractLongRunningResultResponse< - gsai::v1::Instance>, - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kNonIdempotent, polling_policy_prototype_->clone(), - __func__); - } - - future> UpdateInstance( - UpdateInstanceParams p) override { - return google::cloud::internal::AsyncLongRunningOperation< - gsai::v1::Instance>( - background_threads_->cq(), - google::cloud::internal::SaveCurrentOptions(), std::move(p.request), - [stub = stub_](google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - gsai::v1::UpdateInstanceRequest const& request) { - return stub->AsyncUpdateInstance(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::GetOperationRequest const& request) { - return stub->AsyncGetOperation(cq, std::move(context), request); - }, - [stub = stub_]( - google::cloud::CompletionQueue& cq, - std::shared_ptr context, - google::cloud::internal::ImmutableOptions const&, - google::longrunning::CancelOperationRequest const& request) { - return stub->AsyncCancelOperation(cq, std::move(context), request); - }, - &google::cloud::internal::ExtractLongRunningResultResponse< - gsai::v1::Instance>, - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, polling_policy_prototype_->clone(), __func__); - } - - Status DeleteInstance(DeleteInstanceParams p) override { - gsai::v1::DeleteInstanceRequest request; - request.set_name(std::move(p.instance_name)); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsai::v1::DeleteInstanceRequest const& request) { - return stub_->DeleteInstance(context, request); - }, - request, __func__); - } - - StatusOr GetInstanceConfig( - GetInstanceConfigParams p) override { - gsai::v1::GetInstanceConfigRequest request; - request.set_name(std::move(p.instance_config_name)); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - gsai::v1::GetInstanceConfigRequest const& request) { - return stub_->GetInstanceConfig(context, request); - }, - request, __func__); - } - - ListInstanceConfigsRange ListInstanceConfigs( - ListInstanceConfigsParams params) override { - gsai::v1::ListInstanceConfigsRequest request; - request.set_parent("projects/" + params.project_id); - request.clear_page_token(); - auto& stub = stub_; - // Because we do not have C++14 generalized lambda captures we cannot just - // use the unique_ptr<> here, so convert to shared_ptr<> instead. - auto retry = std::shared_ptr(retry_policy_prototype_->clone()); - auto backoff = - std::shared_ptr(backoff_policy_prototype_->clone()); - - char const* function_name = __func__; - return google::cloud::internal::MakePaginationRange< - ListInstanceConfigsRange>( - std::move(request), - [stub, retry, backoff, - function_name](gsai::v1::ListInstanceConfigsRequest const& r) { - return RetryLoop( - retry->clone(), backoff->clone(), Idempotency::kIdempotent, - [stub](grpc::ClientContext& context, - gsai::v1::ListInstanceConfigsRequest const& request) { - return stub->ListInstanceConfigs(context, request); - }, - r, function_name); - }, - [](gsai::v1::ListInstanceConfigsResponse r) { - std::vector result( - r.instance_configs().size()); - auto& configs = *r.mutable_instance_configs(); - std::move(configs.begin(), configs.end(), result.begin()); - return result; - }); - } - - ListInstancesRange ListInstances(ListInstancesParams params) override { - gsai::v1::ListInstancesRequest request; - request.set_parent("projects/" + params.project_id); - request.set_filter(std::move(params.filter)); - request.clear_page_token(); - auto& stub = stub_; - // Because we do not have C++14 generalized lambda captures we cannot just - // use the unique_ptr<> here, so convert to shared_ptr<> instead. - auto retry = std::shared_ptr(retry_policy_prototype_->clone()); - auto backoff = - std::shared_ptr(backoff_policy_prototype_->clone()); - - char const* function_name = __func__; - return google::cloud::internal::MakePaginationRange( - std::move(request), - [stub, retry, backoff, - function_name](gsai::v1::ListInstancesRequest const& r) { - return RetryLoop( - retry->clone(), backoff->clone(), Idempotency::kIdempotent, - [stub](grpc::ClientContext& context, - gsai::v1::ListInstancesRequest const& request) { - return stub->ListInstances(context, request); - }, - r, function_name); - }, - [](gsai::v1::ListInstancesResponse r) { - std::vector result(r.instances().size()); - auto& instances = *r.mutable_instances(); - std::move(instances.begin(), instances.end(), result.begin()); - return result; - }); - } - - StatusOr GetIamPolicy( - GetIamPolicyParams p) override { - google::iam::v1::GetIamPolicyRequest request; - request.set_resource(std::move(p.instance_name)); - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - google::iam::v1::GetIamPolicyRequest const& request) { - return stub_->GetIamPolicy(context, request); - }, - request, __func__); - } - - StatusOr SetIamPolicy( - SetIamPolicyParams p) override { - google::iam::v1::SetIamPolicyRequest request; - request.set_resource(std::move(p.instance_name)); - *request.mutable_policy() = std::move(p.policy); - auto const idempotency = request.policy().etag().empty() - ? Idempotency::kNonIdempotent - : Idempotency::kIdempotent; - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - idempotency, - [this](grpc::ClientContext& context, - google::iam::v1::SetIamPolicyRequest const& request) { - return stub_->SetIamPolicy(context, request); - }, - request, __func__); - } - - StatusOr TestIamPermissions( - TestIamPermissionsParams p) override { - google::iam::v1::TestIamPermissionsRequest request; - request.set_resource(std::move(p.instance_name)); - for (auto& permission : p.permissions) { - request.add_permissions(std::move(permission)); - } - return RetryLoop( - retry_policy_prototype_->clone(), backoff_policy_prototype_->clone(), - Idempotency::kIdempotent, - [this](grpc::ClientContext& context, - google::iam::v1::TestIamPermissionsRequest const& request) { - return stub_->TestIamPermissions(context, request); - }, - request, __func__); - } - - private: - std::shared_ptr stub_; - Options opts_; - std::unique_ptr retry_policy_prototype_; - std::unique_ptr backoff_policy_prototype_; - std::unique_ptr polling_policy_prototype_; - - // Implementations of `BackgroundThreads` typically create a pool of - // threads that are joined during destruction, so, to avoid ownership - // cycles, those threads should never assume ownership of this object - // (e.g., via a `std::shared_ptr<>`). - std::unique_ptr background_threads_; -}; - -} // namespace - -InstanceAdminConnection::~InstanceAdminConnection() = default; - -std::shared_ptr MakeInstanceAdminConnection( - Options opts) { - internal::CheckExpectedOptions(opts, __func__); - opts = spanner_internal::DefaultAdminOptions(std::move(opts)); - auto stub = spanner_internal::CreateDefaultInstanceAdminStub(opts); - return std::make_shared( - std::move(stub), std::move(opts)); -} - -std::shared_ptr MakeInstanceAdminConnection( - ConnectionOptions const& options) { - return MakeInstanceAdminConnection(internal::MakeOptions(options)); -} - -std::shared_ptr MakeInstanceAdminConnection( - ConnectionOptions const& options, std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - std::unique_ptr polling_policy) { - auto opts = internal::MakeOptions(options); - opts.set(std::move(retry_policy)); - opts.set(std::move(backoff_policy)); - opts.set(std::move(polling_policy)); - return MakeInstanceAdminConnection(std::move(opts)); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner - -namespace spanner_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -std::shared_ptr -MakeInstanceAdminConnectionForTesting(std::shared_ptr stub, - Options opts) { - opts = spanner_internal::DefaultAdminOptions(std::move(opts)); - return std::make_shared( - std::move(stub), std::move(opts)); -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner_internal -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/instance_admin_connection.h b/google/cloud/spanner/instance_admin_connection.h deleted file mode 100644 index c725996d6794d..0000000000000 --- a/google/cloud/spanner/instance_admin_connection.h +++ /dev/null @@ -1,297 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_INSTANCE_ADMIN_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_INSTANCE_ADMIN_CONNECTION_H - -#include "google/cloud/spanner/backoff_policy.h" -#include "google/cloud/spanner/internal/instance_admin_stub.h" -#include "google/cloud/spanner/polling_policy.h" -#include "google/cloud/spanner/retry_policy.h" -#include "google/cloud/spanner/version.h" -#include "google/cloud/backoff_policy.h" -#include "google/cloud/internal/pagination_range.h" -#include "google/cloud/options.h" -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * An input range to stream all the instances in a Cloud project. - * - * This type models an [input range][cppref-input-range] of - * `google::spanner::admin::v1::Instance` objects. Applications can make a - * single pass through the results. - * - * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range - */ -using ListInstancesRange = ::google::cloud::internal::PaginationRange< - google::spanner::admin::instance::v1::Instance>; - -/** - * An input range to stream all the instance configs in a Cloud project. - * - * This type models an [input range][cppref-input-range] of - * `google::spanner::admin::v1::Instance` objects. Applications can make a - * single pass through the results. - * - * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range - */ -using ListInstanceConfigsRange = ::google::cloud::internal::PaginationRange< - google::spanner::admin::instance::v1::InstanceConfig>; - -/** - * A connection to the Cloud Spanner instance administration service. - * - * @deprecated Please use #google::cloud::spanner_admin::InstanceAdminClient - * and #google::cloud::spanner_admin::InstanceAdminConnection instead. - * - * This interface defines pure-virtual methods for each of the user-facing - * overload sets in `InstanceAdminClient`. This allows users to inject custom - * behavior (e.g., with a Google Mock object) in a `InstanceAdminClient` object - * for use in their own tests. - * - * To create a concrete instance that connects you to a real Cloud Spanner - * instance administration service, see `MakeInstanceAdminConnection()`. - */ -class GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("InstanceAdminConnection") - InstanceAdminConnection { - public: - virtual ~InstanceAdminConnection() = 0; - - ///@{ - /** - * @name Define the arguments for each member function. - * - * Applications may define classes derived from `InstanceAdminConnection`, - * for example, because they want to mock the class. To avoid breaking all - * such derived classes when we change the number or type of the arguments - * to the member functions we define light weight structures to pass the - * arguments. - */ - /// Wrap the arguments for `GetInstance()`. - struct GetInstanceParams { - /// The full name of the instance in - /// `projects//instances/` format. - std::string instance_name; - }; - - /// Wrap the arguments for `CreateInstance()`. - struct CreateInstanceParams { - google::spanner::admin::instance::v1::CreateInstanceRequest request; - }; - - /// Wrap the arguments for `UpdateInstance()`. - struct UpdateInstanceParams { - google::spanner::admin::instance::v1::UpdateInstanceRequest request; - }; - - /// Wrap the arguments for `DeleteInstance()`. - struct DeleteInstanceParams { - std::string instance_name; - }; - - /// Wrap the arguments for `GetInstanceConfig()`. - struct GetInstanceConfigParams { - std::string instance_config_name; - }; - - /// Wrap the arguments for `ListInstanceConfigs()`. - struct ListInstanceConfigsParams { - std::string project_id; - }; - - /** - * Wrap the arguments for `ListInstances()`. - */ - struct ListInstancesParams { - /** - * Query the instances in this project. - * - * This is a required value, it must be non-empty. - */ - std::string project_id; - - /** - * A filtering expression to restrict the set of instances included in the - * response. - * - * @see The [RPC reference documentation][1] for the format of the filtering - * expression. - * - * [1]: - * https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.ListInstancesRequest - */ - std::string filter; - }; - - /// Wrap the arguments for `GetIamPolicy()`. - struct GetIamPolicyParams { - std::string instance_name; - }; - - /// Wrap the arguments for `SetIamPolicy()`. - struct SetIamPolicyParams { - std::string instance_name; - google::iam::v1::Policy policy; - }; - - /// Wrap the arguments for `TestIamPermissions()`. - struct TestIamPermissionsParams { - std::string instance_name; - std::vector permissions; - }; - ///@} - - virtual Options options() { return Options{}; } - - /// Return the metadata for the given instance. - virtual StatusOr GetInstance( - GetInstanceParams) = 0; - - virtual future> - CreateInstance(CreateInstanceParams p) = 0; - - virtual future> - UpdateInstance(UpdateInstanceParams p) = 0; - - virtual Status DeleteInstance(DeleteInstanceParams p) = 0; - - /// Return the InstanceConfig with the given name. - virtual StatusOr - GetInstanceConfig(GetInstanceConfigParams) = 0; - - /** - * Returns a one-pass input range with all the instance configs. - */ - virtual ListInstanceConfigsRange ListInstanceConfigs( - ListInstanceConfigsParams) = 0; - - /** - * Returns a one-pass input range with all the instances meeting the - * requirements in @p params - */ - virtual ListInstancesRange ListInstances(ListInstancesParams params) = 0; - - /// Define the interface for a - /// google.spanner.v1.DatabaseAdmin.GetIamPolicy RPC. - virtual StatusOr GetIamPolicy( - GetIamPolicyParams) = 0; - - /// Define the interface for a - /// google.spanner.v1.DatabaseAdmin.SetIamPolicy RPC. - virtual StatusOr SetIamPolicy( - SetIamPolicyParams) = 0; - - /// Define the interface for a - /// google.spanner.v1.DatabaseAdmin.TestIamPermissions RPC. - virtual StatusOr - TestIamPermissions(TestIamPermissionsParams) = 0; -}; - -/** - * Returns an InstanceAdminConnection object that can be used for interacting - * with Cloud Spanner's admin APIs. - * - * The returned connection object should not be used directly; instead it - * should be given to a `InstanceAdminClient` instance. - * - * The optional @p opts argument may be used to configure aspects of the - * returned `InstanceAdminConnection`. Expected options are any of the types in - * the following option lists. - * - * - `google::cloud::CommonOptionList` - * - `google::cloud::GrpcOptionList` - * - `google::cloud::SpannerPolicyOptionList` - * - * @see `InstanceAdminConnection` - * - * @param opts (optional) configure the `InstanceAdminConnection` created by - * this function. - */ -GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("MakeInstanceAdminConnection()") -std::shared_ptr MakeInstanceAdminConnection( - Options opts = {}); - -/** - * Returns an InstanceAdminConnection object that can be used for interacting - * with Cloud Spanner's admin APIs. - * - * The returned connection object should not be used directly, rather it should - * be given to a `InstanceAdminClient` instance. - * - * @note Prefer using the `MakeInstanceAdminConnection()` overload that accepts - * `google::cloud::Options`. - * - * @see `InstanceAdminConnection` - * - * @param options configure the `InstanceAdminConnection` created by this - * function. - */ -GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("MakeInstanceAdminConnection()") -std::shared_ptr MakeInstanceAdminConnection( - ConnectionOptions const& options); - -/** - * Returns an InstanceAdminConnection object that can be used for interacting - * with Cloud Spanner's admin APIs. - * - * The returned connection object should not be used directly, rather it should - * be given to a `InstanceAdminClient` instance. - * - * @note Prefer using the `MakeInstanceAdminConnection()` overload that accepts - * `google::cloud::Options`. - * - * @param options configure the `InstanceAdminConnection` created by this - * function. - * @param retry_policy control for how long (or how many times) are retryable - * RPCs attempted - * @param backoff_policy controls the backoff behavior between retry attempts, - * typically some form of exponential backoff with jitter - * @param polling_policy controls for how often, and how quickly, are long - * running checked for completion - * - * @par Example - * @snippet samples.cc custom-instance-admin-policies - */ -GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED("MakeInstanceAdminConnection()") -std::shared_ptr MakeInstanceAdminConnection( - ConnectionOptions const& options, std::unique_ptr retry_policy, - std::unique_ptr backoff_policy, - std::unique_ptr polling_policy); - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner - -namespace spanner_internal { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/// Internal-only factory that allows us to inject mock stubs for testing. -std::shared_ptr -MakeInstanceAdminConnectionForTesting( - std::shared_ptr base_stub, Options opts); - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner_internal - -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_INSTANCE_ADMIN_CONNECTION_H diff --git a/google/cloud/spanner/instance_admin_connection_test.cc b/google/cloud/spanner/instance_admin_connection_test.cc deleted file mode 100644 index b347b06734159..0000000000000 --- a/google/cloud/spanner/instance_admin_connection_test.cc +++ /dev/null @@ -1,732 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/instance_admin_connection.h" -#include "google/cloud/spanner/create_instance_request_builder.h" -#include "google/cloud/spanner/internal/defaults.h" -#include "google/cloud/spanner/options.h" -#include "google/cloud/spanner/testing/mock_instance_admin_stub.h" -#include "google/cloud/testing_util/is_proto_equal.h" -#include "google/cloud/testing_util/status_matchers.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -namespace gsai = ::google::spanner::admin::instance; - -using ::google::cloud::testing_util::IsProtoEqual; -using ::google::cloud::testing_util::StatusIs; -using ::google::protobuf::TextFormat; -using ::testing::AtLeast; -using ::testing::ElementsAre; -using ::testing::Return; - -// Create a `Connection` suitable for use in tests that continue retrying -// until the retry policy is exhausted - attempting that with the default -// policies would take too long (30 minutes). -// Other tests can use this method or just call `MakeInstanceAdminConnection()` -// directly. -std::shared_ptr MakeLimitedRetryConnection( - std::shared_ptr mock) { - LimitedErrorCountRetryPolicy retry(/*maximum_failures=*/2); - ExponentialBackoffPolicy backoff( - /*initial_delay=*/std::chrono::microseconds(1), - /*maximum_delay=*/std::chrono::microseconds(1), - /*scaling=*/2.0); - GenericPollingPolicy polling(retry, backoff); - Options opts; - opts.set(retry.clone()); - opts.set(backoff.clone()); - opts.set(polling.clone()); - return spanner_internal::MakeInstanceAdminConnectionForTesting( - std::move(mock), std::move(opts)); -} - -TEST(InstanceAdminConnectionTest, GetInstanceSuccess) { - std::string const expected_name = - "projects/test-project/instances/test-instance"; - - auto constexpr kInstanceText = R"pb( - name: "projects/test-project/instances/test-instance" - config: "test-config" - display_name: "test display name" - node_count: 7 - state: CREATING - create_time { seconds: 1657025805 nanos: 967908745 } - update_time { seconds: 1657025805 nanos: 967908745 } - )pb"; - gsai::v1::Instance expected_instance; - ASSERT_TRUE(TextFormat::ParseFromString(kInstanceText, &expected_instance)); - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstance) - .WillOnce([&expected_name](grpc::ClientContext&, - gsai::v1::GetInstanceRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&expected_name, &expected_instance]( - grpc::ClientContext&, - gsai::v1::GetInstanceRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return expected_instance; - }); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetInstance({expected_name}); - EXPECT_THAT(*actual, IsProtoEqual(expected_instance)); -} - -TEST(InstanceAdminConnectionTest, GetInstancePermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstance) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetInstance({"test-name"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, GetInstanceTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstance) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetInstance({"test-name"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminClientTest, CreateInstanceSuccess) { - auto mock = std::make_shared(); - std::string const expected_name = - "projects/test-project/instances/test-instance"; - - EXPECT_CALL(*mock, AsyncCreateInstance) - .WillOnce([&expected_name](CompletionQueue&, auto, - gsai::v1::CreateInstanceRequest const& r) { - EXPECT_EQ("test-instance", r.instance_id()); - EXPECT_EQ("projects/test-project", r.parent()); - auto const& instance = r.instance(); - EXPECT_EQ(expected_name, instance.name()); - EXPECT_EQ("test-instance-config", instance.config()); - EXPECT_EQ("test-display-name", instance.display_name()); - auto const& labels = instance.labels(); - EXPECT_EQ(1, labels.count("key")); - EXPECT_EQ("value", labels.at("key")); - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(op)); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce( - [&expected_name](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsai::v1::Instance instance; - instance.set_name(expected_name); - op.mutable_response()->PackFrom(instance); - return make_ready_future(make_status_or(op)); - }); - - auto conn = MakeLimitedRetryConnection(std::move(mock)); - Instance in("test-project", "test-instance"); - auto fut = conn->CreateInstance( - {CreateInstanceRequestBuilder(in, "test-instance-config") - .SetDisplayName("test-display-name") - .SetNodeCount(1) - .SetLabels({{"key", "value"}}) - .Build()}); - auto instance = fut.get(); - ASSERT_STATUS_OK(instance); - - EXPECT_EQ(expected_name, instance->name()); -} - -TEST(InstanceAdminClientTest, CreateInstanceError) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncCreateInstance) - .WillOnce( - [](CompletionQueue&, auto, gsai::v1::CreateInstanceRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh"))); - }); - - auto conn = MakeLimitedRetryConnection(std::move(mock)); - Instance in("test-project", "test-instance"); - auto fut = conn->CreateInstance( - {CreateInstanceRequestBuilder(in, "test-instance-config") - .SetDisplayName("test-display-name") - .SetNodeCount(1) - .SetLabels({{"key", "value"}}) - .Build()}); - auto instance = fut.get(); - EXPECT_THAT(instance, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, UpdateInstanceSuccess) { - auto mock = std::make_shared(); - std::string expected_name = "projects/test-project/instances/test-instance"; - - EXPECT_CALL(*mock, AsyncUpdateInstance) - .WillOnce( - [](CompletionQueue&, auto, gsai::v1::UpdateInstanceRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kUnavailable, "try-again"))); - }) - .WillOnce([&expected_name](CompletionQueue&, auto, - gsai::v1::UpdateInstanceRequest const& r) { - EXPECT_EQ(expected_name, r.instance().name()); - google::longrunning::Operation op; - op.set_name("test-operation-name"); - op.set_done(false); - return make_ready_future(make_status_or(op)); - }); - EXPECT_CALL(*mock, AsyncGetOperation) - .WillOnce( - [&expected_name](CompletionQueue&, auto, - google::longrunning::GetOperationRequest const& r) { - EXPECT_EQ("test-operation-name", r.name()); - google::longrunning::Operation op; - op.set_name(r.name()); - op.set_done(true); - gsai::v1::Instance instance; - instance.set_name(expected_name); - op.mutable_response()->PackFrom(instance); - return make_ready_future(make_status_or(op)); - }); - - auto conn = MakeLimitedRetryConnection(std::move(mock)); - gsai::v1::UpdateInstanceRequest req; - req.mutable_instance()->set_name(expected_name); - auto fut = conn->UpdateInstance({req}); - auto instance = fut.get(); - ASSERT_STATUS_OK(instance); - - EXPECT_EQ(expected_name, instance->name()); -} - -TEST(InstanceAdminClientTest, UpdateInstancePermanentFailure) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncUpdateInstance) - .WillOnce( - [](CompletionQueue&, auto, gsai::v1::UpdateInstanceRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kPermissionDenied, "uh-oh"))); - }); - - auto conn = MakeLimitedRetryConnection(std::move(mock)); - auto fut = conn->UpdateInstance({gsai::v1::UpdateInstanceRequest()}); - auto instance = fut.get(); - EXPECT_THAT(instance, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminClientTest, UpdateInstanceTooManyTransients) { - auto mock = std::make_shared(); - - EXPECT_CALL(*mock, AsyncUpdateInstance) - .Times(AtLeast(2)) - .WillRepeatedly( - [](CompletionQueue&, auto, gsai::v1::UpdateInstanceRequest const&) { - return make_ready_future(StatusOr( - Status(StatusCode::kUnavailable, "try-again"))); - }); - auto conn = MakeLimitedRetryConnection(std::move(mock)); - auto fut = conn->UpdateInstance({gsai::v1::UpdateInstanceRequest()}); - auto instance = fut.get(); - EXPECT_THAT(instance, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, DeleteInstanceSuccess) { - std::string const expected_name = - "projects/test-project/instances/test-instance"; - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DeleteInstance) - .WillOnce( - [&expected_name](grpc::ClientContext&, - gsai::v1::DeleteInstanceRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce( - [&expected_name](grpc::ClientContext&, - gsai::v1::DeleteInstanceRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return Status(); - }); - - auto conn = MakeLimitedRetryConnection(mock); - auto status = conn->DeleteInstance({expected_name}); - EXPECT_STATUS_OK(status); -} - -TEST(InstanceAdminConnectionTest, DeleteInstancePermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DeleteInstance) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto status = conn->DeleteInstance({"test-name"}); - EXPECT_THAT(status, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, DeleteInstanceTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, DeleteInstance) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto status = conn->DeleteInstance({"test-name"}); - EXPECT_THAT(status, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, GetInstanceConfigSuccess) { - std::string const expected_name = - "projects/test-project/instanceConfigs/test-instance-config"; - auto constexpr kConfigText = R"pb( - name: "projects/test-project/instanceConfigs/test-instance-config" - display_name: "test display name" - replicas { - location: "location" - type: READ_WRITE - default_leader_location: true - } - leader_options: "location" - )pb"; - gsai::v1::InstanceConfig expected_instance_config; - ASSERT_TRUE( - TextFormat::ParseFromString(kConfigText, &expected_instance_config)); - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstanceConfig) - .WillOnce( - [&expected_name](grpc::ClientContext&, - gsai::v1::GetInstanceConfigRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&expected_name, &expected_instance_config]( - grpc::ClientContext&, - gsai::v1::GetInstanceConfigRequest const& request) { - EXPECT_EQ(expected_name, request.name()); - return expected_instance_config; - }); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetInstanceConfig({expected_name}); - EXPECT_THAT(*actual, IsProtoEqual(expected_instance_config)); -} - -TEST(InstanceAdminConnectionTest, GetInstanceConfigPermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstanceConfig) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = - conn->GetInstanceConfig({"projects/test/instanceConfig/test-name"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, GetInstanceConfigTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetInstanceConfig) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = - conn->GetInstanceConfig({"projects/test/instanceConfig/test-name"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, ListInstanceConfigsSuccess) { - constexpr char const* kInstanceConfigText[3] = { - R"pb( - name: "projects/test-project/instanceConfigs/test-instance-config-1" - display_name: "test display name 1" - replicas { - location: "location1" - type: READ_WRITE - default_leader_location: true - } - leader_options: "location1" - )pb", - R"pb( - name: "projects/test-project/instanceConfigs/test-instance-config-2" - display_name: "test display name 2" - replicas { - location: "location2" - type: READ_WRITE - default_leader_location: true - } - leader_options: "location2" - )pb", - R"pb( - name: "projects/test-project/instanceConfigs/test-instance-config-3" - display_name: "test display name 3" - replicas { - location: "location3" - type: READ_WRITE - default_leader_location: true - } - leader_options: "location3" - )pb", - }; - gsai::v1::InstanceConfig expected_instance_configs[3]; - ASSERT_TRUE(TextFormat::ParseFromString(kInstanceConfigText[0], - &expected_instance_configs[0])); - ASSERT_TRUE(TextFormat::ParseFromString(kInstanceConfigText[1], - &expected_instance_configs[1])); - ASSERT_TRUE(TextFormat::ParseFromString(kInstanceConfigText[2], - &expected_instance_configs[2])); - - std::string const expected_parent = "projects/test-project"; - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstanceConfigs) - .WillOnce([&](grpc::ClientContext&, - gsai::v1::ListInstanceConfigsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_TRUE(request.page_token().empty()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&](grpc::ClientContext&, - gsai::v1::ListInstanceConfigsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_TRUE(request.page_token().empty()); - - gsai::v1::ListInstanceConfigsResponse response; - response.set_next_page_token("p1"); - *response.add_instance_configs() = expected_instance_configs[0]; - *response.add_instance_configs() = expected_instance_configs[1]; - return response; - }) - .WillOnce([&](grpc::ClientContext&, - gsai::v1::ListInstanceConfigsRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("p1", request.page_token()); - - gsai::v1::ListInstanceConfigsResponse response; - response.clear_next_page_token(); - *response.add_instance_configs() = expected_instance_configs[2]; - return response; - }); - - auto conn = MakeLimitedRetryConnection(mock); - std::vector actual_instance_configs; - for (auto const& instance_config : - conn->ListInstanceConfigs({"test-project"})) { - ASSERT_STATUS_OK(instance_config); - actual_instance_configs.push_back(*instance_config); - } - EXPECT_THAT(actual_instance_configs, - ElementsAre(IsProtoEqual(expected_instance_configs[0]), - IsProtoEqual(expected_instance_configs[1]), - IsProtoEqual(expected_instance_configs[2]))); -} - -TEST(InstanceAdminConnectionTest, ListInstanceConfigsPermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstanceConfigs) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto range = conn->ListInstanceConfigs({"test-project"}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, ListInstanceConfigsTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstanceConfigs) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto range = conn->ListInstanceConfigs({"test-project"}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, ListInstancesSuccess) { - std::string const expected_parent = "projects/test-project"; - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstances) - .WillOnce([&](grpc::ClientContext&, - gsai::v1::ListInstancesRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("labels.test-key:test-value", request.filter()); - EXPECT_TRUE(request.page_token().empty()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&](grpc::ClientContext&, - gsai::v1::ListInstancesRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("labels.test-key:test-value", request.filter()); - EXPECT_TRUE(request.page_token().empty()); - - gsai::v1::ListInstancesResponse response; - response.set_next_page_token("p1"); - response.add_instances()->set_name("i1"); - response.add_instances()->set_name("i2"); - return response; - }) - .WillOnce([&](grpc::ClientContext&, - gsai::v1::ListInstancesRequest const& request) { - EXPECT_EQ(expected_parent, request.parent()); - EXPECT_EQ("labels.test-key:test-value", request.filter()); - EXPECT_EQ("p1", request.page_token()); - - gsai::v1::ListInstancesResponse response; - response.clear_next_page_token(); - response.add_instances()->set_name("i3"); - return response; - }); - - auto conn = MakeLimitedRetryConnection(mock); - std::vector actual_names; - for (auto const& instance : - conn->ListInstances({"test-project", "labels.test-key:test-value"})) { - ASSERT_STATUS_OK(instance); - actual_names.push_back(instance->name()); - } - EXPECT_THAT(actual_names, ElementsAre("i1", "i2", "i3")); -} - -TEST(InstanceAdminConnectionTest, ListInstancesPermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstances) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto range = conn->ListInstances({"test-project", ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, ListInstancesTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListInstances) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto range = conn->ListInstances({"test-project", ""}); - auto begin = range.begin(); - ASSERT_NE(begin, range.end()); - EXPECT_THAT(*begin, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, GetIamPolicySuccess) { - std::string const expected_name = - "projects/test-project/instances/test-instance"; - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce([&expected_name]( - grpc::ClientContext&, - google::iam::v1::GetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&expected_name]( - grpc::ClientContext&, - google::iam::v1::GetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - google::iam::v1::Policy response; - auto& binding = *response.add_bindings(); - binding.set_role("roles/spanner.databaseReader"); - binding.add_members("user:test-account@example.com"); - return response; - }); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetIamPolicy({expected_name}); - ASSERT_STATUS_OK(actual); - ASSERT_EQ(1, actual->bindings_size()); - EXPECT_EQ("roles/spanner.databaseReader", actual->bindings(0).role()); - ASSERT_EQ(1, actual->bindings(0).members_size()); - ASSERT_EQ("user:test-account@example.com", actual->bindings(0).members(0)); -} - -TEST(InstanceAdminConnectionTest, GetIamPolicyPermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetIamPolicy({"test-instance-name"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, GetIamPolicyTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, GetIamPolicy) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->GetIamPolicy({"test-instance-name"}); - EXPECT_THAT(actual, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, SetIamPolicySuccess) { - std::string const expected_name = - "projects/test-project/instances/test-instance"; - - auto constexpr kPolicyText = R"pb( - etag: "request-etag" - bindings { - role: "roles/spanner.databaseReader" - members: "user:test-user-1@example.com" - members: "user:test-user-2@example.com" - } - )pb"; - google::iam::v1::Policy expected_policy; - ASSERT_TRUE(TextFormat::ParseFromString(kPolicyText, &expected_policy)); - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce([&expected_name]( - grpc::ClientContext&, - google::iam::v1::SetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&expected_name, &expected_policy]( - grpc::ClientContext&, - google::iam::v1::SetIamPolicyRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - EXPECT_THAT(request.policy(), IsProtoEqual(expected_policy)); - google::iam::v1::Policy response = expected_policy; - response.set_etag("response-etag"); - return response; - }); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->SetIamPolicy({expected_name, expected_policy}); - ASSERT_STATUS_OK(actual); - expected_policy.set_etag("response-etag"); - EXPECT_THAT(*actual, IsProtoEqual(expected_policy)); -} - -TEST(InstanceAdminConnectionTest, SetIamPolicyPermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->SetIamPolicy({"test-instance-name", {}}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, SetIamPolicyNonIdempotent) { - auto mock = std::make_shared(); - // If the Etag field is not set, then the RPC is not idempotent and should - // fail on the first transient error. - EXPECT_CALL(*mock, SetIamPolicy) - .WillOnce(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - google::iam::v1::Policy policy; - auto actual = conn->SetIamPolicy({"test-instance-name", policy}); - EXPECT_THAT(actual, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, SetIamPolicyIdempotent) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, SetIamPolicy) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - google::iam::v1::Policy policy; - policy.set_etag("test-etag-value"); - auto actual = conn->SetIamPolicy({"test-instance-name", policy}); - EXPECT_THAT(actual, StatusIs(StatusCode::kUnavailable)); -} - -TEST(InstanceAdminConnectionTest, TestIamPermissionsSuccess) { - std::string const expected_name = - "projects/test-project/instances/test-instance"; - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, TestIamPermissions) - .WillOnce([&expected_name]( - grpc::ClientContext&, - google::iam::v1::TestIamPermissionsRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - return Status(StatusCode::kUnavailable, "try-again"); - }) - .WillOnce([&expected_name]( - grpc::ClientContext&, - google::iam::v1::TestIamPermissionsRequest const& request) { - EXPECT_EQ(expected_name, request.resource()); - google::iam::v1::TestIamPermissionsResponse response; - response.add_permissions("test.permission2"); - return response; - }); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = conn->TestIamPermissions( - {expected_name, {"test.permission1", "test.permission2"}}); - ASSERT_STATUS_OK(actual); - ASSERT_EQ(1, actual->permissions_size()); - ASSERT_EQ("test.permission2", actual->permissions(0)); -} - -TEST(InstanceAdminConnectionTest, TestIamPermissionsPermanentFailure) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, TestIamPermissions) - .WillOnce(Return(Status(StatusCode::kPermissionDenied, "uh-oh"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = - conn->TestIamPermissions({"test-instance-name", {"test.permission"}}); - EXPECT_THAT(actual, StatusIs(StatusCode::kPermissionDenied)); -} - -TEST(InstanceAdminConnectionTest, TestIamPermissionsTooManyTransients) { - auto mock = std::make_shared(); - EXPECT_CALL(*mock, TestIamPermissions) - .Times(AtLeast(2)) - .WillRepeatedly(Return(Status(StatusCode::kUnavailable, "try-again"))); - - auto conn = MakeLimitedRetryConnection(mock); - auto actual = - conn->TestIamPermissions({"test-instance-name", {"test.permission"}}); - EXPECT_THAT(actual, StatusIs(StatusCode::kUnavailable)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/integration_tests/BUILD.bazel b/google/cloud/spanner/integration_tests/BUILD.bazel index 08b790694d194..e557dbe258475 100644 --- a/google/cloud/spanner/integration_tests/BUILD.bazel +++ b/google/cloud/spanner/integration_tests/BUILD.bazel @@ -33,9 +33,8 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", "//protos/google/cloud/spanner/testing:singer_cc_proto", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_client_integration_tests] @@ -60,8 +59,7 @@ VARIATIONS = { "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", "//protos/google/cloud/spanner/testing:singer_cc_proto", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_client_session_mode_sensitive_integration_tests for v_label, v_env in VARIATIONS.items()] diff --git a/google/cloud/spanner/integration_tests/CMakeLists.txt b/google/cloud/spanner/integration_tests/CMakeLists.txt index 04705b73893af..720c157905f02 100644 --- a/google/cloud/spanner/integration_tests/CMakeLists.txt +++ b/google/cloud/spanner/integration_tests/CMakeLists.txt @@ -23,12 +23,7 @@ function (spanner_client_define_integration_tests) set(spanner_client_integration_tests # cmake-format: sort - backup_extra_integration_test.cc - backup_integration_test.cc - client_stress_test.cc - data_types_integration_test.cc - database_admin_integration_test.cc - instance_admin_integration_test.cc + client_stress_test.cc data_types_integration_test.cc session_pool_integration_test.cc) set(spanner_client_session_mode_sensitive_integration_tests diff --git a/google/cloud/spanner/integration_tests/backup_extra_integration_test.cc b/google/cloud/spanner/integration_tests/backup_extra_integration_test.cc deleted file mode 100644 index 260b507641dee..0000000000000 --- a/google/cloud/spanner/integration_tests/backup_extra_integration_test.cc +++ /dev/null @@ -1,445 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/client.h" -#include "google/cloud/spanner/database_admin_client.h" -#include "google/cloud/spanner/instance_admin_client.h" -#include "google/cloud/spanner/testing/instance_location.h" -#include "google/cloud/spanner/testing/pick_random_instance.h" -#include "google/cloud/spanner/testing/random_database_name.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/internal/absl_str_cat_quiet.h" -#include "google/cloud/internal/getenv.h" -#include "google/cloud/internal/random.h" -#include "google/cloud/testing_util/integration_test.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/strings/match.h" -#include "absl/time/time.h" -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::cloud::testing_util::IsOk; -using ::google::cloud::testing_util::StatusIs; -using ::testing::HasSubstr; -using ::testing::IsEmpty; -using ::testing::Not; - -// Constants used to identify the encryption key. -auto constexpr kKeyRing = "spanner-cmek"; -auto constexpr kKeyName = "spanner-cmek-test-key"; - -std::string const& ProjectId() { - static std::string project_id = - google::cloud::internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or(""); - return project_id; -} - -bool RunSlowBackupTests() { - static bool run_slow_backup_tests = - absl::StrContains(google::cloud::internal::GetEnv( - "GOOGLE_CLOUD_CPP_SPANNER_SLOW_INTEGRATION_TESTS") - .value_or(""), - "backup"); - return run_slow_backup_tests; -} - -bool Emulator() { - static bool emulator = - google::cloud::internal::GetEnv("SPANNER_EMULATOR_HOST").has_value(); - return emulator; -} - -class BackupExtraIntegrationTest - : public ::google::cloud::testing_util::IntegrationTest { - public: - BackupExtraIntegrationTest() - : generator_(google::cloud::internal::MakeDefaultPRNG()), - database_admin_client_(MakeDatabaseAdminConnection( - ConnectionOptions{}, - LimitedTimeRetryPolicy(std::chrono::minutes(60)).clone(), - ExponentialBackoffPolicy(std::chrono::seconds(1), - std::chrono::minutes(1), 2.0) - .clone(), - GenericPollingPolicy<>( - LimitedTimeRetryPolicy(std::chrono::minutes(90)), - ExponentialBackoffPolicy(std::chrono::seconds(1), - std::chrono::minutes(1), 2.0)) - .clone())) {} - - protected: - google::cloud::internal::DefaultPRNG generator_; - DatabaseAdminClient database_admin_client_; -}; - -/// @test Verify creating/restoring a backup with a valid version_time. -TEST_F(BackupExtraIntegrationTest, BackupRestoreWithVersionTime) { - if (!RunSlowBackupTests()) GTEST_SKIP(); - - auto instance_id = spanner_testing::PickRandomInstance( - generator_, ProjectId(), - "(labels.restore-database-partition:legacy-extra OR" - " labels.restore-database-partition:all)"); - ASSERT_THAT(instance_id, IsOk()); - Instance in(ProjectId(), *instance_id); - Database db(in, spanner_testing::RandomDatabaseName(generator_)); - - std::vector extra_statements = { - absl::StrCat("ALTER DATABASE `", db.database_id(), - "` SET OPTIONS (version_retention_period='1h')"), - "CREATE TABLE Counters (" - " Name STRING(64) NOT NULL," - " Value INT64 NOT NULL" - ") PRIMARY KEY (Name)"}; - auto database = - database_admin_client_.CreateDatabase(db, extra_statements).get(); - if (Emulator()) { // version_retention_period - EXPECT_THAT(database, Not(IsOk())); - return; - } - ASSERT_THAT(database, IsOk()); - auto create_time = - MakeTimestamp(database->create_time()).value().get().value(); - - std::string const version_key = "version"; - std::vector version_times; - { - spanner::Client client(spanner::MakeConnection(db)); - auto commit = client.Commit(spanner::Mutations{ - spanner::InsertMutationBuilder("Counters", {"Name", "Value"}) - .EmplaceRow(version_key, 0) // the version we'll backup/restore - .Build()}); - EXPECT_STATUS_OK(commit); - if (commit) { - // version_times[0]: when Counters[version_key] == 0 - version_times.push_back(commit->commit_timestamp); - commit = client.Commit(spanner::Mutations{ - spanner::UpdateMutationBuilder("Counters", {"Name", "Value"}) - .EmplaceRow(version_key, 1) // latest version - .Build()}); - EXPECT_STATUS_OK(commit); - if (commit) { - // version_times[1]: when Counters[version_key] == 1 - version_times.push_back(commit->commit_timestamp); - } - } - } - - if (version_times.size() == 2) { - EXPECT_LT(MakeTimestamp(create_time).value(), version_times[0]); - EXPECT_LT(version_times[0], version_times[1]); - // Create a backup when Counters[version_key] == 0. - auto version_time = version_times[0]; - auto expire_time = MakeTimestamp(create_time + absl::Hours(12)).value(); - auto backup = - database_admin_client_ - .CreateBackup(db, db.database_id(), expire_time, version_time) - .get(); - EXPECT_THAT(backup, IsOk()); - if (backup) { - EXPECT_EQ(MakeTimestamp(backup->expire_time()).value(), expire_time); - EXPECT_EQ(MakeTimestamp(backup->version_time()).value(), version_time); - EXPECT_GT(MakeTimestamp(backup->create_time()).value(), version_time); - - Database rdb(in, spanner_testing::RandomDatabaseName(generator_)); - auto restored = - database_admin_client_.RestoreDatabase(rdb, *backup).get(); - EXPECT_THAT(restored, IsOk()); - if (restored) { - auto const& restore_info = restored->restore_info(); - EXPECT_EQ(restore_info.source_type(), - google::spanner::admin::database::v1::BACKUP); - if (restore_info.source_type() == - google::spanner::admin::database::v1::BACKUP) { - auto const& backup_info = restore_info.backup_info(); - EXPECT_EQ(backup_info.backup(), backup->name()); - EXPECT_EQ(MakeTimestamp(backup_info.version_time()).value(), - version_time); - EXPECT_LT(MakeTimestamp(backup_info.version_time()).value(), - MakeTimestamp(backup_info.create_time()).value()); - EXPECT_EQ(backup_info.source_database(), db.FullName()); - } - auto database = database_admin_client_.GetDatabase(rdb); - EXPECT_THAT(database, IsOk()); - if (database) { - auto const& restore_info = database->restore_info(); - EXPECT_EQ(restore_info.source_type(), - google::spanner::admin::database::v1::BACKUP); - if (restore_info.source_type() == - google::spanner::admin::database::v1::BACKUP) { - auto const& backup_info = restore_info.backup_info(); - EXPECT_EQ(MakeTimestamp(backup_info.version_time()).value(), - version_time); - } - } - bool found_restored = false; - for (auto const& database : database_admin_client_.ListDatabases(in)) { - EXPECT_THAT(database, IsOk()); - if (!database) continue; - if (database->name() == rdb.FullName()) { - EXPECT_FALSE(found_restored); - found_restored = true; - auto const& restore_info = database->restore_info(); - EXPECT_EQ(restore_info.source_type(), - google::spanner::admin::database::v1::BACKUP); - if (restore_info.source_type() == - google::spanner::admin::database::v1::BACKUP) { - auto const& backup_info = restore_info.backup_info(); - EXPECT_EQ(MakeTimestamp(backup_info.version_time()).value(), - version_time); - } - } - } - EXPECT_TRUE(found_restored); - { - spanner::Client client(spanner::MakeConnection(rdb)); - auto keys = spanner::KeySet().AddKey(spanner::MakeKey(version_key)); - auto rows = client.Read("Counters", std::move(keys), {"Value"}); - using RowType = std::tuple; - auto row = spanner::GetSingularRow(spanner::StreamOf(rows)); - EXPECT_THAT(row, IsOk()); - if (row) { - // Expect to see the state of the table at version_time. - EXPECT_EQ(std::get<0>(*std::move(row)), 0); - } - } - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(rdb)); - } - - EXPECT_STATUS_OK(database_admin_client_.DeleteBackup(*backup)); - } - } - - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(db)); -} - -/// @test Verify creating a backup with an expired version_time fails. -TEST_F(BackupExtraIntegrationTest, BackupWithExpiredVersionTime) { - auto instance_id = spanner_testing::PickRandomInstance( - generator_, ProjectId(), "NOT labels.edition:enterprise"); - ASSERT_THAT(instance_id, IsOk()); - Instance in(ProjectId(), *instance_id); - Database db(in, spanner_testing::RandomDatabaseName(generator_)); - - std::vector extra_statements = { - absl::StrCat("ALTER DATABASE `", db.database_id(), - "` SET OPTIONS (version_retention_period='1h')")}; - auto database = - database_admin_client_.CreateDatabase(db, extra_statements).get(); - if (Emulator()) { // version_retention_period - EXPECT_THAT(database, Not(IsOk())); - return; - } - ASSERT_THAT(database, IsOk()); - - auto create_time = - MakeTimestamp(database->create_time()).value().get().value(); - // version_time too far in the past (outside the version_retention_period). - auto version_time = MakeTimestamp(create_time - absl::Hours(2)).value(); - auto expire_time = MakeTimestamp(create_time + absl::Hours(12)).value(); - auto backup = - database_admin_client_ - .CreateBackup(db, db.database_id(), expire_time, version_time) - .get(); - EXPECT_THAT(backup, StatusIs(StatusCode::kInvalidArgument, - HasSubstr("earlier than the creation time"))); - if (backup) { - EXPECT_STATUS_OK(database_admin_client_.DeleteBackup(*backup)); - } - - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(db)); -} - -/// @test Verify creating a backup with a future version_time fails. -TEST_F(BackupExtraIntegrationTest, BackupWithFutureVersionTime) { - auto instance_id = spanner_testing::PickRandomInstance( - generator_, ProjectId(), "NOT labels.edition:enterprise"); - ASSERT_THAT(instance_id, IsOk()); - Instance in(ProjectId(), *instance_id); - Database db(in, spanner_testing::RandomDatabaseName(generator_)); - - std::vector extra_statements = { - absl::StrCat("ALTER DATABASE `", db.database_id(), - "` SET OPTIONS (version_retention_period='1h')")}; - auto database = - database_admin_client_.CreateDatabase(db, extra_statements).get(); - if (Emulator()) { // version_retention_period - EXPECT_THAT(database, Not(IsOk())); - return; - } - ASSERT_THAT(database, IsOk()); - - auto create_time = - MakeTimestamp(database->create_time()).value().get().value(); - // version_time in the future. - auto version_time = MakeTimestamp(create_time + absl::Hours(2)).value(); - auto expire_time = MakeTimestamp(create_time + absl::Hours(12)).value(); - auto backup = - database_admin_client_ - .CreateBackup(db, db.database_id(), expire_time, version_time) - .get(); - EXPECT_THAT(backup, StatusIs(StatusCode::kInvalidArgument, - HasSubstr("with a future version time"))); - if (backup) { - EXPECT_STATUS_OK(database_admin_client_.DeleteBackup(*backup)); - } - - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(db)); -} - -/// @test Tests backup/restore with Customer Managed Encryption Key -TEST_F(BackupExtraIntegrationTest, BackupRestoreWithCMEK) { - if (!RunSlowBackupTests() || Emulator()) GTEST_SKIP(); - - auto instance_id = spanner_testing::PickRandomInstance( - generator_, ProjectId(), - "(labels.restore-database-partition:legacy-extra OR" - " labels.restore-database-partition:all)" - " AND NOT name:/instances/test-instance-mr-"); - ASSERT_STATUS_OK(instance_id); - Instance in(ProjectId(), *instance_id); - - auto location = spanner_testing::InstanceLocation(in); - ASSERT_STATUS_OK(location); - KmsKeyName encryption_key(in.project_id(), *location, kKeyRing, kKeyName); - auto encryption_config = CustomerManagedEncryption(encryption_key); - - Database db(in, spanner_testing::RandomDatabaseName(generator_)); - auto database = - database_admin_client_ - .CreateDatabase(db, /*extra_statements=*/{}, encryption_config) - .get(); - ASSERT_STATUS_OK(database); - EXPECT_TRUE(database->has_encryption_config()); - if (database->has_encryption_config()) { - EXPECT_EQ(database->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - EXPECT_THAT(database->encryption_info(), IsEmpty()); - - auto database_get = database_admin_client_.GetDatabase(db); - ASSERT_STATUS_OK(database_get); - EXPECT_EQ(database_get->name(), database->name()); - EXPECT_TRUE(database_get->has_encryption_config()); - if (database_get->has_encryption_config()) { - EXPECT_EQ(database_get->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - - auto create_time = - MakeTimestamp(database->create_time()).value().get().value(); - auto expire_time = MakeTimestamp(create_time + absl::Hours(12)).value(); - auto backup = database_admin_client_ - .CreateBackup(db, db.database_id(), expire_time, - absl::nullopt, encryption_config) - .get(); - { - // TODO(#8616): Remove this when we know how to deal with the issue. - auto matcher = testing_util::StatusIs( - StatusCode::kDeadlineExceeded, - testing::HasSubstr("terminated by polling policy")); - testing::StringMatchResultListener listener; - if (matcher.impl().MatchAndExplain(backup, &listener)) { - // The backup is still in progress (and may eventually complete), - // and we can't drop the database while it has pending backups, so - // we simply abandon them, to be cleaned up offline. - GTEST_SKIP(); - } - } - ASSERT_STATUS_OK(backup); - EXPECT_TRUE(backup->has_encryption_info()); - if (backup->has_encryption_info()) { - EXPECT_EQ(backup->encryption_info().encryption_type(), - google::spanner::admin::database::v1::EncryptionInfo:: - CUSTOMER_MANAGED_ENCRYPTION); - EXPECT_THAT(backup->encryption_info().kms_key_version(), - HasSubstr(encryption_key.FullName() + "/cryptoKeyVersions/")); - } - - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(db)); - - Backup backup_name(in, db.database_id()); - auto backup_get = database_admin_client_.GetBackup(backup_name); - ASSERT_STATUS_OK(backup_get); - EXPECT_EQ(backup_get->name(), backup->name()); - EXPECT_TRUE(backup_get->has_encryption_info()); - if (backup_get->has_encryption_info()) { - EXPECT_EQ(backup_get->encryption_info().encryption_type(), - google::spanner::admin::database::v1::EncryptionInfo:: - CUSTOMER_MANAGED_ENCRYPTION); - EXPECT_THAT(backup_get->encryption_info().kms_key_version(), - HasSubstr(encryption_key.FullName() + "/cryptoKeyVersions/")); - } - - Database restore_db(in, spanner_testing::RandomDatabaseName(generator_)); - auto restored_database = - database_admin_client_ - .RestoreDatabase(restore_db, backup_name, encryption_config) - .get(); - ASSERT_STATUS_OK(restored_database); - EXPECT_TRUE(restored_database->has_encryption_config()); - if (restored_database->has_encryption_config()) { - EXPECT_EQ(restored_database->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - - auto restored_get = database_admin_client_.GetDatabase(restore_db); - ASSERT_STATUS_OK(restored_get); - EXPECT_EQ(restored_get->name(), restored_database->name()); - EXPECT_TRUE(restored_get->has_encryption_config()); - if (restored_get->has_encryption_config()) { - EXPECT_EQ(restored_get->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(restore_db)); - - std::ostringstream backup_filter; - backup_filter << "expire_time <= \"" << expire_time << "\""; - bool found = false; - for (auto const& b : - database_admin_client_.ListBackups(in, backup_filter.str())) { - if (b->name() == backup->name()) { - found = true; - EXPECT_TRUE(b->has_encryption_info()); - if (b->has_encryption_info()) { - EXPECT_EQ(b->encryption_info().encryption_type(), - google::spanner::admin::database::v1::EncryptionInfo:: - CUSTOMER_MANAGED_ENCRYPTION); - EXPECT_THAT( - b->encryption_info().kms_key_version(), - HasSubstr(encryption_key.FullName() + "/cryptoKeyVersions/")); - } - } - } - EXPECT_TRUE(found); - - EXPECT_STATUS_OK(database_admin_client_.DeleteBackup(*backup)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/integration_tests/backup_integration_test.cc b/google/cloud/spanner/integration_tests/backup_integration_test.cc deleted file mode 100644 index 36c147417a22b..0000000000000 --- a/google/cloud/spanner/integration_tests/backup_integration_test.cc +++ /dev/null @@ -1,215 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/client.h" -#include "google/cloud/spanner/database_admin_client.h" -#include "google/cloud/spanner/instance_admin_client.h" -#include "google/cloud/spanner/testing/instance_location.h" -#include "google/cloud/spanner/testing/pick_random_instance.h" -#include "google/cloud/spanner/testing/random_database_name.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/internal/getenv.h" -#include "google/cloud/internal/random.h" -#include "google/cloud/testing_util/integration_test.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/strings/match.h" -#include "absl/time/time.h" -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -std::string const& ProjectId() { - static std::string project_id = - google::cloud::internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or(""); - return project_id; -} - -bool RunSlowBackupTests() { - static bool run_slow_backup_tests = - absl::StrContains(google::cloud::internal::GetEnv( - "GOOGLE_CLOUD_CPP_SPANNER_SLOW_INTEGRATION_TESTS") - .value_or(""), - "backup"); - return run_slow_backup_tests; -} - -bool Emulator() { - static bool emulator = - google::cloud::internal::GetEnv("SPANNER_EMULATOR_HOST").has_value(); - return emulator; -} - -class BackupIntegrationTest - : public ::google::cloud::testing_util::IntegrationTest { - public: - BackupIntegrationTest() - : generator_(google::cloud::internal::MakeDefaultPRNG()), - database_admin_client_(MakeDatabaseAdminConnection( - ConnectionOptions{}, - LimitedTimeRetryPolicy(std::chrono::minutes(60)).clone(), - ExponentialBackoffPolicy(std::chrono::seconds(1), - std::chrono::minutes(1), 2.0) - .clone(), - GenericPollingPolicy<>( - LimitedTimeRetryPolicy(std::chrono::minutes(90)), - ExponentialBackoffPolicy(std::chrono::seconds(1), - std::chrono::minutes(1), 2.0)) - .clone())) {} - - protected: - google::cloud::internal::DefaultPRNG generator_; - DatabaseAdminClient database_admin_client_; -}; - -/// @test Backup related integration tests. -TEST_F(BackupIntegrationTest, BackupRestore) { - if (!RunSlowBackupTests() || Emulator()) GTEST_SKIP(); - - auto instance_id = spanner_testing::PickRandomInstance( - generator_, ProjectId(), - "(labels.restore-database-partition:legacy-core OR" - " labels.restore-database-partition:all)"); - ASSERT_STATUS_OK(instance_id); - Instance in(ProjectId(), *instance_id); - Database db(in, spanner_testing::RandomDatabaseName(generator_)); - - auto database = database_admin_client_.CreateDatabase(db).get(); - ASSERT_STATUS_OK(database); - auto create_time = - MakeTimestamp(database->create_time()).value().get().value(); - - auto expire_time = MakeTimestamp(create_time + absl::Hours(12)).value(); - auto backup_future = - database_admin_client_.CreateBackup(db, db.database_id(), expire_time); - - // Cancel the CreateBackup operation. - backup_future.cancel(); - auto cancelled_backup = backup_future.get(); - if (cancelled_backup) { - EXPECT_STATUS_OK(database_admin_client_.DeleteBackup(*cancelled_backup)); - } - - // Then create a Backup without cancelling - backup_future = - database_admin_client_.CreateBackup(db, db.database_id(), expire_time); - - // List the backup operations - std::ostringstream backup_op_filter; - backup_op_filter << "(metadata.@type=type.googleapis.com/" - << "google.spanner.admin.database.v1.CreateBackupMetadata)" - << " AND (metadata.database=" << db.FullName() << ")"; - std::vector db_names; - for (auto const& operation : database_admin_client_.ListBackupOperations( - in, backup_op_filter.str())) { - if (!operation) break; - google::spanner::admin::database::v1::CreateBackupMetadata metadata; - operation->metadata().UnpackTo(&metadata); - db_names.push_back(metadata.database()); - } - EXPECT_LE(1, std::count(db_names.begin(), db_names.end(), database->name())) - << "Database " << database->name() - << " not found in the backup operation list."; - - auto backup = backup_future.get(); - { - // TODO(#8616): Remove this when we know how to deal with the issue. - auto matcher = testing_util::StatusIs( - StatusCode::kDeadlineExceeded, - testing::HasSubstr("terminated by polling policy")); - testing::StringMatchResultListener listener; - if (matcher.impl().MatchAndExplain(backup, &listener)) { - // The backup is still in progress (and may eventually complete), - // and we can't drop the database while it has pending backups, so - // we simply abandon them, to be cleaned up offline. - GTEST_SKIP(); - } - } - ASSERT_STATUS_OK(backup); - EXPECT_EQ(MakeTimestamp(backup->expire_time()).value(), expire_time); - // Verify that the version_time is the same as the creation_time. - EXPECT_EQ(MakeTimestamp(backup->version_time()).value(), - MakeTimestamp(backup->create_time()).value()); - - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(db)); - - Backup backup_name(in, db.database_id()); - auto backup_get = database_admin_client_.GetBackup(backup_name); - EXPECT_STATUS_OK(backup_get); - if (backup_get) { - EXPECT_EQ(backup_get->name(), backup->name()); - } - - Database restore_db(in, spanner_testing::RandomDatabaseName(generator_)); - auto restored_database = - database_admin_client_.RestoreDatabase(restore_db, backup_name).get(); - EXPECT_STATUS_OK(restored_database); - if (restored_database) { - // List the database operations - std::ostringstream db_op_filter; - db_op_filter - << "(metadata.@type:type.googleapis.com/" - << "google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata)"; - std::vector restored_db_names; - for (auto const& operation : database_admin_client_.ListDatabaseOperations( - in, db_op_filter.str())) { - if (!operation) break; - google::spanner::admin::database::v1::OptimizeRestoredDatabaseMetadata md; - operation->metadata().UnpackTo(&md); - restored_db_names.push_back(md.name()); - } - EXPECT_LE(1, std::count(restored_db_names.begin(), restored_db_names.end(), - restored_database->name())) - << "Backup " << restored_database->name() - << " not found in the OptimizeRestoredDatabase operation list."; - EXPECT_STATUS_OK(database_admin_client_.DropDatabase(restore_db)); - } - - std::ostringstream backup_filter; - backup_filter << "expire_time <= \"" << expire_time << "\""; - std::vector backup_names; - for (auto const& b : - database_admin_client_.ListBackups(in, backup_filter.str())) { - backup_names.push_back(b->name()); - } - EXPECT_LE( - 1, std::count(backup_names.begin(), backup_names.end(), backup->name())) - << "Backup " << backup->name() << " not found in the backup list."; - - auto new_expire_time = MakeTimestamp(create_time + absl::Hours(16)).value(); - auto updated_backup = - database_admin_client_.UpdateBackupExpireTime(*backup, new_expire_time); - EXPECT_STATUS_OK(updated_backup); - if (updated_backup) { - EXPECT_EQ(MakeTimestamp(updated_backup->expire_time()).value(), - new_expire_time); - } - - EXPECT_STATUS_OK(database_admin_client_.DeleteBackup(*backup)); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/integration_tests/client_integration_test.cc b/google/cloud/spanner/integration_tests/client_integration_test.cc index 29077292f756b..2c114ca56f18b 100644 --- a/google/cloud/spanner/integration_tests/client_integration_test.cc +++ b/google/cloud/spanner/integration_tests/client_integration_test.cc @@ -805,7 +805,10 @@ TEST_F(ClientIntegrationTest, ReadLockModeOptionIsSent) { auto tx_a_read_result = client_->Read( tx_a, "Singers", KeySet().AddKey(MakeKey(singer_id)), {"SingerId"}); for (auto const& row : StreamOf>(tx_a_read_result)) { - EXPECT_STATUS_OK(row); + EXPECT_THAT( + row, + AnyOf(IsOk(), StatusIs(StatusCode::kUnimplemented, + HasSubstr("Optimistic lock is not enabled")))); } tx_a = MakeReadWriteTransaction( tx_a, Transaction::ReadWriteOptions(read_lock_mode)); @@ -813,7 +816,10 @@ TEST_F(ClientIntegrationTest, ReadLockModeOptionIsSent) { auto optimistic_result = client_->Commit(tx_a, mutation_helper("SecondModifiedName")); - EXPECT_STATUS_OK(optimistic_result); + EXPECT_THAT( + optimistic_result, + AnyOf(IsOk(), StatusIs(StatusCode::kUnimplemented, + HasSubstr("Optimistic lock is not enabled")))); } /// @test Test ExecuteQuery() with bounded staleness set by a timestamp. diff --git a/google/cloud/spanner/integration_tests/data_types_integration_test.cc b/google/cloud/spanner/integration_tests/data_types_integration_test.cc index a873369e47cdc..0245dfa1a9e69 100644 --- a/google/cloud/spanner/integration_tests/data_types_integration_test.cc +++ b/google/cloud/spanner/integration_tests/data_types_integration_test.cc @@ -20,7 +20,7 @@ #include "google/cloud/spanner/timestamp.h" #include "google/cloud/testing_util/status_matchers.h" #include "absl/time/time.h" -#include +#include "protos/google/cloud/spanner/testing/singer.pb.h" #include #include #include diff --git a/google/cloud/spanner/integration_tests/database_admin_integration_test.cc b/google/cloud/spanner/integration_tests/database_admin_integration_test.cc deleted file mode 100644 index eef1afb441532..0000000000000 --- a/google/cloud/spanner/integration_tests/database_admin_integration_test.cc +++ /dev/null @@ -1,495 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/database.h" -#include "google/cloud/spanner/database_admin_client.h" -#include "google/cloud/spanner/testing/instance_location.h" -#include "google/cloud/spanner/testing/pick_random_instance.h" -#include "google/cloud/spanner/testing/random_database_name.h" -#include "google/cloud/spanner/timestamp.h" -#include "google/cloud/internal/absl_str_cat_quiet.h" -#include "google/cloud/internal/getenv.h" -#include "google/cloud/internal/random.h" -#include "google/cloud/testing_util/integration_test.h" -#include "google/cloud/testing_util/is_proto_equal.h" -#include "google/cloud/testing_util/status_matchers.h" -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::cloud::testing_util::IsOk; -using ::google::cloud::testing_util::IsProtoEqual; -using ::google::cloud::testing_util::StatusIs; -using ::testing::AllOf; -using ::testing::AnyOf; -using ::testing::Contains; -using ::testing::ContainsRegex; -using ::testing::EndsWith; -using ::testing::HasSubstr; -using ::testing::IsEmpty; -using ::testing::Not; -using ::testing::NotNull; - -// Constants used to identify the encryption key. -auto constexpr kKeyRing = "spanner-cmek"; -auto constexpr kKeyName = "spanner-cmek-test-key"; - -class DatabaseAdminClientTest - : public ::google::cloud::testing_util::IntegrationTest { - protected: - // We can't use ASSERT* in the constructor, so defer initializing `instance_` - // and `database_` until `SetUp()`. - DatabaseAdminClientTest() - : instance_("placeholder", "placeholder"), - database_(instance_, "placeholder") {} - - void SetUp() override { - using ::google::cloud::internal::GetEnv; - emulator_ = GetEnv("SPANNER_EMULATOR_HOST").has_value(); - auto project_id = GetEnv("GOOGLE_CLOUD_PROJECT").value_or(""); - ASSERT_FALSE(project_id.empty()); - - auto generator = google::cloud::internal::MakeDefaultPRNG(); - - auto instance_id = spanner_testing::PickRandomInstance( - generator, project_id, "NOT name:/instances/test-instance-mr-"); - ASSERT_STATUS_OK(instance_id); - instance_ = Instance(project_id, *instance_id); - - auto location = spanner_testing::InstanceLocation(instance_); - if (emulator_) { - if (!location) location = "emulator"; - } else { - ASSERT_STATUS_OK(location); - } - location_ = *std::move(location); - - database_ = - Database(instance_, spanner_testing::RandomDatabaseName(generator)); - - test_iam_service_account_ = - GetEnv("GOOGLE_CLOUD_CPP_SPANNER_TEST_SERVICE_ACCOUNT").value_or(""); - ASSERT_TRUE(emulator_ || !test_iam_service_account_.empty()); - } - - // Does `database_` exist in `instance_`? - bool DatabaseExists() { - auto full_name = database_.FullName(); - for (auto const& database : client_.ListDatabases(instance_)) { - EXPECT_STATUS_OK(database); - if (!database) break; - if (database->name() == full_name) return true; - } - return false; - }; - - Instance instance_; - std::string location_; - Database database_; - DatabaseAdminClient client_; - bool emulator_; - std::string test_iam_service_account_; -}; - -/// @test Verify the basic CRUD operations for databases work. -TEST_F(DatabaseAdminClientTest, DatabaseBasicCRUD) { - // We test Client::ListDatabases() by verifying that (a) it does not return - // a randomly generated database name before we create a database with that - // name, (b) it *does* return that database name once created, and (c) it no - // longer returns that name once the database is dropped. Implicitly that - // also tests that Client::DropDatabase() and client::CreateDatabase() do - // something, which is nice. - EXPECT_FALSE(DatabaseExists()) << "Database " << database_ - << " already exists, this is unexpected as " - "the database id is selected at random."; - - auto database = - client_.CreateDatabase(database_, /*extra_statements=*/{}).get(); - ASSERT_STATUS_OK(database); - EXPECT_THAT(database->name(), EndsWith(database_.database_id())); - EXPECT_FALSE(database->has_encryption_config()); - EXPECT_THAT(database->encryption_info(), IsEmpty()); - - auto get_result = client_.GetDatabase(database_); - ASSERT_STATUS_OK(get_result); - EXPECT_EQ(database->name(), get_result->name()); - EXPECT_FALSE(get_result->has_encryption_config()); - if (emulator_) { - EXPECT_THAT(get_result->encryption_info(), IsEmpty()); - } else { - EXPECT_EQ(get_result->encryption_info().size(), 1); - if (!get_result->encryption_info().empty()) { - EXPECT_EQ(get_result->encryption_info()[0].encryption_type(), - google::spanner::admin::database::v1::EncryptionInfo:: - GOOGLE_DEFAULT_ENCRYPTION); - } - } - - if (!emulator_) { - auto current_policy = client_.GetIamPolicy(database_); - ASSERT_STATUS_OK(current_policy); - EXPECT_EQ(0, current_policy->bindings_size()); - - std::string const reader_role = "roles/spanner.databaseReader"; - std::string const writer_role = "roles/spanner.databaseUser"; - std::string const expected_member = - "serviceAccount:" + test_iam_service_account_; - auto& binding = *current_policy->add_bindings(); - binding.set_role(reader_role); - *binding.add_members() = expected_member; - - auto updated_policy = client_.SetIamPolicy(database_, *current_policy); - ASSERT_THAT(updated_policy, AnyOf(IsOk(), StatusIs(StatusCode::kAborted))); - if (updated_policy) { - EXPECT_EQ(1, updated_policy->bindings_size()); - ASSERT_EQ(reader_role, updated_policy->bindings().Get(0).role()); - ASSERT_EQ(1, updated_policy->bindings().Get(0).members().size()); - ASSERT_EQ(expected_member, - updated_policy->bindings().Get(0).members().Get(0)); - } - - // Perform a different update using the OCC loop API: - updated_policy = client_.SetIamPolicy( - database_, [this, &writer_role](google::iam::v1::Policy current) { - std::string const expected_member = - "serviceAccount:" + test_iam_service_account_; - auto& binding = *current.add_bindings(); - binding.set_role(writer_role); - *binding.add_members() = expected_member; - return current; - }); - ASSERT_STATUS_OK(updated_policy); - EXPECT_EQ(2, updated_policy->bindings_size()); - ASSERT_EQ(writer_role, updated_policy->bindings().Get(1).role()); - ASSERT_EQ(1, updated_policy->bindings().Get(1).members().size()); - ASSERT_EQ(expected_member, - updated_policy->bindings().Get(1).members().Get(0)); - - // Fetch the Iam Policy again. - current_policy = client_.GetIamPolicy(database_); - ASSERT_STATUS_OK(current_policy); - EXPECT_THAT(*updated_policy, IsProtoEqual(*current_policy)); - - auto test_iam_permission_result = - client_.TestIamPermissions(database_, {"spanner.databases.read"}); - ASSERT_STATUS_OK(test_iam_permission_result); - ASSERT_EQ(1, test_iam_permission_result->permissions_size()); - ASSERT_EQ("spanner.databases.read", - test_iam_permission_result->permissions(0)); - } - - auto get_ddl_result = client_.GetDatabaseDdl(database_); - ASSERT_STATUS_OK(get_ddl_result); - EXPECT_EQ(0, get_ddl_result->statements_size()); - - std::vector statements; - if (!emulator_) { // version_retention_period - statements.push_back("ALTER DATABASE `" + database_.database_id() + - "` SET OPTIONS (version_retention_period='7d')"); - } - statements.emplace_back(R"""( - CREATE TABLE Singers ( - SingerId INT64 NOT NULL, - FirstName STRING(1024), - LastName STRING(1024), - SingerInfo BYTES(MAX), - SingerDetails JSON - ) PRIMARY KEY (SingerId) - )"""); - auto metadata = client_.UpdateDatabase(database_, statements).get(); - ASSERT_STATUS_OK(metadata); - EXPECT_THAT(metadata->database(), EndsWith(database_.database_id())); - EXPECT_EQ(statements.size(), metadata->statements_size()); - EXPECT_EQ(statements.size(), metadata->commit_timestamps_size()); - if (metadata->statements_size() >= 1) { - EXPECT_THAT(metadata->statements(), Contains(HasSubstr("CREATE TABLE"))); - } - if (metadata->statements_size() >= 2) { - EXPECT_THAT(metadata->statements(), Contains(HasSubstr("ALTER DATABASE"))); - } - EXPECT_FALSE(metadata->throttled()); - - // Verify that a JSON column cannot be used as an index. - statements.clear(); - statements.emplace_back(R"""( - CREATE INDEX SingersByDetail - ON Singers(SingerDetails) - )"""); - metadata = client_.UpdateDatabase(database_, statements).get(); - EXPECT_THAT(metadata, StatusIs(StatusCode::kFailedPrecondition, - HasSubstr("SingersByDetail"))); - - // Verify that a JSON column cannot be used as a primary key. - statements.clear(); - statements.emplace_back(R"""( - CREATE TABLE JsonKey ( - Key JSON NOT NULL - ) PRIMARY KEY (Key) - )"""); - metadata = client_.UpdateDatabase(database_, statements).get(); - EXPECT_THAT(metadata, StatusIs(StatusCode::kInvalidArgument, - AllOf(HasSubstr("Key has type JSON"), - HasSubstr("part of the primary key")))); - - EXPECT_TRUE(DatabaseExists()) << "Database " << database_; - auto drop_status = client_.DropDatabase(database_); - EXPECT_STATUS_OK(drop_status); - EXPECT_FALSE(DatabaseExists()) << "Database " << database_; -} - -/// @test Verify setting version_retention_period via CreateDatabase(). -TEST_F(DatabaseAdminClientTest, VersionRetentionPeriodCreate) { - // Set the version_retention_period via CreateDatabase(). - auto database = - client_ - .CreateDatabase( - database_, - {absl::StrCat("ALTER DATABASE `", database_.database_id(), - "` SET OPTIONS (version_retention_period='7d')")}) - .get(); - if (emulator_) { // version_retention_period - EXPECT_THAT(database, Not(IsOk())); - GTEST_SKIP(); - } - ASSERT_THAT(database, IsOk()); - EXPECT_EQ(database_.FullName(), database->name()); - EXPECT_EQ("7d", database->version_retention_period()); - - // Verify that version_retention_period is returned from GetDatabase(). - auto get = client_.GetDatabase(database_); - ASSERT_THAT(get, IsOk()); - EXPECT_EQ(database->name(), get->name()); - EXPECT_EQ("7d", get->version_retention_period()); - - // Verify that earliest_version_time doesn't go past database create_time. - EXPECT_TRUE(get->has_create_time()); - EXPECT_TRUE(get->has_earliest_version_time()); - EXPECT_LE(MakeTimestamp(get->create_time()).value(), - MakeTimestamp(get->earliest_version_time()).value()); - - auto drop = client_.DropDatabase(database_); - EXPECT_THAT(drop, IsOk()); -} - -/// @test Verify setting bad version_retention_period via CreateDatabase(). -TEST_F(DatabaseAdminClientTest, VersionRetentionPeriodCreateFailure) { - // Set an invalid version_retention_period (zero) via CreateDatabase(), - // and verify that an error is returned. - auto database = - client_ - .CreateDatabase( - database_, - {absl::StrCat("ALTER DATABASE `", database_.database_id(), - "` SET OPTIONS (version_retention_period='0')")}) - .get(); - EXPECT_THAT(database, Not(IsOk())); -} - -/// @test Verify setting version_retention_period via UpdateDatabase(). -TEST_F(DatabaseAdminClientTest, VersionRetentionPeriodUpdate) { - // Create the database. - auto database = - client_.CreateDatabase(database_, /*extra_statements=*/{}).get(); - ASSERT_THAT(database, IsOk()); - EXPECT_EQ(database_.FullName(), database->name()); - if (emulator_) { // version_retention_period - EXPECT_EQ("", database->version_retention_period()); - } else { - EXPECT_NE("", database->version_retention_period()); // default value - } - - // Set the version_retention_period via UpdateDatabase(). - auto update = - client_ - .UpdateDatabase( - database_, - {absl::StrCat("ALTER DATABASE `", database_.database_id(), - "` SET OPTIONS (version_retention_period='7d')")}) - .get(); - if (emulator_) { // version_retention_period - EXPECT_THAT(update, Not(IsOk())); - } else { - ASSERT_THAT(update, IsOk()); - EXPECT_EQ(database->name(), update->database()); - EXPECT_THAT(update->statements(), - Contains(ContainsRegex("version_retention_period *= *'7d'"))); - } - - // Verify that version_retention_period is returned from GetDatabase(). - auto get = client_.GetDatabase(database_); - ASSERT_THAT(get, IsOk()); - EXPECT_EQ(database->name(), get->name()); - if (emulator_) { // version_retention_period - EXPECT_EQ("", get->version_retention_period()); - } else { - EXPECT_EQ("7d", get->version_retention_period()); - } - - // Verify that version_retention_period is returned via ListDatabases(). - auto list_db = [&] { - for (auto const& db : client_.ListDatabases(instance_)) { - if (db && db->name() == database_.FullName()) return db; - } - return StatusOr{ - Status{StatusCode::kNotFound, "disappeared"}}; - }(); - ASSERT_THAT(list_db, IsOk()); - EXPECT_EQ(database->name(), list_db->name()); - if (emulator_) { // version_retention_period - EXPECT_EQ("", list_db->version_retention_period()); - } else { - EXPECT_EQ("7d", list_db->version_retention_period()); - } - - // Verify that version_retention_period is returned from GetDatabaseDdl(). - auto ddl = client_.GetDatabaseDdl(database_); - ASSERT_THAT(ddl, IsOk()); - if (emulator_) { // version_retention_period - } else { - EXPECT_THAT(ddl->statements(), - Contains(ContainsRegex("version_retention_period *= *'7d'"))); - } - - auto drop = client_.DropDatabase(database_); - EXPECT_THAT(drop, IsOk()); -} - -/// @test Verify setting bad version_retention_period via UpdateDatabase(). -TEST_F(DatabaseAdminClientTest, VersionRetentionPeriodUpdateFailure) { - // Create the database. - auto database = - client_.CreateDatabase(database_, /*extra_statements=*/{}).get(); - ASSERT_THAT(database, IsOk()); - EXPECT_EQ(database_.FullName(), database->name()); - if (emulator_) { // version_retention_period - EXPECT_EQ("", database->version_retention_period()); - } else { - EXPECT_NE("", database->version_retention_period()); // default value - } - - auto get0 = client_.GetDatabase(database_); - ASSERT_THAT(get0, IsOk()); - EXPECT_EQ(database->name(), get0->name()); - if (emulator_) { // version_retention_period - EXPECT_EQ("", get0->version_retention_period()); - } else { - EXPECT_NE("", get0->version_retention_period()); // default value - } - - // Set an invalid version_retention_period (zero) via UpdateDatabase(), - // and verify that an error is returned. - auto update = - client_ - .UpdateDatabase( - database_, - {absl::StrCat("ALTER DATABASE `", database_.database_id(), - "` SET OPTIONS (version_retention_period='0')")}) - .get(); - EXPECT_THAT(update, Not(IsOk())); - - // Also verify that version_retention_period was NOT changed. - auto get = client_.GetDatabase(database_); - ASSERT_THAT(get, IsOk()); - EXPECT_EQ(database->name(), get->name()); - EXPECT_EQ(get0->version_retention_period(), get->version_retention_period()); - - auto drop = client_.DropDatabase(database_); - EXPECT_THAT(drop, IsOk()); -} - -// @test Verify we can create a database with an encryption key. -TEST_F(DatabaseAdminClientTest, CreateWithEncryptionKey) { - KmsKeyName encryption_key(instance_.project_id(), location_, kKeyRing, - kKeyName); - auto database = client_ - .CreateDatabase(database_, /*extra_statements=*/{}, - CustomerManagedEncryption(encryption_key)) - .get(); - ASSERT_STATUS_OK(database); - EXPECT_EQ(database->name(), database_.FullName()); - if (emulator_) { - EXPECT_FALSE(database->has_encryption_config()); - } else { - EXPECT_TRUE(database->has_encryption_config()); - if (database->has_encryption_config()) { - EXPECT_EQ(database->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - - auto get_result = client_.GetDatabase(database_); - ASSERT_STATUS_OK(get_result); - EXPECT_EQ(database->name(), get_result->name()); - EXPECT_TRUE(get_result->has_encryption_config()); - if (get_result->has_encryption_config()) { - EXPECT_EQ(get_result->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - - // Verify that encryption config is returned via ListDatabases(). - auto list_db = [&] { - for (auto const& db : client_.ListDatabases(database_.instance())) { - if (db && db->name() == database_.FullName()) return db; - } - return StatusOr{ - Status{StatusCode::kNotFound, "disappeared"}}; - }(); - ASSERT_THAT(list_db, IsOk()); - EXPECT_TRUE(list_db->has_encryption_config()); - if (list_db->has_encryption_config()) { - EXPECT_EQ(list_db->encryption_config().kms_key_name(), - encryption_key.FullName()); - } - } - - EXPECT_STATUS_OK(client_.DropDatabase(database_)); -} - -// @test Verify creating a database fails if a nonexistent encryption key is -// supplied. -TEST_F(DatabaseAdminClientTest, CreateWithNonexistentEncryptionKey) { - KmsKeyName nonexistent_encryption_key(instance_.project_id(), location_, - kKeyRing, "ceci-n-est-pas-une-cle"); - auto database = - client_ - .CreateDatabase(database_, /*extra_statements=*/{}, - CustomerManagedEncryption(nonexistent_encryption_key)) - .get(); - if (emulator_) { - EXPECT_THAT(database, IsOk()); - EXPECT_STATUS_OK(client_.DropDatabase(database_)); - } else { - EXPECT_THAT(database, - StatusIs(StatusCode::kFailedPrecondition, - HasSubstr("KMS Key provided is not usable"))); - } -} - -/// @test Verify the backwards compatibility `v1` namespace still exists. -TEST_F(DatabaseAdminClientTest, BackwardsCompatibility) { - auto connection = ::google::cloud::spanner::v1::MakeDatabaseAdminConnection(); - EXPECT_THAT(connection, NotNull()); - ASSERT_NO_FATAL_FAILURE(DatabaseAdminClient(std::move(connection))); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/integration_tests/instance_admin_integration_test.cc b/google/cloud/spanner/integration_tests/instance_admin_integration_test.cc deleted file mode 100644 index 5d09bc1eb1f6e..0000000000000 --- a/google/cloud/spanner/integration_tests/instance_admin_integration_test.cc +++ /dev/null @@ -1,275 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// TODO(#7356): Remove this file after the deprecation period expires -#include "google/cloud/internal/disable_deprecation_warnings.inc" -#include "google/cloud/spanner/create_instance_request_builder.h" -#include "google/cloud/spanner/instance_admin_client.h" -#include "google/cloud/spanner/testing/cleanup_stale_instances.h" -#include "google/cloud/spanner/testing/pick_instance_config.h" -#include "google/cloud/spanner/testing/random_instance_name.h" -#include "google/cloud/spanner/update_instance_request_builder.h" -#include "google/cloud/internal/getenv.h" -#include "google/cloud/internal/random.h" -#include "google/cloud/testing_util/integration_test.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "absl/strings/match.h" -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace spanner { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::google::cloud::testing_util::IsOk; -using ::google::cloud::testing_util::StatusIs; -using ::testing::AnyOf; -using ::testing::HasSubstr; -using ::testing::IsEmpty; -using ::testing::Not; -using ::testing::NotNull; -using ::testing::UnorderedElementsAre; - -std::string const& ProjectId() { - static std::string project_id = - internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or(""); - return project_id; -} - -std::string const& InstanceId() { - static std::string instance_id = - internal::GetEnv("GOOGLE_CLOUD_CPP_SPANNER_TEST_INSTANCE_ID") - .value_or(""); - return instance_id; -} - -bool RunSlowInstanceTests() { - static bool run_slow_instance_tests = absl::StrContains( - internal::GetEnv("GOOGLE_CLOUD_CPP_SPANNER_SLOW_INTEGRATION_TESTS") - .value_or(""), - "instance"); - return run_slow_instance_tests; -} - -bool Emulator() { - static bool emulator = internal::GetEnv("SPANNER_EMULATOR_HOST").has_value(); - return emulator; -} - -class CleanupStaleInstances : public ::testing::Environment { - public: - void SetUp() override { - spanner_admin::InstanceAdminClient instance_admin_client( - spanner_admin::MakeInstanceAdminConnection()); - spanner_admin::DatabaseAdminClient database_admin_client( - spanner_admin::MakeDatabaseAdminConnection()); - EXPECT_STATUS_OK(spanner_testing::CleanupStaleInstances( - Project(ProjectId()), std::move(instance_admin_client), - std::move(database_admin_client))); - } -}; - -::testing::Environment* const kCleanupEnv = - ::testing::AddGlobalTestEnvironment(new CleanupStaleInstances); - -class InstanceAdminClientTest - : public ::google::cloud::testing_util::IntegrationTest { - public: - InstanceAdminClientTest() - : generator_(internal::MakeDefaultPRNG()), - client_(MakeInstanceAdminConnection()) { - static_cast(kCleanupEnv); - } - - protected: - void SetUp() override { - if (Emulator()) { - // We expect test instances to exist when running against real services, - // but if we are running against the emulator we're happy to create one. - Instance in(ProjectId(), InstanceId()); - auto create_instance_request = - CreateInstanceRequestBuilder(in, - "projects/" + in.project_id() + - "/instanceConfigs/emulator-config") - .Build(); - auto instance = client_.CreateInstance(create_instance_request).get(); - if (!instance) { - ASSERT_THAT(instance, StatusIs(StatusCode::kAlreadyExists)); - } - } - } - - internal::DefaultPRNG generator_; - InstanceAdminClient client_; -}; - -/// @test Verify the basic read operations for instances work. -TEST_F(InstanceAdminClientTest, InstanceReadOperations) { - Instance in(ProjectId(), InstanceId()); - ASSERT_FALSE(in.project_id().empty()); - ASSERT_FALSE(in.instance_id().empty()); - - auto instance = client_.GetInstance(in); - ASSERT_STATUS_OK(instance); - EXPECT_EQ(instance->name(), in.FullName()); - EXPECT_NE(instance->node_count(), 0); - - auto instance_names = [&in, this]() mutable { - std::vector names; - for (auto const& instance : client_.ListInstances(in.project_id(), "")) { - EXPECT_STATUS_OK(instance); - if (!instance) break; - names.push_back(instance->name()); - } - return names; - }(); - EXPECT_EQ(1, std::count(instance_names.begin(), instance_names.end(), - instance->name())); -} - -/// @test Verify the basic CRUD operations for instances work. -TEST_F(InstanceAdminClientTest, InstanceCRUDOperations) { - if (!RunSlowInstanceTests()) { - GTEST_SKIP() << "skipping slow instance tests; set " - << "GOOGLE_CLOUD_CPP_SPANNER_SLOW_INTEGRATION_TESTS=instance" - << " to override"; - } - - std::string instance_id = spanner_testing::RandomInstanceName(generator_); - Instance in(ProjectId(), instance_id); - ASSERT_FALSE(in.project_id().empty()); - ASSERT_FALSE(in.instance_id().empty()); - - auto config_name = spanner_testing::PickInstanceConfig( - in.project(), generator_, - [](google::spanner::admin::instance::v1::InstanceConfig const& config) { - return absl::StrContains(config.name(), "/regional-us-west"); - }); - ASSERT_FALSE(config_name.empty()) << "could not get an instance config"; - - auto instance = - client_ - .CreateInstance(CreateInstanceRequestBuilder(in, config_name) - .SetDisplayName("test-display-name") - .SetNodeCount(1) - .SetLabels({{"label-key", "label-value"}}) - .Build()) - .get(); - - ASSERT_STATUS_OK(instance); - EXPECT_EQ(instance->name(), in.FullName()); - EXPECT_EQ(instance->display_name(), "test-display-name"); - EXPECT_NE(instance->node_count(), 0); - EXPECT_EQ(instance->config(), config_name); - EXPECT_EQ(instance->labels().at("label-key"), "label-value"); - - // Then update the instance - instance = client_ - .UpdateInstance(UpdateInstanceRequestBuilder(*instance) - .SetDisplayName("New display name") - .AddLabels({{"new-key", "new-value"}}) - .SetNodeCount(2) - .Build()) - .get(); - if (Emulator()) { - EXPECT_THAT(instance, StatusIs(StatusCode::kUnimplemented)); - } else { - EXPECT_STATUS_OK(instance); - if (instance) { - EXPECT_EQ(instance->display_name(), "New display name"); - EXPECT_EQ(instance->labels_size(), 2); - EXPECT_EQ(instance->labels().at("new-key"), "new-value"); - EXPECT_EQ(instance->node_count(), 2); - } - } - - EXPECT_STATUS_OK(client_.DeleteInstance(in)); -} - -TEST_F(InstanceAdminClientTest, InstanceConfig) { - auto project_id = ProjectId(); - ASSERT_FALSE(project_id.empty()); - - auto config_names = [&project_id, this]() mutable { - std::vector names; - for (auto const& config : client_.ListInstanceConfigs(project_id)) { - EXPECT_STATUS_OK(config); - if (!config) break; - names.push_back(config->name()); - } - return names; - }(); - ASSERT_FALSE(config_names.empty()); - - // Use the name of the first element from the list of instance configs. - auto config = client_.GetInstanceConfig(config_names[0]); - ASSERT_STATUS_OK(config); - EXPECT_THAT(config->name(), HasSubstr(project_id)); - EXPECT_EQ( - 1, std::count(config_names.begin(), config_names.end(), config->name())); -} - -TEST_F(InstanceAdminClientTest, InstanceIam) { - Instance in(ProjectId(), InstanceId()); - ASSERT_FALSE(in.project_id().empty()); - ASSERT_FALSE(in.instance_id().empty()); - - auto actual_policy = client_.GetIamPolicy(in); - if (Emulator()) { - EXPECT_THAT(actual_policy, StatusIs(StatusCode::kUnimplemented)); - GTEST_SKIP() << "emulator does not support IAM policies"; - } - ASSERT_STATUS_OK(actual_policy); - EXPECT_FALSE(actual_policy->etag().empty()); - - if (RunSlowInstanceTests()) { - // Set the policy to the existing value of the policy. While this - // changes nothing, it tests all the code in the client library. - auto updated_policy = client_.SetIamPolicy(in, *actual_policy); - ASSERT_THAT(updated_policy, AnyOf(IsOk(), StatusIs(StatusCode::kAborted))); - if (updated_policy) { - EXPECT_THAT(updated_policy->etag(), Not(IsEmpty())); - } - - // Repeat the test using the OCC API. - updated_policy = - client_.SetIamPolicy(in, [](google::iam::v1::Policy p) { return p; }); - ASSERT_STATUS_OK(updated_policy); - EXPECT_THAT(updated_policy->etag(), Not(IsEmpty())); - } - - auto actual = client_.TestIamPermissions( - in, {"spanner.databases.list", "spanner.databases.get"}); - ASSERT_STATUS_OK(actual); - EXPECT_THAT( - actual->permissions(), - UnorderedElementsAre("spanner.databases.list", "spanner.databases.get")); -} - -/// @test Verify the backwards compatibility `v1` namespace still exists. -TEST_F(InstanceAdminClientTest, BackwardsCompatibility) { - auto connection = ::google::cloud::spanner::v1::MakeInstanceAdminConnection(); - EXPECT_THAT(connection, NotNull()); - ASSERT_NO_FATAL_FAILURE(InstanceAdminClient(std::move(connection))); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner -} // namespace cloud -} // namespace google diff --git a/google/cloud/spanner/integration_tests/spanner_client_integration_tests.bzl b/google/cloud/spanner/integration_tests/spanner_client_integration_tests.bzl index f101d8f668d23..f1e518714142e 100644 --- a/google/cloud/spanner/integration_tests/spanner_client_integration_tests.bzl +++ b/google/cloud/spanner/integration_tests/spanner_client_integration_tests.bzl @@ -17,11 +17,7 @@ """Automatically generated unit tests list - DO NOT EDIT.""" spanner_client_integration_tests = [ - "backup_extra_integration_test.cc", - "backup_integration_test.cc", "client_stress_test.cc", "data_types_integration_test.cc", - "database_admin_integration_test.cc", - "instance_admin_integration_test.cc", "session_pool_integration_test.cc", ] diff --git a/google/cloud/spanner/internal/connection_impl.h b/google/cloud/spanner/internal/connection_impl.h index 6bed1878e81e1..20d87e75b7aae 100644 --- a/google/cloud/spanner/internal/connection_impl.h +++ b/google/cloud/spanner/internal/connection_impl.h @@ -26,7 +26,7 @@ #include "google/cloud/background_threads.h" #include "google/cloud/status.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include #include diff --git a/google/cloud/spanner/internal/database_admin_stub.cc b/google/cloud/spanner/internal/database_admin_stub.cc index b30ff25be4b4a..3092d53f23a18 100644 --- a/google/cloud/spanner/internal/database_admin_stub.cc +++ b/google/cloud/spanner/internal/database_admin_stub.cc @@ -17,8 +17,8 @@ #include "google/cloud/spanner/internal/database_admin_metadata.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/log.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/spanner/internal/database_admin_stub.h b/google/cloud/spanner/internal/database_admin_stub.h index 7ffdc4a0614b1..3cde124566d2f 100644 --- a/google/cloud/spanner/internal/database_admin_stub.h +++ b/google/cloud/spanner/internal/database_admin_stub.h @@ -21,7 +21,7 @@ #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/admin/database/v1/spanner_database_admin.pb.h" #include namespace google { diff --git a/google/cloud/spanner/internal/instance_admin_stub.cc b/google/cloud/spanner/internal/instance_admin_stub.cc index d5f452f12e1c2..71a241459ba21 100644 --- a/google/cloud/spanner/internal/instance_admin_stub.cc +++ b/google/cloud/spanner/internal/instance_admin_stub.cc @@ -20,8 +20,8 @@ #include "google/cloud/grpc_options.h" #include "google/cloud/internal/algorithm.h" #include "google/cloud/log.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h" #include namespace google { diff --git a/google/cloud/spanner/internal/instance_admin_stub.h b/google/cloud/spanner/internal/instance_admin_stub.h index 54b26e95f69e8..a500b207db054 100644 --- a/google/cloud/spanner/internal/instance_admin_stub.h +++ b/google/cloud/spanner/internal/instance_admin_stub.h @@ -21,7 +21,7 @@ #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include namespace google { diff --git a/google/cloud/spanner/internal/merge_chunk.h b/google/cloud/spanner/internal/merge_chunk.h index 77fd6ecf447d2..92834a33dc36e 100644 --- a/google/cloud/spanner/internal/merge_chunk.h +++ b/google/cloud/spanner/internal/merge_chunk.h @@ -17,7 +17,7 @@ #include "google/cloud/spanner/version.h" #include "google/cloud/status.h" -#include +#include "google/protobuf/struct.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/spanner/internal/merge_chunk_test.cc b/google/cloud/spanner/internal/merge_chunk_test.cc index c1fde868bc95e..be8ef9b6ab2b3 100644 --- a/google/cloud/spanner/internal/merge_chunk_test.cc +++ b/google/cloud/spanner/internal/merge_chunk_test.cc @@ -16,7 +16,7 @@ #include "google/cloud/spanner/value.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/protobuf/struct.pb.h" #include #include #include diff --git a/google/cloud/spanner/internal/partial_result_set_reader.h b/google/cloud/spanner/internal/partial_result_set_reader.h index 8d71f8588aff7..db80d1f27e00c 100644 --- a/google/cloud/spanner/internal/partial_result_set_reader.h +++ b/google/cloud/spanner/internal/partial_result_set_reader.h @@ -19,7 +19,7 @@ #include "google/cloud/status.h" #include "google/cloud/status_or.h" #include "absl/types/optional.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include #include diff --git a/google/cloud/spanner/internal/partial_result_set_source.h b/google/cloud/spanner/internal/partial_result_set_source.h index 16c74db827410..7ccd5963c4a82 100644 --- a/google/cloud/spanner/internal/partial_result_set_source.h +++ b/google/cloud/spanner/internal/partial_result_set_source.h @@ -23,10 +23,10 @@ #include "google/cloud/status.h" #include "google/cloud/status_or.h" #include "absl/types/optional.h" +#include "google/spanner/v1/spanner.pb.h" #include #include #include -#include #include #include #include diff --git a/google/cloud/spanner/internal/session_pool.h b/google/cloud/spanner/internal/session_pool.h index ab108ae92af25..82ce975b059f4 100644 --- a/google/cloud/spanner/internal/session_pool.h +++ b/google/cloud/spanner/internal/session_pool.h @@ -28,7 +28,7 @@ #include "google/cloud/future.h" #include "google/cloud/status_or.h" #include "absl/container/fixed_array.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include #include diff --git a/google/cloud/spanner/internal/spanner_auth_decorator.cc b/google/cloud/spanner/internal/spanner_auth_decorator.cc index b70a5b2d1a737..f1bb0f2a63a7e 100644 --- a/google/cloud/spanner/internal/spanner_auth_decorator.cc +++ b/google/cloud/spanner/internal/spanner_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/spanner/v1/spanner.proto #include "google/cloud/spanner/internal/spanner_auth_decorator.h" -#include +#include "google/spanner/v1/spanner.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/internal/spanner_logging_decorator.cc b/google/cloud/spanner/internal/spanner_logging_decorator.cc index a41ac38d302ca..48aa7dfb041f8 100644 --- a/google/cloud/spanner/internal/spanner_logging_decorator.cc +++ b/google/cloud/spanner/internal/spanner_logging_decorator.cc @@ -20,7 +20,7 @@ #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/internal/spanner_metadata_decorator.cc b/google/cloud/spanner/internal/spanner_metadata_decorator.cc index 94e93d46b9896..45aee5f784a2f 100644 --- a/google/cloud/spanner/internal/spanner_metadata_decorator.cc +++ b/google/cloud/spanner/internal/spanner_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.grpc.pb.h" #include #include #include diff --git a/google/cloud/spanner/internal/spanner_stub.cc b/google/cloud/spanner/internal/spanner_stub.cc index 5fe853065e92f..6ae208441d567 100644 --- a/google/cloud/spanner/internal/spanner_stub.cc +++ b/google/cloud/spanner/internal/spanner_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/spanner/internal/spanner_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/internal/spanner_stub.h b/google/cloud/spanner/internal/spanner_stub.h index a494d2e088241..d4392c23311e0 100644 --- a/google/cloud/spanner/internal/spanner_stub.h +++ b/google/cloud/spanner/internal/spanner_stub.h @@ -25,7 +25,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/spanner/v1/spanner.grpc.pb.h" #include #include diff --git a/google/cloud/spanner/internal/spanner_stub_factory_test.cc b/google/cloud/spanner/internal/spanner_stub_factory_test.cc index 65b1c3c45514c..b6315d1de8c26 100644 --- a/google/cloud/spanner/internal/spanner_stub_factory_test.cc +++ b/google/cloud/spanner/internal/spanner_stub_factory_test.cc @@ -112,7 +112,6 @@ TEST(DecorateSpannerStub, Logging) { Contains(AllOf(HasSubstr("CreateSession"), HasSubstr("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; @@ -168,7 +167,6 @@ TEST(DecorateSpannerStub, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/spanner/internal/spanner_tracing_stub.cc b/google/cloud/spanner/internal/spanner_tracing_stub.cc index 4e40897a4a5ba..745a9e94fc143 100644 --- a/google/cloud/spanner/internal/spanner_tracing_stub.cc +++ b/google/cloud/spanner/internal/spanner_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace spanner_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpannerTracingStub::SpannerTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -242,15 +240,9 @@ SpannerTracingStub::AsyncExecuteSql( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpannerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/spanner/internal/spanner_tracing_stub.h b/google/cloud/spanner/internal/spanner_tracing_stub.h index e2ca3b3d1b58b..4e964ff3c7834 100644 --- a/google/cloud/spanner/internal/spanner_tracing_stub.h +++ b/google/cloud/spanner/internal/spanner_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace spanner_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpannerTracingStub : public SpannerStub { public: ~SpannerTracingStub() override = default; @@ -127,8 +125,6 @@ class SpannerTracingStub : public SpannerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/spanner/internal/status_utils.cc b/google/cloud/spanner/internal/status_utils.cc index cf01d5da5d108..5540907ecdda2 100644 --- a/google/cloud/spanner/internal/status_utils.cc +++ b/google/cloud/spanner/internal/status_utils.cc @@ -17,9 +17,9 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/status_payload_keys.h" #include "absl/strings/match.h" -#include -#include -#include +#include "google/rpc/error_details.pb.h" +#include "google/rpc/status.pb.h" +#include "google/spanner/v1/spanner.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/spanner/internal/transaction_impl.h b/google/cloud/spanner/internal/transaction_impl.h index a289abe039e64..abcb33a07ca98 100644 --- a/google/cloud/spanner/internal/transaction_impl.h +++ b/google/cloud/spanner/internal/transaction_impl.h @@ -20,7 +20,7 @@ #include "google/cloud/internal/invoke_result.h" #include "google/cloud/internal/port_platform.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/transaction.pb.h" #include #include #include diff --git a/google/cloud/spanner/keys.cc b/google/cloud/spanner/keys.cc index 333a3877e0cbe..2e54ce36142b4 100644 --- a/google/cloud/spanner/keys.cc +++ b/google/cloud/spanner/keys.cc @@ -14,8 +14,8 @@ #include "google/cloud/spanner/keys.h" #include "google/cloud/spanner/value.h" +#include "google/spanner/v1/keys.pb.h" #include -#include namespace google { namespace cloud { diff --git a/google/cloud/spanner/keys.h b/google/cloud/spanner/keys.h index d674baf040ddd..3f61463fc828e 100644 --- a/google/cloud/spanner/keys.h +++ b/google/cloud/spanner/keys.h @@ -17,7 +17,7 @@ #include "google/cloud/spanner/value.h" #include "google/cloud/spanner/version.h" -#include +#include "google/spanner/v1/keys.pb.h" #include #include diff --git a/google/cloud/spanner/keys_test.cc b/google/cloud/spanner/keys_test.cc index 139de6f11db7d..dfda69ac6b0ea 100644 --- a/google/cloud/spanner/keys_test.cc +++ b/google/cloud/spanner/keys_test.cc @@ -14,8 +14,8 @@ #include "google/cloud/spanner/keys.h" #include "google/cloud/testing_util/is_proto_equal.h" +#include "google/spanner/v1/keys.pb.h" #include -#include #include #include #include diff --git a/google/cloud/spanner/mocks/mock_database_admin_connection.h b/google/cloud/spanner/mocks/mock_database_admin_connection.h deleted file mode 100644 index 0ce3c7188d016..0000000000000 --- a/google/cloud/spanner/mocks/mock_database_admin_connection.h +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_MOCKS_MOCK_DATABASE_ADMIN_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_MOCKS_MOCK_DATABASE_ADMIN_CONNECTION_H - -#include "google/cloud/spanner/database_admin_connection.h" -#include "google/cloud/spanner/version.h" -#include - -namespace google { -namespace cloud { -namespace spanner_mocks { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -/** - * A class to mock `google::cloud::spanner::DatabaseAdminConnection`. - * - * Application developers may want to test their code with simulated responses, - * including errors from a `spanner::DatabaseAdminClient`. To do so, construct a - * `spanner::DatabaseAdminClient` with an instance of this class. Then use the - * Google Test framework functions to program the behavior of this mock. - */ -class MockDatabaseAdminConnection - : public google::cloud::spanner::DatabaseAdminConnection { - public: - MOCK_METHOD(future>, - CreateDatabase, (CreateDatabaseParams), (override)); - MOCK_METHOD(StatusOr, - GetDatabase, (GetDatabaseParams), (override)); - MOCK_METHOD( - StatusOr, - GetDatabaseDdl, (GetDatabaseDdlParams), (override)); - MOCK_METHOD( - future>, - UpdateDatabase, (UpdateDatabaseParams), (override)); - MOCK_METHOD(Status, DropDatabase, (DropDatabaseParams), (override)); - MOCK_METHOD(spanner::ListDatabaseRange, ListDatabases, (ListDatabasesParams), - (override)); - MOCK_METHOD(future>, - RestoreDatabase, (RestoreDatabaseParams), (override)); - MOCK_METHOD(StatusOr, GetIamPolicy, - (GetIamPolicyParams), (override)); - MOCK_METHOD(StatusOr, SetIamPolicy, - (SetIamPolicyParams), (override)); - MOCK_METHOD(StatusOr, - TestIamPermissions, (TestIamPermissionsParams), (override)); - MOCK_METHOD(future>, - CreateBackup, (CreateBackupParams), (override)); - MOCK_METHOD(StatusOr, GetBackup, - (GetBackupParams), (override)); - MOCK_METHOD(Status, DeleteBackup, (DeleteBackupParams), (override)); - MOCK_METHOD(spanner::ListBackupsRange, ListBackups, (ListBackupsParams), - (override)); - MOCK_METHOD(StatusOr, - UpdateBackup, (UpdateBackupParams), (override)); - MOCK_METHOD(spanner::ListBackupOperationsRange, ListBackupOperations, - (ListBackupOperationsParams), (override)); - MOCK_METHOD(spanner::ListDatabaseOperationsRange, ListDatabaseOperations, - (ListDatabaseOperationsParams), (override)); -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner_mocks -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_MOCKS_MOCK_DATABASE_ADMIN_CONNECTION_H diff --git a/google/cloud/spanner/mocks/mock_instance_admin_connection.h b/google/cloud/spanner/mocks/mock_instance_admin_connection.h deleted file mode 100644 index 6afdcb472dea2..0000000000000 --- a/google/cloud/spanner/mocks/mock_instance_admin_connection.h +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_MOCKS_MOCK_INSTANCE_ADMIN_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_MOCKS_MOCK_INSTANCE_ADMIN_CONNECTION_H - -#include "google/cloud/spanner/instance_admin_connection.h" -#include "google/cloud/spanner/version.h" -#include - -namespace google { -namespace cloud { -namespace spanner_mocks { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -/** - * A class to mock `google::cloud::spanner::InstanceAdminConnection`. - * - * Application developers may want to test their code with simulated responses, - * including errors from a `spanner::InstanceAdminClient`. To do so, construct a - * `spanner::InstanceAdminClient` with an instance of this class. Then use the - * Google Test framework functions to program the behavior of this mock. - */ -class MockInstanceAdminConnection - : public google::cloud::spanner::InstanceAdminConnection { - public: - MOCK_METHOD(StatusOr, - GetInstance, (GetInstanceParams), (override)); - MOCK_METHOD(future>, - CreateInstance, (CreateInstanceParams), (override)); - MOCK_METHOD(future>, - UpdateInstance, (UpdateInstanceParams), (override)); - MOCK_METHOD(Status, DeleteInstance, (DeleteInstanceParams), (override)); - MOCK_METHOD(StatusOr, - GetInstanceConfig, (GetInstanceConfigParams), (override)); - MOCK_METHOD(spanner::ListInstanceConfigsRange, ListInstanceConfigs, - (ListInstanceConfigsParams), (override)); - MOCK_METHOD(spanner::ListInstancesRange, ListInstances, (ListInstancesParams), - (override)); - MOCK_METHOD(StatusOr, GetIamPolicy, - (GetIamPolicyParams), (override)); - MOCK_METHOD(StatusOr, SetIamPolicy, - (SetIamPolicyParams), (override)); - MOCK_METHOD(StatusOr, - TestIamPermissions, (TestIamPermissionsParams), (override)); -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace spanner_mocks -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_MOCKS_MOCK_INSTANCE_ADMIN_CONNECTION_H diff --git a/google/cloud/spanner/mocks/row.h b/google/cloud/spanner/mocks/row.h index 1ff5b5102377d..62782965ba76f 100644 --- a/google/cloud/spanner/mocks/row.h +++ b/google/cloud/spanner/mocks/row.h @@ -18,6 +18,7 @@ #include "google/cloud/spanner/row.h" #include "google/cloud/spanner/value.h" #include "google/cloud/version.h" +#include #include #include #include @@ -27,9 +28,6 @@ namespace cloud { namespace spanner_mocks { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -// TODO(#9086): Delete this when the MakeRow() implementation is moved here. -#include "google/cloud/internal/disable_deprecation_warnings.inc" - /** * Creates a `spanner::Row` with the specified column names and values. * @@ -41,7 +39,14 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN */ inline spanner::Row MakeRow( std::vector> pairs) { - return spanner::MakeTestRow(std::move(pairs)); + auto values = std::vector{}; + auto columns = std::make_shared>(); + for (auto& p : pairs) { + values.emplace_back(std::move(p.second)); + columns->emplace_back(std::move(p.first)); + } + return spanner_internal::RowFriend::MakeRow(std::move(values), + std::move(columns)); } /** @@ -58,12 +63,14 @@ inline spanner::Row MakeRow( */ template spanner::Row MakeRow(Ts&&... ts) { - return spanner::MakeTestRow(std::forward(ts)...); + auto columns = std::make_shared>(); + for (std::size_t i = 0; i < sizeof...(ts); ++i) { + columns->emplace_back(std::to_string(i)); + } + std::vector v{spanner::Value(std::forward(ts))...}; + return spanner_internal::RowFriend::MakeRow(std::move(v), std::move(columns)); } -// TODO(#9086): Delete this when the MakeRow() implementation is moved here. -#include "google/cloud/internal/diagnostics_pop.inc" - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace spanner_mocks } // namespace cloud diff --git a/google/cloud/spanner/mutations.h b/google/cloud/spanner/mutations.h index d28a5161b4dfa..e342406680926 100644 --- a/google/cloud/spanner/mutations.h +++ b/google/cloud/spanner/mutations.h @@ -18,7 +18,7 @@ #include "google/cloud/spanner/keys.h" #include "google/cloud/spanner/value.h" #include "google/cloud/spanner/version.h" -#include +#include "google/spanner/v1/mutation.pb.h" #include #include diff --git a/google/cloud/spanner/partition_options.h b/google/cloud/spanner/partition_options.h index 3e71aa00531a3..f22f9b9512e29 100644 --- a/google/cloud/spanner/partition_options.h +++ b/google/cloud/spanner/partition_options.h @@ -19,7 +19,7 @@ #include "google/cloud/optional.h" #include "google/cloud/options.h" #include "absl/types/optional.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include namespace google { diff --git a/google/cloud/spanner/proto_enum_test.cc b/google/cloud/spanner/proto_enum_test.cc index 5b40fcd2a3165..ec6f7755d003f 100644 --- a/google/cloud/spanner/proto_enum_test.cc +++ b/google/cloud/spanner/proto_enum_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "google/cloud/spanner/proto_enum.h" -#include +#include "protos/google/cloud/spanner/testing/singer.pb.h" #include #include #include diff --git a/google/cloud/spanner/proto_message_test.cc b/google/cloud/spanner/proto_message_test.cc index 64221ee6291f0..dba85c9774272 100644 --- a/google/cloud/spanner/proto_message_test.cc +++ b/google/cloud/spanner/proto_message_test.cc @@ -14,7 +14,7 @@ #include "google/cloud/spanner/proto_message.h" #include "google/cloud/testing_util/is_proto_equal.h" -#include +#include "protos/google/cloud/spanner/testing/singer.pb.h" #include #include diff --git a/google/cloud/spanner/query_partition.cc b/google/cloud/spanner/query_partition.cc index 1449f21aa42dd..112b4ae7fa38b 100644 --- a/google/cloud/spanner/query_partition.cc +++ b/google/cloud/spanner/query_partition.cc @@ -14,7 +14,7 @@ #include "google/cloud/spanner/query_partition.h" #include "google/cloud/internal/make_status.h" -#include +#include "google/spanner/v1/spanner.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/spanner/quickstart/.bazelrc b/google/cloud/spanner/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/spanner/quickstart/.bazelrc +++ b/google/cloud/spanner/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/spanner/read_partition.cc b/google/cloud/spanner/read_partition.cc index 6c2a7c18cf31c..594a6e3238682 100644 --- a/google/cloud/spanner/read_partition.cc +++ b/google/cloud/spanner/read_partition.cc @@ -14,7 +14,7 @@ #include "google/cloud/spanner/read_partition.h" #include "google/cloud/internal/make_status.h" -#include +#include "google/spanner/v1/spanner.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/spanner/read_partition.h b/google/cloud/spanner/read_partition.h index bb90e84b4e0a0..9709e18524ec0 100644 --- a/google/cloud/spanner/read_partition.h +++ b/google/cloud/spanner/read_partition.h @@ -19,7 +19,7 @@ #include "google/cloud/spanner/keys.h" #include "google/cloud/spanner/version.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include diff --git a/google/cloud/spanner/results.cc b/google/cloud/spanner/results.cc index 93ecd924dcd79..b81ce553dfb23 100644 --- a/google/cloud/spanner/results.cc +++ b/google/cloud/spanner/results.cc @@ -14,7 +14,7 @@ #include "google/cloud/spanner/results.h" #include "absl/types/optional.h" -#include +#include "google/spanner/v1/result_set.pb.h" #include #include #include diff --git a/google/cloud/spanner/results.h b/google/cloud/spanner/results.h index b46f92e79b67d..9600792af5378 100644 --- a/google/cloud/spanner/results.h +++ b/google/cloud/spanner/results.h @@ -20,7 +20,7 @@ #include "google/cloud/spanner/version.h" #include "google/cloud/optional.h" #include "absl/types/optional.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include #include diff --git a/google/cloud/spanner/row.cc b/google/cloud/spanner/row.cc index 9db2726b5f477..4b02d98823f9e 100644 --- a/google/cloud/spanner/row.cc +++ b/google/cloud/spanner/row.cc @@ -35,16 +35,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END namespace spanner { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -Row MakeTestRow(std::vector> pairs) { - auto values = std::vector{}; - auto columns = std::make_shared>(); - for (auto& p : pairs) { - values.emplace_back(std::move(p.second)); - columns->emplace_back(std::move(p.first)); - } - return spanner_internal::RowFriend::MakeRow(std::move(values), - std::move(columns)); -} Row::Row() : Row({}, std::make_shared>()) {} diff --git a/google/cloud/spanner/row.h b/google/cloud/spanner/row.h index d73624551d1b6..3a288ab6b6b43 100644 --- a/google/cloud/spanner/row.h +++ b/google/cloud/spanner/row.h @@ -200,41 +200,6 @@ class Row { std::shared_ptr const> columns_; }; -/** - * Creates a `Row` with the specified column names and values. - * - * This overload accepts a vector of pairs, allowing the caller to specify both - * the column names and the `Value` that goes in each column. - * - * This function is intended for application developers who are mocking the - * results of a `Client::ExecuteQuery` call. - */ -GOOGLE_CLOUD_CPP_SPANNER_MAKE_TEST_ROW_DEPRECATED() -Row MakeTestRow(std::vector> pairs); - -/** - * Creates a `Row` with `Value`s created from the given arguments and with - * auto-generated column names. - * - * This overload accepts a variadic list of arguments that will be used to - * create the `Value`s in the row. The column names will be implicitly - * generated, the first column being "0", the second "1", and so on, - * corresponding to the argument's position. - * - * This function is intended for application developers who are mocking the - * results of a `Client::ExecuteQuery` call. - */ -template -GOOGLE_CLOUD_CPP_SPANNER_MAKE_TEST_ROW_DEPRECATED() -Row MakeTestRow(Ts&&... ts) { - auto columns = std::make_shared>(); - for (std::size_t i = 0; i < sizeof...(ts); ++i) { - columns->emplace_back(std::to_string(i)); - } - std::vector v{Value(std::forward(ts))...}; - return spanner_internal::RowFriend::MakeRow(std::move(v), std::move(columns)); -} - /** * A `RowStreamIterator` is an _Input Iterator_ (see below) that returns a * sequence of `StatusOr` objects. diff --git a/google/cloud/spanner/samples/BUILD.bazel b/google/cloud/spanner/samples/BUILD.bazel index fb52fefabf98e..ee79fbbc03e95 100644 --- a/google/cloud/spanner/samples/BUILD.bazel +++ b/google/cloud/spanner/samples/BUILD.bazel @@ -34,7 +34,7 @@ licenses(["notice"]) # Apache 2.0 "//:universe_domain", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", + # "//protos:system_includes", "//protos/google/cloud/spanner/testing:singer_cc_proto", ], ) for test in spanner_client_integration_samples] @@ -47,6 +47,6 @@ licenses(["notice"]) # Apache 2.0 "//:spanner", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_client_unit_samples] diff --git a/google/cloud/spanner/samples/graph_samples.cc b/google/cloud/spanner/samples/graph_samples.cc index f01d2ac9009b5..0388843a952a8 100644 --- a/google/cloud/spanner/samples/graph_samples.cc +++ b/google/cloud/spanner/samples/graph_samples.cc @@ -21,6 +21,7 @@ #include "google/cloud/spanner/timestamp.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/log.h" +#include "absl/time/clock.h" #include #include #include diff --git a/google/cloud/spanner/samples/samples.cc b/google/cloud/spanner/samples/samples.cc index 69f5ed2424b6c..61277749062b4 100644 --- a/google/cloud/spanner/samples/samples.cc +++ b/google/cloud/spanner/samples/samples.cc @@ -41,7 +41,7 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "absl/types/optional.h" -#include +#include "protos/google/cloud/spanner/testing/singer.pb.h" #include #include #include diff --git a/google/cloud/spanner/spanner_client_unit_tests.bzl b/google/cloud/spanner/spanner_client_unit_tests.bzl index ad40b1f607946..6a501b33fdeb2 100644 --- a/google/cloud/spanner/spanner_client_unit_tests.bzl +++ b/google/cloud/spanner/spanner_client_unit_tests.bzl @@ -19,16 +19,11 @@ spanner_client_unit_tests = [ "backup_test.cc", "bytes_test.cc", - "client_options_test.cc", "client_test.cc", "commit_options_test.cc", "connection_options_test.cc", "create_instance_request_builder_test.cc", - "database_admin_client_test.cc", - "database_admin_connection_test.cc", "database_test.cc", - "instance_admin_client_test.cc", - "instance_admin_connection_test.cc", "instance_test.cc", "internal/connection_impl_test.cc", "internal/database_admin_logging_test.cc", diff --git a/google/cloud/spanner/sql_statement.h b/google/cloud/spanner/sql_statement.h index 4c3d80dd60cf7..ae33854a22ac3 100644 --- a/google/cloud/spanner/sql_statement.h +++ b/google/cloud/spanner/sql_statement.h @@ -18,7 +18,7 @@ #include "google/cloud/spanner/value.h" #include "google/cloud/spanner/version.h" #include "google/cloud/status_or.h" -#include +#include "google/spanner/v1/spanner.pb.h" #include #include #include diff --git a/google/cloud/spanner/testing/database_integration_test.cc b/google/cloud/spanner/testing/database_integration_test.cc index 170ee3c09c399..34d5d12bf843e 100644 --- a/google/cloud/spanner/testing/database_integration_test.cc +++ b/google/cloud/spanner/testing/database_integration_test.cc @@ -20,7 +20,7 @@ #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "protos/google/cloud/spanner/testing/singer.pb.h" #include #include diff --git a/google/cloud/spanner/testing/pick_instance_config.h b/google/cloud/spanner/testing/pick_instance_config.h index 26b7cd0875af2..b5d5959677a1e 100644 --- a/google/cloud/spanner/testing/pick_instance_config.h +++ b/google/cloud/spanner/testing/pick_instance_config.h @@ -18,7 +18,7 @@ #include "google/cloud/spanner/version.h" #include "google/cloud/internal/random.h" #include "google/cloud/project.h" -#include +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include #include diff --git a/google/cloud/spanner/testing/status_utils.cc b/google/cloud/spanner/testing/status_utils.cc index 1629f3110bd60..3648896eab509 100644 --- a/google/cloud/spanner/testing/status_utils.cc +++ b/google/cloud/spanner/testing/status_utils.cc @@ -15,9 +15,9 @@ #include "google/cloud/spanner/testing/status_utils.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/absl_str_cat_quiet.h" -#include -#include -#include +#include "google/rpc/error_details.pb.h" +#include "google/rpc/status.pb.h" +#include "google/spanner/v1/spanner.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/spanner/timestamp.h b/google/cloud/spanner/timestamp.h index 11d05023f7277..27ec07416fafe 100644 --- a/google/cloud/spanner/timestamp.h +++ b/google/cloud/spanner/timestamp.h @@ -18,7 +18,7 @@ #include "google/cloud/spanner/version.h" #include "google/cloud/status_or.h" #include "absl/time/time.h" -#include +#include "google/protobuf/timestamp.pb.h" #include #include #include diff --git a/google/cloud/spanner/timestamp_test.cc b/google/cloud/spanner/timestamp_test.cc index 09262ec45c741..31dad46016ce4 100644 --- a/google/cloud/spanner/timestamp_test.cc +++ b/google/cloud/spanner/timestamp_test.cc @@ -14,7 +14,7 @@ #include "google/cloud/spanner/timestamp.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/protobuf/timestamp.pb.h" #include #include #include diff --git a/google/cloud/spanner/transaction.cc b/google/cloud/spanner/transaction.cc index 07d9c9edd464d..c4284201916a3 100644 --- a/google/cloud/spanner/transaction.cc +++ b/google/cloud/spanner/transaction.cc @@ -16,7 +16,7 @@ #include "google/cloud/spanner/internal/session.h" #include "google/cloud/spanner/internal/transaction_impl.h" #include "google/cloud/spanner/options.h" -#include +#include "google/protobuf/duration.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/spanner/transaction.h b/google/cloud/spanner/transaction.h index 0949d52229a7f..48a8d88c0b2c7 100644 --- a/google/cloud/spanner/transaction.h +++ b/google/cloud/spanner/transaction.h @@ -19,7 +19,7 @@ #include "google/cloud/spanner/timestamp.h" #include "google/cloud/spanner/version.h" #include "absl/types/optional.h" -#include +#include "google/spanner/v1/transaction.pb.h" #include #include #include diff --git a/google/cloud/spanner/update_instance_request_builder.h b/google/cloud/spanner/update_instance_request_builder.h index 46ee9ba4654ac..3b7b126ae6756 100644 --- a/google/cloud/spanner/update_instance_request_builder.h +++ b/google/cloud/spanner/update_instance_request_builder.h @@ -17,9 +17,9 @@ #include "google/cloud/spanner/instance.h" #include "google/cloud/spanner/version.h" +#include "google/spanner/admin/instance/v1/spanner_instance_admin.pb.h" #include #include -#include #include #include diff --git a/google/cloud/spanner/value.h b/google/cloud/spanner/value.h index d888c4876a547..137eb97ab1af5 100644 --- a/google/cloud/spanner/value.h +++ b/google/cloud/spanner/value.h @@ -33,9 +33,9 @@ #include "google/cloud/status_or.h" #include "absl/time/civil_time.h" #include "absl/types/optional.h" -#include +#include "google/protobuf/struct.pb.h" +#include "google/spanner/v1/type.pb.h" #include -#include #include #include #include diff --git a/google/cloud/spanner/value_test.cc b/google/cloud/spanner/value_test.cc index c604e0778c870..1b627ebee8770 100644 --- a/google/cloud/spanner/value_test.cc +++ b/google/cloud/spanner/value_test.cc @@ -18,7 +18,7 @@ #include "google/cloud/testing_util/status_matchers.h" #include "absl/time/time.h" #include "absl/types/optional.h" -#include +#include "protos/google/cloud/spanner/testing/singer.pb.h" #include #include #include diff --git a/google/cloud/speech/BUILD.bazel b/google/cloud/speech/BUILD.bazel index 7f211c3fcf76e..8bc4806da5b4c 100644 --- a/google/cloud/speech/BUILD.bazel +++ b/google/cloud/speech/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/speech/v1:speech_cc_grpc", - "@com_google_googleapis//google/cloud/speech/v2:speech_cc_grpc", + "@googleapis//google/cloud/speech/v1:speech_cc_grpc", + "@googleapis//google/cloud/speech/v2:speech_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/speech/quickstart/.bazelrc b/google/cloud/speech/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/speech/quickstart/.bazelrc +++ b/google/cloud/speech/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/speech/v1/adaptation_connection.h b/google/cloud/speech/v1/adaptation_connection.h index 8a05fec6aaa07..9364d15c5dd69 100644 --- a/google/cloud/speech/v1/adaptation_connection.h +++ b/google/cloud/speech/v1/adaptation_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_ADAPTATION_CONNECTION_H #include "google/cloud/speech/v1/adaptation_connection_idempotency_policy.h" +#include "google/cloud/speech/v1/cloud_speech_adaptation.pb.h" #include "google/cloud/speech/v1/internal/adaptation_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/speech/v1/adaptation_connection_idempotency_policy.h b/google/cloud/speech/v1/adaptation_connection_idempotency_policy.h index d9eb54dd36a7e..d419b05a43ae6 100644 --- a/google/cloud/speech/v1/adaptation_connection_idempotency_policy.h +++ b/google/cloud/speech/v1/adaptation_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_ADAPTATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_ADAPTATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/speech/v1/cloud_speech_adaptation.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/speech/v1/internal/adaptation_auth_decorator.cc b/google/cloud/speech/v1/internal/adaptation_auth_decorator.cc index 200f07d57167b..e8835c577d826 100644 --- a/google/cloud/speech/v1/internal/adaptation_auth_decorator.cc +++ b/google/cloud/speech/v1/internal/adaptation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/speech/v1/cloud_speech_adaptation.proto #include "google/cloud/speech/v1/internal/adaptation_auth_decorator.h" -#include +#include "google/cloud/speech/v1/cloud_speech_adaptation.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/internal/adaptation_logging_decorator.cc b/google/cloud/speech/v1/internal/adaptation_logging_decorator.cc index a84b5d529af17..9539335d11d39 100644 --- a/google/cloud/speech/v1/internal/adaptation_logging_decorator.cc +++ b/google/cloud/speech/v1/internal/adaptation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/speech/v1/cloud_speech_adaptation.proto #include "google/cloud/speech/v1/internal/adaptation_logging_decorator.h" +#include "google/cloud/speech/v1/cloud_speech_adaptation.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/speech/v1/internal/adaptation_metadata_decorator.cc b/google/cloud/speech/v1/internal/adaptation_metadata_decorator.cc index 312dd4892dd78..169d275721b0b 100644 --- a/google/cloud/speech/v1/internal/adaptation_metadata_decorator.cc +++ b/google/cloud/speech/v1/internal/adaptation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/speech/v1/cloud_speech_adaptation.proto #include "google/cloud/speech/v1/internal/adaptation_metadata_decorator.h" +#include "google/cloud/speech/v1/cloud_speech_adaptation.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 #include #include #include diff --git a/google/cloud/speech/v1/internal/adaptation_stub.cc b/google/cloud/speech/v1/internal/adaptation_stub.cc index d344e21695ea1..6e04e2d166d10 100644 --- a/google/cloud/speech/v1/internal/adaptation_stub.cc +++ b/google/cloud/speech/v1/internal/adaptation_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/speech/v1/cloud_speech_adaptation.proto #include "google/cloud/speech/v1/internal/adaptation_stub.h" +#include "google/cloud/speech/v1/cloud_speech_adaptation.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/speech/v1/internal/adaptation_stub.h b/google/cloud/speech/v1/internal/adaptation_stub.h index d3958e3be9163..72496a498c668 100644 --- a/google/cloud/speech/v1/internal/adaptation_stub.h +++ b/google/cloud/speech/v1/internal/adaptation_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_INTERNAL_ADAPTATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_INTERNAL_ADAPTATION_STUB_H +#include "google/cloud/speech/v1/cloud_speech_adaptation.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/internal/adaptation_stub_factory.cc b/google/cloud/speech/v1/internal/adaptation_stub_factory.cc index 79612b3e89d64..78e62861bf72d 100644 --- a/google/cloud/speech/v1/internal/adaptation_stub_factory.cc +++ b/google/cloud/speech/v1/internal/adaptation_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/speech/v1/cloud_speech_adaptation.proto #include "google/cloud/speech/v1/internal/adaptation_stub_factory.h" +#include "google/cloud/speech/v1/cloud_speech_adaptation.grpc.pb.h" #include "google/cloud/speech/v1/internal/adaptation_auth_decorator.h" #include "google/cloud/speech/v1/internal/adaptation_logging_decorator.h" #include "google/cloud/speech/v1/internal/adaptation_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc b/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc index c257af21efe52..3fe8e44619f92 100644 --- a/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc +++ b/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AdaptationTracingConnection::AdaptationTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -145,16 +143,12 @@ AdaptationTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAdaptationTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/speech/v1/internal/adaptation_tracing_connection.h b/google/cloud/speech/v1/internal/adaptation_tracing_connection.h index 8a9fe20d67bc5..9e67ac2fac0a0 100644 --- a/google/cloud/speech/v1/internal/adaptation_tracing_connection.h +++ b/google/cloud/speech/v1/internal/adaptation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AdaptationTracingConnection : public speech_v1::AdaptationConnection { public: ~AdaptationTracingConnection() override = default; @@ -85,8 +83,6 @@ class AdaptationTracingConnection : public speech_v1::AdaptationConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/speech/v1/internal/adaptation_tracing_stub.cc b/google/cloud/speech/v1/internal/adaptation_tracing_stub.cc index b215d4dfa5ba4..f194efa0c72c2 100644 --- a/google/cloud/speech/v1/internal/adaptation_tracing_stub.cc +++ b/google/cloud/speech/v1/internal/adaptation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - AdaptationTracingStub::AdaptationTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -173,15 +171,9 @@ StatusOr AdaptationTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeAdaptationTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/speech/v1/internal/adaptation_tracing_stub.h b/google/cloud/speech/v1/internal/adaptation_tracing_stub.h index c90f7b696b072..380242c3c07d1 100644 --- a/google/cloud/speech/v1/internal/adaptation_tracing_stub.h +++ b/google/cloud/speech/v1/internal/adaptation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class AdaptationTracingStub : public AdaptationStub { public: ~AdaptationTracingStub() override = default; @@ -99,8 +97,6 @@ class AdaptationTracingStub : public AdaptationStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/speech/v1/internal/speech_auth_decorator.cc b/google/cloud/speech/v1/internal/speech_auth_decorator.cc index 757ce0eefb590..e2ceb377ee8e8 100644 --- a/google/cloud/speech/v1/internal/speech_auth_decorator.cc +++ b/google/cloud/speech/v1/internal/speech_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/speech/v1/cloud_speech.proto #include "google/cloud/speech/v1/internal/speech_auth_decorator.h" +#include "google/cloud/speech/v1/cloud_speech.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/speech/v1/internal/speech_auth_decorator.h b/google/cloud/speech/v1/internal/speech_auth_decorator.h index 6cbdf1ee3f2ce..93c9742faf67b 100644 --- a/google/cloud/speech/v1/internal/speech_auth_decorator.h +++ b/google/cloud/speech/v1/internal/speech_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/speech/v1/internal/speech_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v1/internal/speech_connection_impl.h b/google/cloud/speech/v1/internal/speech_connection_impl.h index 471dc894e89eb..940fa78ef6bef 100644 --- a/google/cloud/speech/v1/internal/speech_connection_impl.h +++ b/google/cloud/speech/v1/internal/speech_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/speech/v1/internal/speech_logging_decorator.cc b/google/cloud/speech/v1/internal/speech_logging_decorator.cc index 98066d2c2aa89..6ebf2fe652572 100644 --- a/google/cloud/speech/v1/internal/speech_logging_decorator.cc +++ b/google/cloud/speech/v1/internal/speech_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/speech/v1/cloud_speech.proto #include "google/cloud/speech/v1/internal/speech_logging_decorator.h" +#include "google/cloud/speech/v1/cloud_speech.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/speech/v1/internal/speech_logging_decorator.h b/google/cloud/speech/v1/internal/speech_logging_decorator.h index 5bcb5e9c441ae..a09d854a88185 100644 --- a/google/cloud/speech/v1/internal/speech_logging_decorator.h +++ b/google/cloud/speech/v1/internal/speech_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/speech/v1/internal/speech_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v1/internal/speech_metadata_decorator.cc b/google/cloud/speech/v1/internal/speech_metadata_decorator.cc index 2663bc75c9c76..813ffa91a373d 100644 --- a/google/cloud/speech/v1/internal/speech_metadata_decorator.cc +++ b/google/cloud/speech/v1/internal/speech_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/speech/v1/cloud_speech.proto #include "google/cloud/speech/v1/internal/speech_metadata_decorator.h" +#include "google/cloud/speech/v1/cloud_speech.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 #include #include #include diff --git a/google/cloud/speech/v1/internal/speech_metadata_decorator.h b/google/cloud/speech/v1/internal/speech_metadata_decorator.h index 4d0e90d1fded6..8854d82280fe4 100644 --- a/google/cloud/speech/v1/internal/speech_metadata_decorator.h +++ b/google/cloud/speech/v1/internal/speech_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/speech/v1/internal/speech_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v1/internal/speech_stub.cc b/google/cloud/speech/v1/internal/speech_stub.cc index f1d635cb54942..a561d50e501e3 100644 --- a/google/cloud/speech/v1/internal/speech_stub.cc +++ b/google/cloud/speech/v1/internal/speech_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/speech/v1/cloud_speech.proto #include "google/cloud/speech/v1/internal/speech_stub.h" +#include "google/cloud/speech/v1/cloud_speech.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/internal/speech_stub.h b/google/cloud/speech/v1/internal/speech_stub.h index 404d8dab06263..96382b97cd244 100644 --- a/google/cloud/speech/v1/internal/speech_stub.h +++ b/google/cloud/speech/v1/internal/speech_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_INTERNAL_SPEECH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_INTERNAL_SPEECH_STUB_H +#include "google/cloud/speech/v1/cloud_speech.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/internal/speech_stub_factory.cc b/google/cloud/speech/v1/internal/speech_stub_factory.cc index 3005e1eb4be59..d653c41fbc80c 100644 --- a/google/cloud/speech/v1/internal/speech_stub_factory.cc +++ b/google/cloud/speech/v1/internal/speech_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/speech/v1/cloud_speech.proto #include "google/cloud/speech/v1/internal/speech_stub_factory.h" +#include "google/cloud/speech/v1/cloud_speech.grpc.pb.h" #include "google/cloud/speech/v1/internal/speech_auth_decorator.h" #include "google/cloud/speech/v1/internal/speech_logging_decorator.h" #include "google/cloud/speech/v1/internal/speech_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/internal/speech_tracing_connection.cc b/google/cloud/speech/v1/internal/speech_tracing_connection.cc index 4d680eadd758c..8cc000ee16af2 100644 --- a/google/cloud/speech/v1/internal/speech_tracing_connection.cc +++ b/google/cloud/speech/v1/internal/speech_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpeechTracingConnection::SpeechTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -96,15 +94,11 @@ StatusOr SpeechTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpeechTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/speech/v1/internal/speech_tracing_connection.h b/google/cloud/speech/v1/internal/speech_tracing_connection.h index 705d74ddccfac..a48357f0652e9 100644 --- a/google/cloud/speech/v1/internal/speech_tracing_connection.h +++ b/google/cloud/speech/v1/internal/speech_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpeechTracingConnection : public speech_v1::SpeechConnection { public: ~SpeechTracingConnection() override = default; @@ -71,8 +69,6 @@ class SpeechTracingConnection : public speech_v1::SpeechConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/speech/v1/internal/speech_tracing_stub.cc b/google/cloud/speech/v1/internal/speech_tracing_stub.cc index a204626591229..d19eca2bc4ba9 100644 --- a/google/cloud/speech/v1/internal/speech_tracing_stub.cc +++ b/google/cloud/speech/v1/internal/speech_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpeechTracingStub::SpeechTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -140,15 +138,9 @@ future SpeechTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpeechTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/speech/v1/internal/speech_tracing_stub.h b/google/cloud/speech/v1/internal/speech_tracing_stub.h index 32ebbf32b9335..f3bec35d94214 100644 --- a/google/cloud/speech/v1/internal/speech_tracing_stub.h +++ b/google/cloud/speech/v1/internal/speech_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace speech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpeechTracingStub : public SpeechStub { public: ~SpeechTracingStub() override = default; @@ -88,8 +86,6 @@ class SpeechTracingStub : public SpeechStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/speech/v1/speech_client.h b/google/cloud/speech/v1/speech_client.h index 321d1ffc0b8a5..b7cf192cefcc9 100644 --- a/google/cloud/speech/v1/speech_client.h +++ b/google/cloud/speech/v1/speech_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v1/speech_connection.h b/google/cloud/speech/v1/speech_connection.h index 706e288c0bf9c..1924d14d2df94 100644 --- a/google/cloud/speech/v1/speech_connection.h +++ b/google/cloud/speech/v1/speech_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_SPEECH_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_SPEECH_CONNECTION_H +#include "google/cloud/speech/v1/cloud_speech.pb.h" #include "google/cloud/speech/v1/internal/speech_retry_traits.h" #include "google/cloud/speech/v1/speech_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -31,8 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/speech/v1/speech_connection_idempotency_policy.h b/google/cloud/speech/v1/speech_connection_idempotency_policy.h index 470090a8926c9..bf3cd2dc53d7c 100644 --- a/google/cloud/speech/v1/speech_connection_idempotency_policy.h +++ b/google/cloud/speech/v1/speech_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V1_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/speech/v1/cloud_speech.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/speech/v2/internal/speech_auth_decorator.cc b/google/cloud/speech/v2/internal/speech_auth_decorator.cc index 2548d0a5fa3f6..f30d09b555292 100644 --- a/google/cloud/speech/v2/internal/speech_auth_decorator.cc +++ b/google/cloud/speech/v2/internal/speech_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/speech/v2/cloud_speech.proto #include "google/cloud/speech/v2/internal/speech_auth_decorator.h" +#include "google/cloud/speech/v2/cloud_speech.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/speech/v2/internal/speech_auth_decorator.h b/google/cloud/speech/v2/internal/speech_auth_decorator.h index b097cbdba1322..738b3820e372d 100644 --- a/google/cloud/speech/v2/internal/speech_auth_decorator.h +++ b/google/cloud/speech/v2/internal/speech_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/speech/v2/internal/speech_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v2/internal/speech_connection_impl.h b/google/cloud/speech/v2/internal/speech_connection_impl.h index c25fde9d80893..85e09d6232ac6 100644 --- a/google/cloud/speech/v2/internal/speech_connection_impl.h +++ b/google/cloud/speech/v2/internal/speech_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/speech/v2/internal/speech_logging_decorator.cc b/google/cloud/speech/v2/internal/speech_logging_decorator.cc index 0ef00f263e678..f65c04e3924f8 100644 --- a/google/cloud/speech/v2/internal/speech_logging_decorator.cc +++ b/google/cloud/speech/v2/internal/speech_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/speech/v2/cloud_speech.proto #include "google/cloud/speech/v2/internal/speech_logging_decorator.h" +#include "google/cloud/speech/v2/cloud_speech.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/speech/v2/internal/speech_logging_decorator.h b/google/cloud/speech/v2/internal/speech_logging_decorator.h index b5e97c3951d00..3076db3edb9b1 100644 --- a/google/cloud/speech/v2/internal/speech_logging_decorator.h +++ b/google/cloud/speech/v2/internal/speech_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/speech/v2/internal/speech_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v2/internal/speech_metadata_decorator.cc b/google/cloud/speech/v2/internal/speech_metadata_decorator.cc index 4c0b2cbd76e80..e1c927d2e43ad 100644 --- a/google/cloud/speech/v2/internal/speech_metadata_decorator.cc +++ b/google/cloud/speech/v2/internal/speech_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/speech/v2/cloud_speech.proto #include "google/cloud/speech/v2/internal/speech_metadata_decorator.h" +#include "google/cloud/speech/v2/cloud_speech.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 #include #include #include diff --git a/google/cloud/speech/v2/internal/speech_metadata_decorator.h b/google/cloud/speech/v2/internal/speech_metadata_decorator.h index a30d439aa5954..6b19fc5568ee3 100644 --- a/google/cloud/speech/v2/internal/speech_metadata_decorator.h +++ b/google/cloud/speech/v2/internal/speech_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/speech/v2/internal/speech_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v2/internal/speech_stub.cc b/google/cloud/speech/v2/internal/speech_stub.cc index 03e60e63c6850..e2abb1ea68d78 100644 --- a/google/cloud/speech/v2/internal/speech_stub.cc +++ b/google/cloud/speech/v2/internal/speech_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/speech/v2/cloud_speech.proto #include "google/cloud/speech/v2/internal/speech_stub.h" +#include "google/cloud/speech/v2/cloud_speech.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v2/internal/speech_stub.h b/google/cloud/speech/v2/internal/speech_stub.h index 8b3da0a839668..9bb412d2272c7 100644 --- a/google/cloud/speech/v2/internal/speech_stub.h +++ b/google/cloud/speech/v2/internal/speech_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V2_INTERNAL_SPEECH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V2_INTERNAL_SPEECH_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/speech/v2/cloud_speech.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v2/internal/speech_stub_factory.cc b/google/cloud/speech/v2/internal/speech_stub_factory.cc index 234472c27e88b..8f824ae66da62 100644 --- a/google/cloud/speech/v2/internal/speech_stub_factory.cc +++ b/google/cloud/speech/v2/internal/speech_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/speech/v2/cloud_speech.proto #include "google/cloud/speech/v2/internal/speech_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/speech/v2/cloud_speech.grpc.pb.h" #include "google/cloud/speech/v2/internal/speech_auth_decorator.h" #include "google/cloud/speech/v2/internal/speech_logging_decorator.h" #include "google/cloud/speech/v2/internal/speech_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v2/internal/speech_tracing_connection.cc b/google/cloud/speech/v2/internal/speech_tracing_connection.cc index 0efaeaa2e73f1..71d3b79454ff0 100644 --- a/google/cloud/speech/v2/internal/speech_tracing_connection.cc +++ b/google/cloud/speech/v2/internal/speech_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace speech_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpeechTracingConnection::SpeechTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -555,15 +553,11 @@ Status SpeechTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpeechTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/speech/v2/internal/speech_tracing_connection.h b/google/cloud/speech/v2/internal/speech_tracing_connection.h index 1c2fc7be4f0ed..43e16138e1995 100644 --- a/google/cloud/speech/v2/internal/speech_tracing_connection.h +++ b/google/cloud/speech/v2/internal/speech_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace speech_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpeechTracingConnection : public speech_v2::SpeechConnection { public: ~SpeechTracingConnection() override = default; @@ -248,8 +246,6 @@ class SpeechTracingConnection : public speech_v2::SpeechConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/speech/v2/internal/speech_tracing_stub.cc b/google/cloud/speech/v2/internal/speech_tracing_stub.cc index 24199bfe37cba..35f8062fd8909 100644 --- a/google/cloud/speech/v2/internal/speech_tracing_stub.cc +++ b/google/cloud/speech/v2/internal/speech_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace speech_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SpeechTracingStub::SpeechTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -589,15 +587,9 @@ future SpeechTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSpeechTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/speech/v2/internal/speech_tracing_stub.h b/google/cloud/speech/v2/internal/speech_tracing_stub.h index 61b985aa8c805..f3eab02d8fb53 100644 --- a/google/cloud/speech/v2/internal/speech_tracing_stub.h +++ b/google/cloud/speech/v2/internal/speech_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace speech_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SpeechTracingStub : public SpeechStub { public: ~SpeechTracingStub() override = default; @@ -280,8 +278,6 @@ class SpeechTracingStub : public SpeechStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/speech/v2/speech_client.h b/google/cloud/speech/v2/speech_client.h index fea1d5c61a7e1..40b05bf735f1e 100644 --- a/google/cloud/speech/v2/speech_client.h +++ b/google/cloud/speech/v2/speech_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/speech/v2/speech_connection.h b/google/cloud/speech/v2/speech_connection.h index 99c252621fec5..d9c73527c6020 100644 --- a/google/cloud/speech/v2/speech_connection.h +++ b/google/cloud/speech/v2/speech_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V2_SPEECH_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V2_SPEECH_CONNECTION_H +#include "google/cloud/speech/v2/cloud_speech.pb.h" #include "google/cloud/speech/v2/internal/speech_retry_traits.h" #include "google/cloud/speech/v2/speech_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -31,8 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/speech/v2/speech_connection_idempotency_policy.h b/google/cloud/speech/v2/speech_connection_idempotency_policy.h index 61453cf20b41b..0289eae86aeed 100644 --- a/google/cloud/speech/v2/speech_connection_idempotency_policy.h +++ b/google/cloud/speech/v2/speech_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V2_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_V2_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/speech/v2/cloud_speech.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/sql/BUILD.bazel b/google/cloud/sql/BUILD.bazel index 8bcbb6aa9c84f..6eaf7edb26433 100644 --- a/google/cloud/sql/BUILD.bazel +++ b/google/cloud/sql/BUILD.bazel @@ -23,7 +23,7 @@ service_dirs = ["v1/"] src_dirs = service_dirs + [d + "internal/" for d in service_dirs] googleapis_deps = [ - "@com_google_googleapis//google/cloud/sql/v1:sql_cc_proto", + "@googleapis//google/cloud/sql/v1:sql_cc_proto", ] cc_gapic_library( diff --git a/google/cloud/sql/quickstart/.bazelrc b/google/cloud/sql/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/sql/quickstart/.bazelrc +++ b/google/cloud/sql/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_logging_decorator.h index cdc4d80649199..962f53d41c0b1 100644 --- a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_AVAILABLE_DATABASE_VERSIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_AVAILABLE_DATABASE_VERSIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_available_database_versions.pb.h" #include "google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_metadata_decorator.h index e32f703b03a83..5906de1755ead 100644 --- a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_AVAILABLE_DATABASE_VERSIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_AVAILABLE_DATABASE_VERSIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_available_database_versions.pb.h" #include "google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.cc b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.cc index 54415b5e70e71..3864ca878d42b 100644 --- a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_available_database_versions.proto #include "google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_available_database_versions.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h index d18301da99b19..5b44f114126e3 100644 --- a/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_available_database_versions_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_AVAILABLE_DATABASE_VERSIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_AVAILABLE_DATABASE_VERSIONS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_available_database_versions.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.cc index caa0950bdf60b..5560c644aebfe 100644 --- a/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.cc @@ -26,27 +26,21 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlAvailableDatabaseVersionsServiceTracingConnection:: SqlAvailableDatabaseVersionsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlAvailableDatabaseVersionsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.h b/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.h index 7ac30e663ccc3..d546178573e71 100644 --- a/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_available_database_versions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlAvailableDatabaseVersionsServiceTracingConnection : public sql_v1::SqlAvailableDatabaseVersionsServiceConnection { public: @@ -45,8 +43,6 @@ class SqlAvailableDatabaseVersionsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_backup_runs_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_backup_runs_rest_logging_decorator.h index 7a134627be870..6faf492076f30 100644 --- a/google/cloud/sql/v1/internal/sql_backup_runs_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_backup_runs_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_BACKUP_RUNS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_BACKUP_RUNS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_backup_runs.pb.h" #include "google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_backup_runs_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_backup_runs_rest_metadata_decorator.h index 747e6214eab5d..b01f120c0f952 100644 --- a/google/cloud/sql/v1/internal/sql_backup_runs_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_backup_runs_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_BACKUP_RUNS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_BACKUP_RUNS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_backup_runs.pb.h" #include "google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.cc b/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.cc index 2ff96a76cb088..349d94ef21929 100644 --- a/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_backup_runs.proto #include "google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_backup_runs.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h b/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h index 2a247f5705d13..de42ffd8cf2b3 100644 --- a/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_backup_runs_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_BACKUP_RUNS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_BACKUP_RUNS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_backup_runs.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.cc index 95d34e3ff9c19..cb3d04404ffb7 100644 --- a/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlBackupRunsServiceTracingConnection::SqlBackupRunsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -67,17 +65,13 @@ SqlBackupRunsServiceTracingConnection::List( return internal::EndSpan(*span, child_->List(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlBackupRunsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.h b/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.h index e45b55897f792..f393055761297 100644 --- a/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_backup_runs_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlBackupRunsServiceTracingConnection : public sql_v1::SqlBackupRunsServiceConnection { public: @@ -58,8 +56,6 @@ class SqlBackupRunsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_connect_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_connect_rest_logging_decorator.h index b291b925d1419..4d9557868f50b 100644 --- a/google/cloud/sql/v1/internal/sql_connect_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_connect_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_CONNECT_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_CONNECT_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_connect.pb.h" #include "google/cloud/sql/v1/internal/sql_connect_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_connect_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_connect_rest_metadata_decorator.h index 970422179e6b6..fa01129459f5f 100644 --- a/google/cloud/sql/v1/internal/sql_connect_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_connect_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_CONNECT_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_CONNECT_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_connect.pb.h" #include "google/cloud/sql/v1/internal/sql_connect_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_connect_rest_stub.cc b/google/cloud/sql/v1/internal/sql_connect_rest_stub.cc index fa81b309f37fb..d1578309ecac7 100644 --- a/google/cloud/sql/v1/internal/sql_connect_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_connect_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_connect.proto #include "google/cloud/sql/v1/internal/sql_connect_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_connect.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_connect_rest_stub.h b/google/cloud/sql/v1/internal/sql_connect_rest_stub.h index f5be5b26a5f34..15d04feb6cbaf 100644 --- a/google/cloud/sql/v1/internal/sql_connect_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_connect_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_CONNECT_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_CONNECT_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_connect.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_connect_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_connect_tracing_connection.cc index cd935da020181..1f7b9070b19ea 100644 --- a/google/cloud/sql/v1/internal/sql_connect_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_connect_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlConnectServiceTracingConnection::SqlConnectServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -50,17 +48,13 @@ SqlConnectServiceTracingConnection::GenerateEphemeralCert( return internal::EndSpan(*span, child_->GenerateEphemeralCert(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlConnectServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_connect_tracing_connection.h b/google/cloud/sql/v1/internal/sql_connect_tracing_connection.h index f9b359514d326..4bfe28e4455d2 100644 --- a/google/cloud/sql/v1/internal/sql_connect_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_connect_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlConnectServiceTracingConnection : public sql_v1::SqlConnectServiceConnection { public: @@ -53,8 +51,6 @@ class SqlConnectServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_databases_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_databases_rest_logging_decorator.h index c01240829fcca..58138b68584cd 100644 --- a/google/cloud/sql/v1/internal/sql_databases_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_databases_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_DATABASES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_DATABASES_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_databases.pb.h" #include "google/cloud/sql/v1/internal/sql_databases_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_databases_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_databases_rest_metadata_decorator.h index dc3b740bb3356..d7a283a68064f 100644 --- a/google/cloud/sql/v1/internal/sql_databases_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_databases_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_DATABASES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_DATABASES_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_databases.pb.h" #include "google/cloud/sql/v1/internal/sql_databases_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_databases_rest_stub.cc b/google/cloud/sql/v1/internal/sql_databases_rest_stub.cc index 75c1bb1a1a041..f2b8371c0ebfa 100644 --- a/google/cloud/sql/v1/internal/sql_databases_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_databases_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_databases.proto #include "google/cloud/sql/v1/internal/sql_databases_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_databases.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_databases_rest_stub.h b/google/cloud/sql/v1/internal/sql_databases_rest_stub.h index da73cf3ac4ef3..4c837af5c02ac 100644 --- a/google/cloud/sql/v1/internal/sql_databases_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_databases_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_DATABASES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_DATABASES_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_databases.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_databases_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_databases_tracing_connection.cc index a3caf03a8dd12..d261e927ad333 100644 --- a/google/cloud/sql/v1/internal/sql_databases_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_databases_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlDatabasesServiceTracingConnection::SqlDatabasesServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -84,17 +82,13 @@ SqlDatabasesServiceTracingConnection::Update( return internal::EndSpan(*span, child_->Update(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlDatabasesServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_databases_tracing_connection.h b/google/cloud/sql/v1/internal/sql_databases_tracing_connection.h index b0e04431aef22..d0879cc12401a 100644 --- a/google/cloud/sql/v1/internal/sql_databases_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_databases_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlDatabasesServiceTracingConnection : public sql_v1::SqlDatabasesServiceConnection { public: @@ -66,8 +64,6 @@ class SqlDatabasesServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_events_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_events_rest_logging_decorator.h index 609a0402219b2..991bf4910b386 100644 --- a/google/cloud/sql/v1/internal/sql_events_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_events_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_EVENTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_EVENTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_events.pb.h" #include "google/cloud/sql/v1/internal/sql_events_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_events_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_events_rest_metadata_decorator.h index 5df73f2e64aca..5116d2f3fdb4c 100644 --- a/google/cloud/sql/v1/internal/sql_events_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_events_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_EVENTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_EVENTS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_events.pb.h" #include "google/cloud/sql/v1/internal/sql_events_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_events_rest_stub.cc b/google/cloud/sql/v1/internal/sql_events_rest_stub.cc index 4b52fc09bab4c..f1920b665a5d2 100644 --- a/google/cloud/sql/v1/internal/sql_events_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_events_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_events.proto #include "google/cloud/sql/v1/internal/sql_events_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_events.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_events_rest_stub.h b/google/cloud/sql/v1/internal/sql_events_rest_stub.h index 9b248e611c6a6..1e3d1887b38cc 100644 --- a/google/cloud/sql/v1/internal/sql_events_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_events_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_EVENTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_EVENTS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_events.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_events_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_events_tracing_connection.cc index 7cfc14f5f7448..0a7a53178359e 100644 --- a/google/cloud/sql/v1/internal/sql_events_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_events_tracing_connection.cc @@ -26,22 +26,16 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlEventsServiceTracingConnection::SqlEventsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlEventsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_events_tracing_connection.h b/google/cloud/sql/v1/internal/sql_events_tracing_connection.h index edea58e81f587..cb471bf58ccd8 100644 --- a/google/cloud/sql/v1/internal/sql_events_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_events_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlEventsServiceTracingConnection : public sql_v1::SqlEventsServiceConnection { public: @@ -44,8 +42,6 @@ class SqlEventsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_flags_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_flags_rest_logging_decorator.h index 354bf3d088553..8bda83927e7c7 100644 --- a/google/cloud/sql/v1/internal/sql_flags_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_flags_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_FLAGS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_FLAGS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_flags.pb.h" #include "google/cloud/sql/v1/internal/sql_flags_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_flags_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_flags_rest_metadata_decorator.h index 5852f9b97705b..e14b341432247 100644 --- a/google/cloud/sql/v1/internal/sql_flags_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_flags_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_FLAGS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_FLAGS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_flags.pb.h" #include "google/cloud/sql/v1/internal/sql_flags_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_flags_rest_stub.cc b/google/cloud/sql/v1/internal/sql_flags_rest_stub.cc index a921c08e54643..2d2d193f82d54 100644 --- a/google/cloud/sql/v1/internal/sql_flags_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_flags_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_flags.proto #include "google/cloud/sql/v1/internal/sql_flags_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_flags.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_flags_rest_stub.h b/google/cloud/sql/v1/internal/sql_flags_rest_stub.h index ea7834f9150fb..c86a19c9f9654 100644 --- a/google/cloud/sql/v1/internal/sql_flags_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_flags_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_FLAGS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_FLAGS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_flags.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_flags_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_flags_tracing_connection.cc index 87ce6fc57f711..91527018b0c5b 100644 --- a/google/cloud/sql/v1/internal/sql_flags_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_flags_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlFlagsServiceTracingConnection::SqlFlagsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -40,16 +38,12 @@ SqlFlagsServiceTracingConnection::List( return internal::EndSpan(*span, child_->List(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlFlagsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_flags_tracing_connection.h b/google/cloud/sql/v1/internal/sql_flags_tracing_connection.h index bf6f282ab7897..f6f851fd3d87d 100644 --- a/google/cloud/sql/v1/internal/sql_flags_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_flags_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlFlagsServiceTracingConnection : public sql_v1::SqlFlagsServiceConnection { public: @@ -47,8 +45,6 @@ class SqlFlagsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_iam_policies_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_iam_policies_rest_logging_decorator.h index 3716c338235b5..5577600e7693c 100644 --- a/google/cloud/sql/v1/internal/sql_iam_policies_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_iam_policies_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_IAM_POLICIES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_IAM_POLICIES_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_iam_policies.pb.h" #include "google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_iam_policies_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_iam_policies_rest_metadata_decorator.h index 151f7d279fbd2..87788e00ea2ca 100644 --- a/google/cloud/sql/v1/internal/sql_iam_policies_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_iam_policies_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_IAM_POLICIES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_IAM_POLICIES_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_iam_policies.pb.h" #include "google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.cc b/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.cc index c5a5438d81799..4f8ac4eff34bb 100644 --- a/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_iam_policies.proto #include "google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_iam_policies.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h b/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h index 6f040aa856fa2..9f4c74c66890a 100644 --- a/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_iam_policies_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_IAM_POLICIES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_IAM_POLICIES_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_iam_policies.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.cc index 305b20b6fc3ce..a8f04198de3ee 100644 --- a/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.cc @@ -26,23 +26,17 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlIamPoliciesServiceTracingConnection::SqlIamPoliciesServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlIamPoliciesServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.h b/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.h index 060bf25807edb..6ba486e1beb56 100644 --- a/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_iam_policies_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlIamPoliciesServiceTracingConnection : public sql_v1::SqlIamPoliciesServiceConnection { public: @@ -44,8 +42,6 @@ class SqlIamPoliciesServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_instance_names_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_instance_names_rest_logging_decorator.h index 593927258df81..42803a94abbb0 100644 --- a/google/cloud/sql/v1/internal/sql_instance_names_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_instance_names_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCE_NAMES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCE_NAMES_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_instance_names.pb.h" #include "google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_instance_names_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_instance_names_rest_metadata_decorator.h index d2deae2874291..fcdebf5302e3b 100644 --- a/google/cloud/sql/v1/internal/sql_instance_names_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_instance_names_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCE_NAMES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCE_NAMES_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_instance_names.pb.h" #include "google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.cc b/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.cc index 58771a0a1bbc5..e3649538ac122 100644 --- a/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_instance_names.proto #include "google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_instance_names.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h b/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h index 51ab64014eaea..0a6cdab4ad2af 100644 --- a/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_instance_names_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCE_NAMES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCE_NAMES_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_instance_names.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.cc index d21bd6ea46716..6afbb25e1d1c5 100644 --- a/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.cc @@ -26,24 +26,18 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlInstanceNamesServiceTracingConnection:: SqlInstanceNamesServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlInstanceNamesServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.h b/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.h index 3ff2df4f55abd..be83fa65807ff 100644 --- a/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_instance_names_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlInstanceNamesServiceTracingConnection : public sql_v1::SqlInstanceNamesServiceConnection { public: @@ -44,8 +42,6 @@ class SqlInstanceNamesServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_instances_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_instances_rest_logging_decorator.h index 1ed78309c54ae..edf82a1d6df6f 100644 --- a/google/cloud/sql/v1/internal/sql_instances_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_instances_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCES_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCES_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_instances.pb.h" #include "google/cloud/sql/v1/internal/sql_instances_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_instances_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_instances_rest_metadata_decorator.h index 2584834dec364..65f644f27015a 100644 --- a/google/cloud/sql/v1/internal/sql_instances_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_instances_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCES_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCES_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_instances.pb.h" #include "google/cloud/sql/v1/internal/sql_instances_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc b/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc index 23892dd8295d8..a72881dcb13a4 100644 --- a/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_instances.proto #include "google/cloud/sql/v1/internal/sql_instances_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_instances.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_instances_rest_stub.h b/google/cloud/sql/v1/internal/sql_instances_rest_stub.h index 1547f912dbd60..e14ed0d2794de 100644 --- a/google/cloud/sql/v1/internal/sql_instances_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_instances_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCES_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_INSTANCES_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_instances.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc index 13578c6086f49..25e58c28eff6e 100644 --- a/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlInstancesServiceTracingConnection::SqlInstancesServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -349,17 +347,13 @@ SqlInstancesServiceTracingConnection::ReleaseSsrsLease( return internal::EndSpan(*span, child_->ReleaseSsrsLease(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlInstancesServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_instances_tracing_connection.h b/google/cloud/sql/v1/internal/sql_instances_tracing_connection.h index e460e69331a31..61897e9c1b647 100644 --- a/google/cloud/sql/v1/internal/sql_instances_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_instances_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlInstancesServiceTracingConnection : public sql_v1::SqlInstancesServiceConnection { public: @@ -183,8 +181,6 @@ class SqlInstancesServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_operations_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_operations_rest_logging_decorator.h index faaad29aaabf0..fa5e8290deda4 100644 --- a/google/cloud/sql/v1/internal/sql_operations_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_operations_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_OPERATIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_OPERATIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_operations.pb.h" #include "google/cloud/sql/v1/internal/sql_operations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_operations_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_operations_rest_metadata_decorator.h index 51b49068d598d..626f9f64fd724 100644 --- a/google/cloud/sql/v1/internal/sql_operations_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_operations_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_OPERATIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_OPERATIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_operations.pb.h" #include "google/cloud/sql/v1/internal/sql_operations_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_operations_rest_stub.cc b/google/cloud/sql/v1/internal/sql_operations_rest_stub.cc index c3133516e26ce..882ac6fa0803c 100644 --- a/google/cloud/sql/v1/internal/sql_operations_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_operations_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_operations.proto #include "google/cloud/sql/v1/internal/sql_operations_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_operations.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_operations_rest_stub.h b/google/cloud/sql/v1/internal/sql_operations_rest_stub.h index 1db82f215bc3b..d164fc76bed10 100644 --- a/google/cloud/sql/v1/internal/sql_operations_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_operations_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_OPERATIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_OPERATIONS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_operations.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc index 5b4d66327dec7..0d33bc34fc4ee 100644 --- a/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlOperationsServiceTracingConnection::SqlOperationsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -60,17 +58,13 @@ Status SqlOperationsServiceTracingConnection::Cancel( return internal::EndSpan(*span, child_->Cancel(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlOperationsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_operations_tracing_connection.h b/google/cloud/sql/v1/internal/sql_operations_tracing_connection.h index 80efb7ff87fe3..66e4980dbb862 100644 --- a/google/cloud/sql/v1/internal/sql_operations_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_operations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlOperationsServiceTracingConnection : public sql_v1::SqlOperationsServiceConnection { public: @@ -53,8 +51,6 @@ class SqlOperationsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_regions_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_regions_rest_logging_decorator.h index d15fd9176a26e..be7d8b160b348 100644 --- a/google/cloud/sql/v1/internal/sql_regions_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_regions_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_REGIONS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_REGIONS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_regions.pb.h" #include "google/cloud/sql/v1/internal/sql_regions_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_regions_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_regions_rest_metadata_decorator.h index f95266c5f73f7..8f4b6d6ac9888 100644 --- a/google/cloud/sql/v1/internal/sql_regions_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_regions_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_REGIONS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_REGIONS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_regions.pb.h" #include "google/cloud/sql/v1/internal/sql_regions_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_regions_rest_stub.cc b/google/cloud/sql/v1/internal/sql_regions_rest_stub.cc index c93045f697e34..d951f9987350a 100644 --- a/google/cloud/sql/v1/internal/sql_regions_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_regions_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_regions.proto #include "google/cloud/sql/v1/internal/sql_regions_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_regions.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_regions_rest_stub.h b/google/cloud/sql/v1/internal/sql_regions_rest_stub.h index 40f0e34688fb5..5ec87b50c9c19 100644 --- a/google/cloud/sql/v1/internal/sql_regions_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_regions_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_REGIONS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_REGIONS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_regions.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_regions_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_regions_tracing_connection.cc index 4351588fd3e82..d37c03bff745c 100644 --- a/google/cloud/sql/v1/internal/sql_regions_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_regions_tracing_connection.cc @@ -26,23 +26,17 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlRegionsServiceTracingConnection::SqlRegionsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlRegionsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_regions_tracing_connection.h b/google/cloud/sql/v1/internal/sql_regions_tracing_connection.h index e570ff4ccfbe3..e3b3d62783872 100644 --- a/google/cloud/sql/v1/internal/sql_regions_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_regions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlRegionsServiceTracingConnection : public sql_v1::SqlRegionsServiceConnection { public: @@ -44,8 +42,6 @@ class SqlRegionsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_logging_decorator.h index 6765595ee6ff5..43c3ab9db8946 100644 --- a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_SSL_CERTS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_SSL_CERTS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_ssl_certs.pb.h" #include "google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_metadata_decorator.h index aca7d957b51dc..e5e0b0723ec19 100644 --- a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_SSL_CERTS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_SSL_CERTS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_ssl_certs.pb.h" #include "google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.cc b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.cc index 35e7275be1be4..b532d5daad174 100644 --- a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_ssl_certs.proto #include "google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_ssl_certs.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h index dfa852015f200..d6e6c2b1b3fd8 100644 --- a/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_ssl_certs_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_SSL_CERTS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_SSL_CERTS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_ssl_certs.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.cc index 14fa961160d1c..73390d7e33146 100644 --- a/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlSslCertsServiceTracingConnection::SqlSslCertsServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -66,17 +64,13 @@ SqlSslCertsServiceTracingConnection::List( return internal::EndSpan(*span, child_->List(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlSslCertsServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.h b/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.h index 8beaf09d096f5..fa3567a7bdf20 100644 --- a/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_ssl_certs_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlSslCertsServiceTracingConnection : public sql_v1::SqlSslCertsServiceConnection { public: @@ -56,8 +54,6 @@ class SqlSslCertsServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_tiers_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_tiers_rest_logging_decorator.h index e96676d11be40..941c14f48dedc 100644 --- a/google/cloud/sql/v1/internal/sql_tiers_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_tiers_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_TIERS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_TIERS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_tiers.pb.h" #include "google/cloud/sql/v1/internal/sql_tiers_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_tiers_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_tiers_rest_metadata_decorator.h index ba373041d26d2..471c398f577ca 100644 --- a/google/cloud/sql/v1/internal/sql_tiers_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_tiers_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_TIERS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_TIERS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_tiers.pb.h" #include "google/cloud/sql/v1/internal/sql_tiers_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_tiers_rest_stub.cc b/google/cloud/sql/v1/internal/sql_tiers_rest_stub.cc index 4df4e634f7dcd..8801f901be72b 100644 --- a/google/cloud/sql/v1/internal/sql_tiers_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_tiers_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_tiers.proto #include "google/cloud/sql/v1/internal/sql_tiers_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_tiers.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_tiers_rest_stub.h b/google/cloud/sql/v1/internal/sql_tiers_rest_stub.h index 58960bd4a13a6..61c44390e4d62 100644 --- a/google/cloud/sql/v1/internal/sql_tiers_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_tiers_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_TIERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_TIERS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_tiers.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.cc index bf4e4f21c015f..ca0227189bd3f 100644 --- a/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlTiersServiceTracingConnection::SqlTiersServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -40,16 +38,12 @@ SqlTiersServiceTracingConnection::List( return internal::EndSpan(*span, child_->List(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlTiersServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.h b/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.h index 7b3693d58268b..3c046c3516636 100644 --- a/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_tiers_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlTiersServiceTracingConnection : public sql_v1::SqlTiersServiceConnection { public: @@ -47,8 +45,6 @@ class SqlTiersServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/internal/sql_users_rest_logging_decorator.h b/google/cloud/sql/v1/internal/sql_users_rest_logging_decorator.h index 20838a8ba2c50..b9f708edf5319 100644 --- a/google/cloud/sql/v1/internal/sql_users_rest_logging_decorator.h +++ b/google/cloud/sql/v1/internal/sql_users_rest_logging_decorator.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_USERS_REST_LOGGING_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_USERS_REST_LOGGING_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_users.pb.h" #include "google/cloud/sql/v1/internal/sql_users_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include #include #include #include diff --git a/google/cloud/sql/v1/internal/sql_users_rest_metadata_decorator.h b/google/cloud/sql/v1/internal/sql_users_rest_metadata_decorator.h index a9d2107b576d2..bffe9429b5367 100644 --- a/google/cloud/sql/v1/internal/sql_users_rest_metadata_decorator.h +++ b/google/cloud/sql/v1/internal/sql_users_rest_metadata_decorator.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_USERS_REST_METADATA_DECORATOR_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_USERS_REST_METADATA_DECORATOR_H +#include "google/cloud/sql/v1/cloud_sql_users.pb.h" #include "google/cloud/sql/v1/internal/sql_users_rest_stub.h" #include "google/cloud/future.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_users_rest_stub.cc b/google/cloud/sql/v1/internal/sql_users_rest_stub.cc index 9ca7a082c3ecc..66d9b2018298f 100644 --- a/google/cloud/sql/v1/internal/sql_users_rest_stub.cc +++ b/google/cloud/sql/v1/internal/sql_users_rest_stub.cc @@ -17,11 +17,11 @@ // source: google/cloud/sql/v1/cloud_sql_users.proto #include "google/cloud/sql/v1/internal/sql_users_rest_stub.h" +#include "google/cloud/sql/v1/cloud_sql_users.pb.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/sql/v1/internal/sql_users_rest_stub.h b/google/cloud/sql/v1/internal/sql_users_rest_stub.h index 965a9cd3454f4..a182422afbb74 100644 --- a/google/cloud/sql/v1/internal/sql_users_rest_stub.h +++ b/google/cloud/sql/v1/internal/sql_users_rest_stub.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_USERS_REST_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_INTERNAL_SQL_USERS_REST_STUB_H +#include "google/cloud/sql/v1/cloud_sql_users.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/internal/sql_users_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_users_tracing_connection.cc index b70df674acf51..501fdb6dfa053 100644 --- a/google/cloud/sql/v1/internal/sql_users_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_users_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - SqlUsersServiceTracingConnection::SqlUsersServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -71,16 +69,12 @@ SqlUsersServiceTracingConnection::Update( return internal::EndSpan(*span, child_->Update(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeSqlUsersServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/sql/v1/internal/sql_users_tracing_connection.h b/google/cloud/sql/v1/internal/sql_users_tracing_connection.h index 1fafd3f5c369c..c2562a14ff5e3 100644 --- a/google/cloud/sql/v1/internal/sql_users_tracing_connection.h +++ b/google/cloud/sql/v1/internal/sql_users_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace sql_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class SqlUsersServiceTracingConnection : public sql_v1::SqlUsersServiceConnection { public: @@ -59,8 +57,6 @@ class SqlUsersServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/sql/v1/sql_available_database_versions_connection.h b/google/cloud/sql/v1/sql_available_database_versions_connection.h index 6576fac464dec..c1ac92c8bdff5 100644 --- a/google/cloud/sql/v1/sql_available_database_versions_connection.h +++ b/google/cloud/sql/v1/sql_available_database_versions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_AVAILABLE_DATABASE_VERSIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_AVAILABLE_DATABASE_VERSIONS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_available_database_versions.pb.h" #include "google/cloud/sql/v1/internal/sql_available_database_versions_retry_traits.h" #include "google/cloud/sql/v1/sql_available_database_versions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_available_database_versions_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_available_database_versions_connection_idempotency_policy.h index 71b053a532c76..5a229730aac93 100644 --- a/google/cloud/sql/v1/sql_available_database_versions_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_available_database_versions_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_AVAILABLE_DATABASE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_AVAILABLE_DATABASE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_available_database_versions.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_backup_runs_connection.h b/google/cloud/sql/v1/sql_backup_runs_connection.h index efcd57cd843fd..b49ff1b14c0c0 100644 --- a/google/cloud/sql/v1/sql_backup_runs_connection.h +++ b/google/cloud/sql/v1/sql_backup_runs_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_BACKUP_RUNS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_BACKUP_RUNS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_backup_runs.pb.h" #include "google/cloud/sql/v1/internal/sql_backup_runs_retry_traits.h" #include "google/cloud/sql/v1/sql_backup_runs_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_backup_runs_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_backup_runs_connection_idempotency_policy.h index d3dbfcaf720a7..15b8f43254edc 100644 --- a/google/cloud/sql/v1/sql_backup_runs_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_backup_runs_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_BACKUP_RUNS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_BACKUP_RUNS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_backup_runs.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_connect_connection.h b/google/cloud/sql/v1/sql_connect_connection.h index 774ae47a898d4..e249291440721 100644 --- a/google/cloud/sql/v1/sql_connect_connection.h +++ b/google/cloud/sql/v1/sql_connect_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_CONNECT_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_CONNECT_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_connect.pb.h" #include "google/cloud/sql/v1/internal/sql_connect_retry_traits.h" #include "google/cloud/sql/v1/sql_connect_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_connect_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_connect_connection_idempotency_policy.h index 5f77f2ffb0672..7ddc6041e03a3 100644 --- a/google/cloud/sql/v1/sql_connect_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_connect_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_CONNECT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_CONNECT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_connect.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_databases_connection.h b/google/cloud/sql/v1/sql_databases_connection.h index 504b9dca07ae0..315b22d3ffe0b 100644 --- a/google/cloud/sql/v1/sql_databases_connection.h +++ b/google/cloud/sql/v1/sql_databases_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_DATABASES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_DATABASES_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_databases.pb.h" #include "google/cloud/sql/v1/internal/sql_databases_retry_traits.h" #include "google/cloud/sql/v1/sql_databases_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_databases_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_databases_connection_idempotency_policy.h index 471cb463e24f1..4e7388c6f3974 100644 --- a/google/cloud/sql/v1/sql_databases_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_databases_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_DATABASES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_DATABASES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_databases.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_events_connection.h b/google/cloud/sql/v1/sql_events_connection.h index 722f9fa85596f..b29ca87c41505 100644 --- a/google/cloud/sql/v1/sql_events_connection.h +++ b/google/cloud/sql/v1/sql_events_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_EVENTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_EVENTS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_events.pb.h" #include "google/cloud/sql/v1/internal/sql_events_retry_traits.h" #include "google/cloud/sql/v1/sql_events_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_events_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_events_connection_idempotency_policy.h index 11588d194dcee..8cb120e6df3ff 100644 --- a/google/cloud/sql/v1/sql_events_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_events_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_EVENTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_EVENTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_events.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_flags_connection.h b/google/cloud/sql/v1/sql_flags_connection.h index 1f43563e386af..16adedc1bde06 100644 --- a/google/cloud/sql/v1/sql_flags_connection.h +++ b/google/cloud/sql/v1/sql_flags_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_FLAGS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_FLAGS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_flags.pb.h" #include "google/cloud/sql/v1/internal/sql_flags_retry_traits.h" #include "google/cloud/sql/v1/sql_flags_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_flags_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_flags_connection_idempotency_policy.h index da1bd0c468cc7..2110b9936e0a8 100644 --- a/google/cloud/sql/v1/sql_flags_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_flags_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_FLAGS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_FLAGS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_flags.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_iam_policies_connection.h b/google/cloud/sql/v1/sql_iam_policies_connection.h index 4e3bb2d488d49..74d8ed9d14f5e 100644 --- a/google/cloud/sql/v1/sql_iam_policies_connection.h +++ b/google/cloud/sql/v1/sql_iam_policies_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_IAM_POLICIES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_IAM_POLICIES_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_iam_policies.pb.h" #include "google/cloud/sql/v1/internal/sql_iam_policies_retry_traits.h" #include "google/cloud/sql/v1/sql_iam_policies_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_iam_policies_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_iam_policies_connection_idempotency_policy.h index 4f2c4d89bdae8..2c277c8c17583 100644 --- a/google/cloud/sql/v1/sql_iam_policies_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_iam_policies_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_IAM_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_IAM_POLICIES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_iam_policies.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_instance_names_connection.h b/google/cloud/sql/v1/sql_instance_names_connection.h index c9886606e6633..80433568f1240 100644 --- a/google/cloud/sql/v1/sql_instance_names_connection.h +++ b/google/cloud/sql/v1/sql_instance_names_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCE_NAMES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCE_NAMES_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_instance_names.pb.h" #include "google/cloud/sql/v1/internal/sql_instance_names_retry_traits.h" #include "google/cloud/sql/v1/sql_instance_names_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_instance_names_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_instance_names_connection_idempotency_policy.h index 1e6af25ba1333..bbffe7af88a9d 100644 --- a/google/cloud/sql/v1/sql_instance_names_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_instance_names_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCE_NAMES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCE_NAMES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_instance_names.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_instances_connection.h b/google/cloud/sql/v1/sql_instances_connection.h index f60d5e083112b..63d4dff0a00d8 100644 --- a/google/cloud/sql/v1/sql_instances_connection.h +++ b/google/cloud/sql/v1/sql_instances_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCES_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCES_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_instances.pb.h" #include "google/cloud/sql/v1/internal/sql_instances_retry_traits.h" #include "google/cloud/sql/v1/sql_instances_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_instances_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_instances_connection_idempotency_policy.h index 9b3152d27c722..cf98e01959244 100644 --- a/google/cloud/sql/v1/sql_instances_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_instances_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_instances.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_operations_connection.h b/google/cloud/sql/v1/sql_operations_connection.h index 308c5c0d0a6dc..7368c322b551b 100644 --- a/google/cloud/sql/v1/sql_operations_connection.h +++ b/google/cloud/sql/v1/sql_operations_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_OPERATIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_OPERATIONS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_operations.pb.h" #include "google/cloud/sql/v1/internal/sql_operations_retry_traits.h" #include "google/cloud/sql/v1/sql_operations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_operations_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_operations_connection_idempotency_policy.h index cda1f2473f33b..c063ca7632ba7 100644 --- a/google/cloud/sql/v1/sql_operations_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_operations_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_operations.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_regions_connection.h b/google/cloud/sql/v1/sql_regions_connection.h index 49a891c1ba1d6..39566ba63c571 100644 --- a/google/cloud/sql/v1/sql_regions_connection.h +++ b/google/cloud/sql/v1/sql_regions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_REGIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_REGIONS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_regions.pb.h" #include "google/cloud/sql/v1/internal/sql_regions_retry_traits.h" #include "google/cloud/sql/v1/sql_regions_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_regions_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_regions_connection_idempotency_policy.h index b3ad5ca636762..82ad0242667b2 100644 --- a/google/cloud/sql/v1/sql_regions_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_regions_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_REGIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_REGIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_regions.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_ssl_certs_connection.h b/google/cloud/sql/v1/sql_ssl_certs_connection.h index 72c02c2404fdc..7bd5c49a1a7f5 100644 --- a/google/cloud/sql/v1/sql_ssl_certs_connection.h +++ b/google/cloud/sql/v1/sql_ssl_certs_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_SSL_CERTS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_SSL_CERTS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_ssl_certs.pb.h" #include "google/cloud/sql/v1/internal/sql_ssl_certs_retry_traits.h" #include "google/cloud/sql/v1/sql_ssl_certs_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_ssl_certs_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_ssl_certs_connection_idempotency_policy.h index 2974b4dcc66ff..9205243966459 100644 --- a/google/cloud/sql/v1/sql_ssl_certs_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_ssl_certs_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_SSL_CERTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_SSL_CERTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_ssl_certs.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_tiers_connection.h b/google/cloud/sql/v1/sql_tiers_connection.h index 2f911d7176dd2..e4f4ff31d629e 100644 --- a/google/cloud/sql/v1/sql_tiers_connection.h +++ b/google/cloud/sql/v1/sql_tiers_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_TIERS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_TIERS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_tiers.pb.h" #include "google/cloud/sql/v1/internal/sql_tiers_retry_traits.h" #include "google/cloud/sql/v1/sql_tiers_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_tiers_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_tiers_connection_idempotency_policy.h index 378384f1da51c..b88c2a5a7fad7 100644 --- a/google/cloud/sql/v1/sql_tiers_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_tiers_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_TIERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_TIERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_tiers.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_users_connection.h b/google/cloud/sql/v1/sql_users_connection.h index c46c470fe8d31..239a01ba00b2f 100644 --- a/google/cloud/sql/v1/sql_users_connection.h +++ b/google/cloud/sql/v1/sql_users_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_USERS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_USERS_CONNECTION_H +#include "google/cloud/sql/v1/cloud_sql_users.pb.h" #include "google/cloud/sql/v1/internal/sql_users_retry_traits.h" #include "google/cloud/sql/v1/sql_users_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -26,7 +27,6 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/sql/v1/sql_users_connection_idempotency_policy.h b/google/cloud/sql/v1/sql_users_connection_idempotency_policy.h index 20eff7405ac42..dfbe34ba72df5 100644 --- a/google/cloud/sql/v1/sql_users_connection_idempotency_policy.h +++ b/google/cloud/sql/v1/sql_users_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_USERS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SQL_V1_SQL_USERS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/sql/v1/cloud_sql_users.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/storage/BUILD.bazel b/google/cloud/storage/BUILD.bazel index 2926a5ba7f503..97bd7ebf35e56 100644 --- a/google/cloud/storage/BUILD.bazel +++ b/google/cloud/storage/BUILD.bazel @@ -74,20 +74,19 @@ cc_library( deps = [ ":google_cloud_cpp_storage", "//:grpc_utils", - "@com_github_curl_curl//:curl", - "@com_github_google_crc32c//:crc32c", - "@com_github_grpc_grpc//:grpc++", - "@com_github_nlohmann_json//:json", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_googleapis//google/storage/v2:storage_cc_grpc", - "@com_google_googleapis//google/storage/v2:storage_cc_proto", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@curl", + "@googleapis//google/storage/v2:storage_cc_grpc", + "@googleapis//google/storage/v2:storage_cc_proto", + "@grpc//:grpc++", + "@nlohmann_json//:json", ] + select({ ":grpc_metrics_enabled": [ "//:opentelemetry", - "@com_github_grpc_grpc//:grpcpp_otel_plugin", - "@io_opentelemetry_cpp//sdk/src/metrics", + "@grpc//:grpcpp_otel_plugin", + "@opentelemetry-cpp//sdk/src/metrics", ], "//conditions:default": [], }), @@ -110,7 +109,7 @@ cc_library( deps = [ ":google_cloud_cpp_storage", ":google_cloud_cpp_storage_grpc", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -141,14 +140,14 @@ cc_library( deps = [ "//:common", "//google/cloud:google_cloud_cpp_rest_internal", - "@com_github_curl_curl//:curl", - "@com_github_google_crc32c//:crc32c", - "@com_github_nlohmann_json//:json", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/crc:crc32c", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", + "@curl", + "@nlohmann_json//:json", ] + select({ "@platforms//os:windows": [], "//conditions:default": [ @@ -177,7 +176,7 @@ cc_library( deps = [ ":google_cloud_cpp_storage", "//:common", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -194,8 +193,8 @@ cc_library( "//google/cloud:google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest_main", + "@curl", + "@googletest//:gtest_main", ], ) @@ -211,8 +210,8 @@ cc_library( ":storage_client_testing", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest_main", + "@curl", + "@googletest//:gtest_main", ] + select({ "@platforms//os:windows": [], "//conditions:default": [ @@ -246,9 +245,9 @@ cc_library( "//:mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@curl", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) for test in storage_client_grpc_unit_tests] diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt index b3c2eaa890eb0..32f4e6ccf2094 100644 --- a/google/cloud/storage/CMakeLists.txt +++ b/google/cloud/storage/CMakeLists.txt @@ -30,8 +30,7 @@ google_cloud_cpp_doxygen_targets("storage" DEPENDS cloud-docs include(GoogleCloudCppCommon) -include(IncludeNlohmannJson) -find_package(Crc32c) +find_package(nlohmann_json CONFIG REQUIRED) # Export the version information for Bazel. include(CreateBazelConfig) diff --git a/google/cloud/storage/async/client.h b/google/cloud/storage/async/client.h index f1514a810f54d..f5b6c73c5b38b 100644 --- a/google/cloud/storage/async/client.h +++ b/google/cloud/storage/async/client.h @@ -28,7 +28,7 @@ #include "google/cloud/background_threads.h" #include "google/cloud/internal/group_options.h" #include "google/cloud/status_or.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/async/connection.h b/google/cloud/storage/async/connection.h index 5a03c7678a6a4..0ed76464cfcc9 100644 --- a/google/cloud/storage/async/connection.h +++ b/google/cloud/storage/async/connection.h @@ -23,7 +23,7 @@ #include "google/cloud/future.h" #include "google/cloud/status.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include diff --git a/google/cloud/storage/async/idempotency_policy.h b/google/cloud/storage/async/idempotency_policy.h index bbe020d02c847..c960ff71c175c 100644 --- a/google/cloud/storage/async/idempotency_policy.h +++ b/google/cloud/storage/async/idempotency_policy.h @@ -17,7 +17,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include diff --git a/google/cloud/storage/async/object_descriptor_connection.h b/google/cloud/storage/async/object_descriptor_connection.h index b1a602fad426d..a4992dbed90b7 100644 --- a/google/cloud/storage/async/object_descriptor_connection.h +++ b/google/cloud/storage/async/object_descriptor_connection.h @@ -19,7 +19,7 @@ #include "google/cloud/options.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include diff --git a/google/cloud/storage/async/object_responses.h b/google/cloud/storage/async/object_responses.h index bfab046429183..8a6945d5333fa 100644 --- a/google/cloud/storage/async/object_responses.h +++ b/google/cloud/storage/async/object_responses.h @@ -22,7 +22,7 @@ #include "absl/strings/cord.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/async/rewriter.h b/google/cloud/storage/async/rewriter.h index 922b006eaa6fd..0d75c044b4d94 100644 --- a/google/cloud/storage/async/rewriter.h +++ b/google/cloud/storage/async/rewriter.h @@ -23,7 +23,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/async/rewriter_connection.h b/google/cloud/storage/async/rewriter_connection.h index e7f9829e49e3d..d5cda8f737c24 100644 --- a/google/cloud/storage/async/rewriter_connection.h +++ b/google/cloud/storage/async/rewriter_connection.h @@ -18,7 +18,7 @@ #include "google/cloud/future.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/async/writer.h b/google/cloud/storage/async/writer.h index cd58960b737e3..d4a9a4d3c7653 100644 --- a/google/cloud/storage/async/writer.h +++ b/google/cloud/storage/async/writer.h @@ -22,7 +22,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/types/variant.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/async/writer_connection.h b/google/cloud/storage/async/writer_connection.h index e921b7942b855..e1f3484456b81 100644 --- a/google/cloud/storage/async/writer_connection.h +++ b/google/cloud/storage/async/writer_connection.h @@ -23,7 +23,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/types/variant.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include diff --git a/google/cloud/storage/benchmarks/BUILD.bazel b/google/cloud/storage/benchmarks/BUILD.bazel index ff365a9bda208..30fb66ad7fa05 100644 --- a/google/cloud/storage/benchmarks/BUILD.bazel +++ b/google/cloud/storage/benchmarks/BUILD.bazel @@ -35,9 +35,9 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googleapis//google/storage/v2:storage_cc_grpc", - "@com_google_googleapis//google/storage/v2:storage_cc_proto", + "@curl", + "@googleapis//google/storage/v2:storage_cc_grpc", + "@googleapis//google/storage/v2:storage_cc_proto", ], ) @@ -55,8 +55,8 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@curl", ], ) for program in storage_benchmark_programs] @@ -73,8 +73,8 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest_main", + "@curl", + "@googletest//:gtest_main", ], ) for test in storage_benchmarks_unit_tests] diff --git a/google/cloud/storage/benchmarks/throughput_experiment.cc b/google/cloud/storage/benchmarks/throughput_experiment.cc index 7639d692b26e3..7599fc2a6c2d9 100644 --- a/google/cloud/storage/benchmarks/throughput_experiment.cc +++ b/google/cloud/storage/benchmarks/throughput_experiment.cc @@ -19,7 +19,7 @@ #if GOOGLE_CLOUD_CPP_STORAGE_HAVE_GRPC #include "google/cloud/storage/internal/grpc/ctype_cord_workaround.h" #include "google/cloud/grpc_error_delegate.h" -#include +#include "google/storage/v2/storage.grpc.pb.h" #include #include #include diff --git a/google/cloud/storage/client.cc b/google/cloud/storage/client.cc index 8d67b1fb0e6c0..1758c361e5b70 100644 --- a/google/cloud/storage/client.cc +++ b/google/cloud/storage/client.cc @@ -13,19 +13,35 @@ // limitations under the License. #include "google/cloud/storage/client.h" +#include "google/cloud/storage/idempotency_policy.h" #include "google/cloud/storage/internal/base64.h" #include "google/cloud/storage/internal/connection_factory.h" +#include "google/cloud/storage/internal/unified_rest_credentials.h" +#include "google/cloud/storage/oauth2/credentials.h" +#include "google/cloud/storage/oauth2/google_credentials.h" #include "google/cloud/storage/oauth2/service_account_credentials.h" +#include "google/cloud/storage/options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" +#include "google/cloud/internal/absl_str_join_quiet.h" #include "google/cloud/internal/curl_handle.h" #include "google/cloud/internal/curl_options.h" #include "google/cloud/internal/filesystem.h" +#include "google/cloud/internal/getenv.h" #include "google/cloud/internal/make_status.h" #include "google/cloud/internal/opentelemetry.h" +#include "google/cloud/internal/populate_common_options.h" +#include "google/cloud/internal/rest_options.h" +#include "google/cloud/internal/rest_response.h" +#include "google/cloud/internal/service_endpoint.h" #include "google/cloud/log.h" +#include "google/cloud/opentelemetry_options.h" +#include "google/cloud/universe_domain_options.h" #include "absl/strings/str_split.h" +#include #include #include +#include +#include #include #include #include @@ -60,8 +76,6 @@ Client::Client(InternalOnly, Options const& opts) : Client(InternalOnlyNoDecorations{}, storage_internal::MakeStorageConnection(opts)) {} -StatusOr Client::CreateDefaultClient() { return Client(Options{}); } - ObjectReadStream Client::ReadObjectImpl( internal::ReadObjectRangeRequest const& request) { auto source = connection_->ReadObject(request); @@ -235,12 +249,12 @@ std::string Client::SigningEmail(SigningAccount const& signing_account) const { if (signing_account.has_value()) { return signing_account.value(); } - return connection_->client_options().credentials()->AccountEmail(); + return connection_->options().get()->AccountEmail(); } StatusOr Client::SignBlobImpl( SigningAccount const& signing_account, std::string const& string_to_sign) { - auto credentials = connection_->client_options().credentials(); + auto credentials = connection_->options().get(); // First try to sign locally. auto signed_blob = credentials->SignBlob(signing_account, string_to_sign); @@ -389,8 +403,219 @@ std::string Client::EndpointAuthority() const { return std::string(endpoint_authority); } +// This magic number was obtained by experimentation summarized in #2657 +#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE +#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE (8 * 1024 * 1024) +#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE + +// This magic number was obtained by experimentation summarized in #2657 +#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE +#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE \ + (3 * 1024 * 1024 / 2) +#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE + +// This is a result of experiments performed in #2657. +#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE +#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE \ + (20 * 1024 * 1024L) +#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE + +#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT +#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT 120 +#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT + +// Define the defaults using a pre-processor macro, this allows the application +// developers to change the defaults for their application by compiling with +// different values. +#ifndef STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD +#define STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD std::chrono::minutes(15) +#endif // STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD + +#ifndef STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY +#define STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY std::chrono::seconds(1) +#endif // STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY + +#ifndef STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY +#define STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY std::chrono::minutes(5) +#endif // STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY + +#ifndef STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING +#define STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING 2.0 +#endif // STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING + +namespace { + +using ::google::cloud::internal::GetEnv; + +absl::optional GetEmulator() { + auto emulator = GetEnv("CLOUD_STORAGE_EMULATOR_ENDPOINT"); + if (emulator) return emulator; + return GetEnv("CLOUD_STORAGE_TESTBENCH_ENDPOINT"); +} + +std::size_t DefaultConnectionPoolSize() { + std::size_t nthreads = std::thread::hardware_concurrency(); + if (nthreads == 0) { + return 4; + } + return 4 * nthreads; +} + +} // namespace + namespace internal { +Options ApplyPolicy(Options opts, RetryPolicy const& p) { + opts.set(p.clone()); + return opts; +} + +Options ApplyPolicy(Options opts, BackoffPolicy const& p) { + opts.set(p.clone()); + return opts; +} + +Options ApplyPolicy(Options opts, IdempotencyPolicy const& p) { + opts.set(p.clone()); + return opts; +} + +Options DefaultOptions(std::shared_ptr credentials, + Options opts) { + auto ud = GetEnv("GOOGLE_CLOUD_UNIVERSE_DOMAIN"); + if (ud && !ud->empty()) { + opts.set(*std::move(ud)); + } + auto gcs_ep = google::cloud::internal::UniverseDomainEndpoint( + "https://storage.googleapis.com", opts); + auto iam_ep = absl::StrCat(google::cloud::internal::UniverseDomainEndpoint( + "https://iamcredentials.googleapis.com", opts), + "/v1"); + auto o = + Options{} + .set(std::move(credentials)) + .set(std::move(gcs_ep)) + .set(std::move(iam_ep)) + .set("v1") + .set(DefaultConnectionPoolSize()) + .set( + GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE) + .set( + GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE) + .set( + GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE) + .set(true) + .set(true) + .set(0) + .set(0) + .set(std::chrono::seconds( + GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT)) + .set(1) + .set(1) + .set( + LimitedTimeRetryPolicy( + STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD) + .clone()) + .set( + ExponentialBackoffPolicy( + STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY, + STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY, + STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING) + .clone()) + .set(AlwaysRetryIdempotencyPolicy().clone()); + + o = google::cloud::internal::MergeOptions(std::move(opts), std::move(o)); + // If the application did not set `DownloadStallTimeoutOption` then use the + // same value as `TransferStallTimeoutOption` (which could be the default + // value). Some applications need tighter timeouts for downloads, but longer + // timeouts for other transfers. + if (!o.has()) { + o.set(o.get()); + } + + auto emulator = GetEmulator(); + if (emulator.has_value()) { + o.set(*emulator).set(*emulator + + "/iamapi"); + } + + auto logging = GetEnv("CLOUD_STORAGE_ENABLE_TRACING"); + if (logging) { + for (auto c : absl::StrSplit(*logging, ',')) { + GCP_LOG(INFO) << "Enabling logging for " << c; + o.lookup().insert(std::string(c)); + } + } + + auto tracing = GetEnv("GOOGLE_CLOUD_CPP_OPENTELEMETRY_TRACING"); + if (tracing && !tracing->empty()) { + o.set(true); + } + + auto project_id = GetEnv("GOOGLE_CLOUD_PROJECT"); + if (project_id.has_value()) { + o.set(std::move(*project_id)); + } + + // Always apply the RestClient defaults, even if it is not in use. Now that we + // use the low-level initialization code in + // google/cloud/internal/curl_wrappers.cc, these are always needed. + namespace rest = ::google::cloud::rest_internal; + auto rest_defaults = Options{} + .set( + o.get()) + .set( + o.get()) + .set( + o.get()) + .set( + o.get()) + .set( + o.get()) + .set( + o.get()) + .set( + o.get()) + .set( + o.get()) + .set( + o.get()); + + // These two are not always present, but if they are, and only if they are, we + // need to map their value to the corresponding option in `rest_internal::`. + if (o.has()) { + rest_defaults.set( + o.get()); + } + if (o.has()) { + rest_defaults.set(o.get()); + } + + return google::cloud::internal::MergeOptions(std::move(o), + std::move(rest_defaults)); +} + +Options DefaultOptionsWithCredentials(Options opts) { + if (opts.has()) { + auto credentials = opts.get(); + return internal::DefaultOptions(std::move(credentials), std::move(opts)); + } + if (opts.has()) { + auto credentials = + internal::MapCredentials(*opts.get()); + return internal::DefaultOptions(std::move(credentials), std::move(opts)); + } + if (GetEmulator().has_value()) { + return internal::DefaultOptions( + internal::MapCredentials(*google::cloud::MakeInsecureCredentials()), + std::move(opts)); + } + auto credentials = + internal::MapCredentials(*google::cloud::MakeGoogleDefaultCredentials( + google::cloud::internal::MakeAuthOptions(opts))); + return internal::DefaultOptions(std::move(credentials), std::move(opts)); +} + Client ClientImplDetails::CreateWithDecorations( Options const& opts, std::shared_ptr connection) { return Client( diff --git a/google/cloud/storage/client.h b/google/cloud/storage/client.h index 1b279dfeaa7f1..a6f9ee70a2d50 100644 --- a/google/cloud/storage/client.h +++ b/google/cloud/storage/client.h @@ -54,6 +54,23 @@ namespace internal { class NonResumableParallelUploadState; class ResumableParallelUploadState; struct ClientImplDetails; + +Options ApplyPolicy(Options opts, RetryPolicy const& p); +Options ApplyPolicy(Options opts, BackoffPolicy const& p); +Options ApplyPolicy(Options opts, IdempotencyPolicy const& p); + +inline Options ApplyPolicies(Options opts) { return opts; } + +template +Options ApplyPolicies(Options opts, P&& head, Policies&&... tail) { + opts = ApplyPolicy(std::move(opts), std::forward

(head)); + return ApplyPolicies(std::move(opts), std::forward(tail)...); +} + +Options DefaultOptions(std::shared_ptr credentials, + Options opts); +Options DefaultOptionsWithCredentials(Options opts); + } // namespace internal /** * The Google Cloud Storage (GCS) Client. @@ -3421,79 +3438,6 @@ class Client { } ///@} - /** - * Creates the default client type given the options. - * - * @param options the client options, these are used to control credentials, - * buffer sizes, etc. - * @param policies the client policies, these control the behavior of the - * client, for example, how to backoff when an operation needs to be - * retried, or what operations cannot be retried because they are not - * idempotent. - * - * @deprecated use the constructor from `google::cloud::Options` instead. - */ - template - explicit Client(ClientOptions options, Policies&&... policies) - : Client(InternalOnly{}, internal::ApplyPolicies( - internal::MakeOptions(std::move(options)), - std::forward(policies)...)) {} - - /** - * Creates the default client type given the credentials and policies. - * - * @param credentials a set of credentials to initialize the `ClientOptions`. - * @param policies the client policies, these control the behavior of the - * client, for example, how to backoff when an operation needs to be - * retried, or what operations cannot be retried because they are not - * idempotent. - * - * @deprecated use the constructor from `google::cloud::Options` instead. - */ - template - explicit Client(std::shared_ptr credentials, - Policies&&... policies) - : Client(InternalOnly{}, - internal::ApplyPolicies( - internal::DefaultOptions(std::move(credentials), {}), - std::forward(policies)...)) {} - - /** - * Create a Client using ClientOptions::CreateDefaultClientOptions(). - * - * @deprecated use the constructor from `google::cloud::Options` instead. - */ - static StatusOr CreateDefaultClient(); - - /// Builds a client and maybe override the retry, idempotency, and/or backoff - /// policies. - /// @deprecated This was intended only for test code, applications should not - /// use it. - template -#if !defined(_MSC_VER) || _MSC_VER >= 1920 - GOOGLE_CLOUD_CPP_DEPRECATED( - "applications should not need this." - " Please use the constructors from ClientOptions instead." - " For mocking, please use testing::ClientFromMock() instead." - " Please file a bug at https://github.com/googleapis/google-cloud-cpp" - " if you have a use-case not covered by these.") -#endif // _MSC_VER - // We cannot `std::move(connection)` because it is used twice in the delegated - // constructor parameters. And we cannot just use `StorageConnection const&` - // because we do hold on to the `std::shared_ptr<>`. - explicit Client( - std::shared_ptr const& connection, - Policies&&... policies) - : Client(InternalOnly{}, - internal::ApplyPolicies( - internal::DefaultOptions( - connection->client_options().credentials(), {}), - std::forward(policies)...), - // We cannot std::move() because it is also used in the previous - // parameter. - connection) { - } - /// Define a tag to disable automatic decorations of the StorageConnection. struct NoDecorations {}; diff --git a/google/cloud/storage/client_bucket_test.cc b/google/cloud/storage/client_bucket_test.cc index fe7962ab7d8fb..d7e426f79c6d6 100644 --- a/google/cloud/storage/client_bucket_test.cc +++ b/google/cloud/storage/client_bucket_test.cc @@ -197,7 +197,6 @@ TEST_F(BucketTest, CreateBucket) { })"""; auto expected = internal::BucketMetadataParser::FromString(text).value(); - EXPECT_CALL(*mock_, client_options()).Times(0); EXPECT_CALL(*mock_, CreateBucket) .WillOnce(Return(StatusOr(TransientError()))) .WillOnce([&expected](internal::CreateBucketRequest const& r) { diff --git a/google/cloud/storage/client_options.cc b/google/cloud/storage/client_options.cc deleted file mode 100644 index 686ed1a74d173..0000000000000 --- a/google/cloud/storage/client_options.cc +++ /dev/null @@ -1,378 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/storage/client_options.h" -#include "google/cloud/storage/internal/unified_rest_credentials.h" -#include "google/cloud/storage/oauth2/credentials.h" -#include "google/cloud/storage/oauth2/google_credentials.h" -#include "google/cloud/internal/absl_str_join_quiet.h" -#include "google/cloud/internal/curl_options.h" -#include "google/cloud/internal/getenv.h" -#include "google/cloud/internal/populate_common_options.h" -#include "google/cloud/internal/rest_options.h" -#include "google/cloud/internal/rest_response.h" -#include "google/cloud/internal/service_endpoint.h" -#include "google/cloud/log.h" -#include "google/cloud/opentelemetry_options.h" -#include "google/cloud/universe_domain_options.h" -#include "absl/strings/str_split.h" -#include -#include -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -using ::google::cloud::internal::GetEnv; - -namespace { - -absl::optional GetEmulator() { - auto emulator = GetEnv("CLOUD_STORAGE_EMULATOR_ENDPOINT"); - if (emulator) return emulator; - return GetEnv("CLOUD_STORAGE_TESTBENCH_ENDPOINT"); -} - -StatusOr> StorageDefaultCredentials( - ChannelOptions const& channel_options) { - auto emulator = GetEmulator(); - if (emulator.has_value()) { - return StatusOr>( - oauth2::CreateAnonymousCredentials()); - } - return oauth2::GoogleDefaultCredentials(channel_options); -} - -std::size_t DefaultConnectionPoolSize() { - std::size_t nthreads = std::thread::hardware_concurrency(); - if (nthreads == 0) { - return 4; - } - return 4 * nthreads; -} - -// This magic number was obtained by experimentation summarized in #2657 -#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE -#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE (8 * 1024 * 1024) -#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE - -// This magic number was obtained by experimentation summarized in #2657 -#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE -#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE \ - (3 * 1024 * 1024 / 2) -#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE - -// This is a result of experiments performed in #2657. -#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE -#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE \ - (20 * 1024 * 1024L) -#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE - -#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT -#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT 120 -#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT - -// Define the defaults using a pre-processor macro, this allows the application -// developers to change the defaults for their application by compiling with -// different values. -#ifndef STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD -#define STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD std::chrono::minutes(15) -#endif // STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD - -#ifndef STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY -#define STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY std::chrono::seconds(1) -#endif // STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY - -#ifndef STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY -#define STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY std::chrono::minutes(5) -#endif // STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY - -#ifndef STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING -#define STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING 2.0 -#endif // STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING - -} // namespace - -namespace internal { - -std::string RestEndpoint(Options const& options) { - return GetEmulator().value_or(options.get()); -} - -std::string IamRestEndpoint(Options const& options) { - return GetEmulator().value_or(options.get()); -} - -std::string IamRestPath() { - auto emulator = GetEmulator(); - if (emulator) return "/iamapi"; - return {}; -} - -std::string JsonEndpoint(Options const& options) { - return GetEmulator().value_or(options.get()) + - "/storage/" + options.get(); -} - -std::string JsonUploadEndpoint(Options const& options) { - return GetEmulator().value_or(options.get()) + - "/upload/storage/" + options.get(); -} - -std::string XmlEndpoint(Options const& options) { - return GetEmulator().value_or(options.get()); -} - -std::string IamEndpoint(Options const& options) { - auto emulator = GetEmulator(); - if (emulator) return *emulator + "/iamapi"; - return options.get(); -} - -Options MakeOptions(ClientOptions o) { - auto opts = std::move(o.opts_); - if (!o.channel_options().ssl_root_path().empty()) { - opts.set(o.channel_options().ssl_root_path()); - } - return opts; -} - -ClientOptions MakeBackwardsCompatibleClientOptions(Options opts) { - return ClientOptions(std::move(opts)); -} - -Options ApplyPolicy(Options opts, RetryPolicy const& p) { - opts.set(p.clone()); - return opts; -} - -Options ApplyPolicy(Options opts, BackoffPolicy const& p) { - opts.set(p.clone()); - return opts; -} - -Options ApplyPolicy(Options opts, IdempotencyPolicy const& p) { - opts.set(p.clone()); - return opts; -} - -Options DefaultOptions(std::shared_ptr credentials, - Options opts) { - auto ud = GetEnv("GOOGLE_CLOUD_UNIVERSE_DOMAIN"); - if (ud && !ud->empty()) { - opts.set(*std::move(ud)); - } - auto gcs_ep = google::cloud::internal::UniverseDomainEndpoint( - "https://storage.googleapis.com", opts); - auto iam_ep = absl::StrCat(google::cloud::internal::UniverseDomainEndpoint( - "https://iamcredentials.googleapis.com", opts), - "/v1"); - auto o = - Options{} - .set(std::move(credentials)) - .set(std::move(gcs_ep)) - .set(std::move(iam_ep)) - .set("v1") - .set(DefaultConnectionPoolSize()) - .set( - GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE) - .set( - GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE) - .set( - GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE) - .set(true) - .set(true) - .set(0) - .set(0) - .set(std::chrono::seconds( - GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_STALL_TIMEOUT)) - .set(1) - .set(1) - .set( - LimitedTimeRetryPolicy( - STORAGE_CLIENT_DEFAULT_MAXIMUM_RETRY_PERIOD) - .clone()) - .set( - ExponentialBackoffPolicy( - STORAGE_CLIENT_DEFAULT_INITIAL_BACKOFF_DELAY, - STORAGE_CLIENT_DEFAULT_MAXIMUM_BACKOFF_DELAY, - STORAGE_CLIENT_DEFAULT_BACKOFF_SCALING) - .clone()) - .set(AlwaysRetryIdempotencyPolicy().clone()); - - o = google::cloud::internal::MergeOptions(std::move(opts), std::move(o)); - // If the application did not set `DownloadStallTimeoutOption` then use the - // same value as `TransferStallTimeoutOption` (which could be the default - // value). Some applications need tighter timeouts for downloads, but longer - // timeouts for other transfers. - if (!o.has()) { - o.set(o.get()); - } - - auto emulator = GetEmulator(); - if (emulator.has_value()) { - o.set(*emulator).set(*emulator + - "/iamapi"); - } - - auto logging = GetEnv("CLOUD_STORAGE_ENABLE_TRACING"); - if (logging) { - for (auto c : absl::StrSplit(*logging, ',')) { - GCP_LOG(INFO) << "Enabling logging for " << c; - o.lookup().insert(std::string(c)); - } - } - - auto tracing = GetEnv("GOOGLE_CLOUD_CPP_OPENTELEMETRY_TRACING"); - if (tracing && !tracing->empty()) { - o.set(true); - } - - auto project_id = GetEnv("GOOGLE_CLOUD_PROJECT"); - if (project_id.has_value()) { - o.set(std::move(*project_id)); - } - - // Always apply the RestClient defaults, even if it is not in use. Now that we - // use the low-level initialization code in - // google/cloud/internal/curl_wrappers.cc, these are always needed. - namespace rest = ::google::cloud::rest_internal; - auto rest_defaults = Options{} - .set( - o.get()) - .set( - o.get()) - .set( - o.get()) - .set( - o.get()) - .set( - o.get()) - .set( - o.get()) - .set( - o.get()) - .set( - o.get()) - .set( - o.get()); - - // These two are not always present, but if they are, and only if they are, we - // need to map their value to the corresponding option in `rest_internal::`. - if (o.has()) { - rest_defaults.set( - o.get()); - } - if (o.has()) { - rest_defaults.set(o.get()); - } - - return google::cloud::internal::MergeOptions(std::move(o), - std::move(rest_defaults)); -} - -Options DefaultOptionsWithCredentials(Options opts) { - if (opts.has()) { - auto credentials = opts.get(); - return internal::DefaultOptions(std::move(credentials), std::move(opts)); - } - if (opts.has()) { - auto credentials = - internal::MapCredentials(*opts.get()); - return internal::DefaultOptions(std::move(credentials), std::move(opts)); - } - if (GetEmulator().has_value()) { - return internal::DefaultOptions( - internal::MapCredentials(*google::cloud::MakeInsecureCredentials()), - std::move(opts)); - } - auto credentials = - internal::MapCredentials(*google::cloud::MakeGoogleDefaultCredentials( - google::cloud::internal::MakeAuthOptions(opts))); - return internal::DefaultOptions(std::move(credentials), std::move(opts)); -} - -} // namespace internal - -StatusOr ClientOptions::CreateDefaultClientOptions() { - return CreateDefaultClientOptions(ChannelOptions{}); -} - -StatusOr ClientOptions::CreateDefaultClientOptions( - ChannelOptions const& channel_options) { - auto creds = StorageDefaultCredentials(channel_options); - if (!creds) return creds.status(); - return ClientOptions(*creds, channel_options); -} - -ClientOptions::ClientOptions(std::shared_ptr credentials, - ChannelOptions channel_options) - : opts_(internal::DefaultOptions(std::move(credentials), {})), - channel_options_(std::move(channel_options)) {} - -ClientOptions::ClientOptions(Options o) - : opts_(std::move(o)), - user_agent_prefix_( - absl::StrJoin(opts_.get(), " ")) { - channel_options_.set_ssl_root_path(opts_.get()); -} - -bool ClientOptions::enable_http_tracing() const { - return opts_.get().count("http") != 0; -} - -ClientOptions& ClientOptions::set_enable_http_tracing(bool enable) { - if (enable) { - opts_.lookup().insert("http"); - } else { - opts_.lookup().erase("http"); - } - return *this; -} - -bool ClientOptions::enable_raw_client_tracing() const { - return opts_.get().count("raw-client") != 0; -} - -ClientOptions& ClientOptions::set_enable_raw_client_tracing(bool enable) { - if (enable) { - opts_.lookup().insert("raw-client"); - } else { - opts_.lookup().erase("raw-client"); - } - return *this; -} - -ClientOptions& ClientOptions::SetDownloadBufferSize(std::size_t size) { - opts_.set( - size == 0 ? GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE : size); - return *this; -} - -ClientOptions& ClientOptions::SetUploadBufferSize(std::size_t size) { - opts_.set( - size == 0 ? GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE : size); - return *this; -} - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google diff --git a/google/cloud/storage/client_options.h b/google/cloud/storage/client_options.h deleted file mode 100644 index 09f5e968aff7c..0000000000000 --- a/google/cloud/storage/client_options.h +++ /dev/null @@ -1,461 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_OPTIONS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_OPTIONS_H - -#include "google/cloud/storage/oauth2/credentials.h" -#include "google/cloud/storage/options.h" -#include "google/cloud/storage/version.h" -#include "google/cloud/common_options.h" -#include "google/cloud/options.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -class ClientOptions; -namespace internal { -std::string RestEndpoint(Options const&); -std::string IamRestEndpoint(Options const&); -std::string IamRestPath(); -std::string JsonEndpoint(Options const&); -std::string JsonUploadEndpoint(Options const&); -std::string XmlEndpoint(Options const&); -std::string IamEndpoint(Options const&); - -Options MakeOptions(ClientOptions); - -ClientOptions MakeBackwardsCompatibleClientOptions(Options); - -Options ApplyPolicy(Options opts, RetryPolicy const& p); -Options ApplyPolicy(Options opts, BackoffPolicy const& p); -Options ApplyPolicy(Options opts, IdempotencyPolicy const& p); - -inline Options ApplyPolicies(Options opts) { return opts; } - -template -Options ApplyPolicies(Options opts, P&& head, Policies&&... tail) { - opts = ApplyPolicy(std::move(opts), std::forward

(head)); - return ApplyPolicies(std::move(opts), std::forward(tail)...); -} - -Options DefaultOptions(std::shared_ptr credentials, - Options opts); -Options DefaultOptionsWithCredentials(Options opts); - -} // namespace internal - -/** - * Describes the configuration for low-level connection features. - * - * Some applications may want to use a different SSL root of trust for their - * connections, for example, containerized applications might store the - * certificate authority certificates in a hard-coded location. - * - * This is a separate class, as it is used to configure both the normal - * connections to GCS and the connections used to obtain OAuth2 access - * tokens. - */ -class ChannelOptions { - public: - /// @deprecated Use google::cloud::Options and - /// google::cloud::CARootsFilePathOption instead. - std::string ssl_root_path() const { return ssl_root_path_; } - - /// @deprecated Use google::cloud::Options and - /// google::cloud::CARootsFilePathOption instead. - ChannelOptions& set_ssl_root_path(std::string ssl_root_path) { - ssl_root_path_ = std::move(ssl_root_path); - return *this; - } - - private: - std::string ssl_root_path_; -}; - -/** - * Describes the configuration for a `storage::Client` object. - * - * By default, several environment variables are read to configure the client: - * - * - `CLOUD_STORAGE_EMULATOR_ENDPOINT`: if set, use this http endpoint to - * make all http requests instead of the production GCS service. Also, - * if set, the `CreateDefaultClientOptions()` function will use an - * `AnonymousCredentials` object instead of loading Application Default - * %Credentials. - * - `CLOUD_STORAGE_ENABLE_CLOG`: if set, enable std::clog as a backend for - * `google::cloud::LogSink`. - * - `CLOUD_STORAGE_ENABLE_TRACING`: if set, this is the list of components that - * will have logging enabled, the component this is: - * - `http`: trace all http request / responses. - * - * @deprecated Please use google::cloud::Options instead. - */ -class ClientOptions { - public: - /** - * Constructor with channel options. - * - * @deprecated use google::cloud::Options instead. - * - * @param credentials how to authenticate to the client. Using a `nullptr` for - * @p credentials results in undefined behavior. - */ - explicit ClientOptions(std::shared_ptr credentials) - : ClientOptions(std::move(credentials), {}) {} - - /** - * Constructor with channel options. - * - * @deprecated use google::cloud::Options instead. - * - * @param credentials how to authenticate to the client. Using a `nullptr` for - * @p credentials results in undefined behavior. - * @param channel_options the configuration for SSL certificate validation. - */ - ClientOptions(std::shared_ptr credentials, - ChannelOptions channel_options); - - /** - * Creates a `ClientOptions` with Google Application Default %Credentials. - * - * If Application Default %Credentials could not be loaded, this returns a - * `Status` with failure details. If the `CLOUD_STORAGE_EMULATOR_ENDPOINT` - * environment variable is set, this function instead uses an - * `AnonymousCredentials` to configure the client. - * - * @deprecated Please use google::cloud::Options instead. - */ - static StatusOr CreateDefaultClientOptions(); - /// @deprecated Please use google::cloud::Options instead. - static StatusOr CreateDefaultClientOptions( - ChannelOptions const& channel_options); - - /** - * @deprecated Use google::cloud::Options and Oauth2CredentialsOption instead. - */ - std::shared_ptr credentials() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and Oauth2CredentialsOption instead. - */ - ClientOptions& set_credentials(std::shared_ptr c) { - opts_.set(std::move(c)); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and RestEndpointOption instead. - */ - std::string const& endpoint() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and RestEndpointOption instead. - */ - ClientOptions& set_endpoint(std::string endpoint) { - opts_.set(std::move(endpoint)); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and IamEndpointOption instead. - */ - std::string const& iam_endpoint() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and IamEndpointOption instead. - */ - ClientOptions& set_iam_endpoint(std::string endpoint) { - opts_.set(std::move(endpoint)); - return *this; - } - - /** - * @deprecated This was intended for development and not a public API. - */ - std::string const& version() const { - return opts_.get(); - } - - /** - * @deprecated This was intended for development and not a public API. - */ - ClientOptions& set_version(std::string version) { - opts_.set(std::move(version)); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and - * google::cloud::LoggingComponentsOption instead. - */ - bool enable_http_tracing() const; - - /** - * @deprecated Use google::cloud::Options and - * google::cloud::LoggingComponentsOption instead. - */ - ClientOptions& set_enable_http_tracing(bool enable); - - /** - * @deprecated Use google::cloud::Options and - * google::cloud::LoggingComponentsOption instead. - */ - bool enable_raw_client_tracing() const; - - /** - * @deprecated Use google::cloud::Options and - * google::cloud::LoggingComponentsOption instead. - */ - ClientOptions& set_enable_raw_client_tracing(bool enable); - - /** - * @deprecated Use google::cloud::Options and ProjectIdOption instead. - */ - std::string const& project_id() const { return opts_.get(); } - - /** - * @deprecated Use google::cloud::Options and ProjectIdOption instead. - */ - ClientOptions& set_project_id(std::string v) { - opts_.set(std::move(v)); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and ConnectionPoolSizeOption - * instead. - */ - std::size_t connection_pool_size() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and ConnectionPoolSizeOption - * instead. - */ - ClientOptions& set_connection_pool_size(std::size_t size) { - opts_.set(size); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and DownloadBufferSizeOption - * instead. - */ - std::size_t download_buffer_size() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and DownloadBufferSizeOption - * instead. - */ - ClientOptions& SetDownloadBufferSize(std::size_t size); - - /** - * @deprecated Use google::cloud::Options and UploadBufferSizeOption instead. - */ - std::size_t upload_buffer_size() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and UploadBufferSizeOption instead. - */ - ClientOptions& SetUploadBufferSize(std::size_t size); - - /** - * @deprecated Use google::cloud::Options and - * google::cloud::UserAgentProductsOption instead. - */ - std::string const& user_agent_prefix() const { return user_agent_prefix_; } - - /** - * @deprecated Use google::cloud::Options and - * google::cloud::UserAgentProductsOption instead. - */ - ClientOptions& add_user_agent_prefix(std::string prefix) { - opts_.lookup().push_back(prefix); - if (!user_agent_prefix_.empty()) { - prefix += ' '; - prefix += user_agent_prefix_; - } - user_agent_prefix_ = std::move(prefix); - return *this; - } - - /// @deprecated use `add_user_agent_prefix()` instead. - ClientOptions& add_user_agent_prefx(std::string const& v) { - return add_user_agent_prefix(v); - } - - /** - * @deprecated Use google::cloud::Options and MaximumSimpleUploadSizeOption - * instead. - */ - std::size_t maximum_simple_upload_size() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and MaximumSimpleUploadSizeOption - * instead. - */ - ClientOptions& set_maximum_simple_upload_size(std::size_t v) { - opts_.set(v); - return *this; - } - - /** - * If true and using OpenSSL 1.0.2 the library configures the OpenSSL - * callbacks for locking. - * - * @deprecated Use google::cloud::options and EnableCurlSslLockingOption - * instead. - */ - bool enable_ssl_locking_callbacks() const { - return opts_.get(); - } - - /** - * If true and using OpenSSL 1.0.2 the library configures the OpenSSL - * callbacks for locking. - * - * @deprecated Use google::cloud::options and EnableCurlSslLockingOption - * instead. - */ - ClientOptions& set_enable_ssl_locking_callbacks(bool v) { - opts_.set(v); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and EnableCurlSigpipeOption - * instead. - */ - bool enable_sigpipe_handler() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and EnableCurlSigpipeOption - * instead. - */ - ClientOptions& set_enable_sigpipe_handler(bool v) { - opts_.set(v); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and MaximumCurlSocketRecvSizeOption - * instead. - */ - std::size_t maximum_socket_recv_size() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and MaximumCurlSocketRecvSizeOption - * instead. - */ - ClientOptions& set_maximum_socket_recv_size(std::size_t v) { - opts_.set(v); - return *this; - } - - /** - * @deprecated Use google::cloud::Options and MaximumCurlSocketSendSizeOption - * instead. - */ - std::size_t maximum_socket_send_size() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and MaximumCurlSocketSendSizeOption - * instead. - */ - ClientOptions& set_maximum_socket_send_size(std::size_t v) { - opts_.set(v); - return *this; - } - - /// @deprecated Use google::cloud::Options and - /// google::cloud::CARootsFilePathOption instead. - ChannelOptions& channel_options() { return channel_options_; } - - /// @deprecated Use google::cloud::Options and - /// google::cloud::CARootsFilePathOption instead. - ChannelOptions const& channel_options() const { return channel_options_; } - - ///@{ - /** - * Control the maximum amount of time allowed for "stalls" during a download. - * - * A download that receives no data is considered "stalled". If the download - * remains stalled for more than the time set in this option then the download - * is aborted. - * - * The default value is 2 minutes. Can be disabled by setting the value to 0. - * - * @deprecated Use google::cloud::Options and DownloadStallTimeoutOption - * instead. - */ - std::chrono::seconds download_stall_timeout() const { - return opts_.get(); - } - - /** - * @deprecated Use google::cloud::Options and DownloadStallTimeoutOption - * instead. - */ - ClientOptions& set_download_stall_timeout(std::chrono::seconds v) { - opts_.set(std::move(v)); - return *this; - } - ///@} - - private: - friend Options internal::MakeOptions(ClientOptions); - friend ClientOptions internal::MakeBackwardsCompatibleClientOptions(Options); - - explicit ClientOptions(Options o); - - Options opts_; - - // Used for backwards compatibility. The value here is merged with the values - // in `opts_` by internal::MakeOptions(ClientOptions const&); - ChannelOptions channel_options_; - - // Only used for backwards compatibility, the value in `opts_. - std::string user_agent_prefix_; -}; - -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_OPTIONS_H diff --git a/google/cloud/storage/client_options_test.cc b/google/cloud/storage/client_options_test.cc deleted file mode 100644 index 722e5e82c1369..0000000000000 --- a/google/cloud/storage/client_options_test.cc +++ /dev/null @@ -1,546 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/storage/client_options.h" -#include "google/cloud/storage/oauth2/google_credentials.h" -#include "google/cloud/internal/curl_options.h" -#include "google/cloud/internal/filesystem.h" -#include "google/cloud/internal/random.h" -#include "google/cloud/internal/rest_options.h" -#include "google/cloud/internal/rest_response.h" -#include "google/cloud/opentelemetry_options.h" -#include "google/cloud/testing_util/scoped_environment.h" -#include "google/cloud/testing_util/setenv.h" -#include "google/cloud/testing_util/status_matchers.h" -#include "google/cloud/universe_domain_options.h" -#include -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN - -using ::google::cloud::testing_util::IsOk; -using ::google::cloud::testing_util::ScopedEnvironment; -using ::testing::IsEmpty; -using ::testing::Not; -using ::testing::UnorderedElementsAre; - -namespace { -class ClientOptionsTest : public ::testing::Test { - public: - ClientOptionsTest() - : enable_tracing_("CLOUD_STORAGE_ENABLE_TRACING", {}), - endpoint_("CLOUD_STORAGE_EMULATOR_ENDPOINT", {}), - old_endpoint_("CLOUD_STORAGE_TESTBENCH_ENDPOINT", {}), - generator_(std::random_device{}()) {} - - std::string CreateRandomFileName() { - // When running on the internal Google CI systems we cannot write to the - // local directory. GTest has a good temporary directory in that case. - return google::cloud::internal::PathAppend( - ::testing::TempDir(), - google::cloud::internal::Sample( - generator_, 8, "abcdefghijklmnopqrstuvwxyz0123456789") + - ".json"); - } - - protected: - ScopedEnvironment enable_tracing_; - ScopedEnvironment endpoint_; - ScopedEnvironment old_endpoint_; - google::cloud::internal::DefaultPRNG generator_; -}; - -// This is a syntactically valid JSON key file, but the key has been invalidated -// and therefore present no security risks. -constexpr char kJsonKeyfileContents[] = R"""({ - "type": "service_account", - "project_id": "foo-project", - "private_key_id": "a1a111aa1111a11a11a11aa111a111a1a1111111", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCltiF2oP3KJJ+S\ntTc1McylY+TuAi3AdohX7mmqIjd8a3eBYDHs7FlnUrFC4CRijCr0rUqYfg2pmk4a\n6TaKbQRAhWDJ7XD931g7EBvCtd8+JQBNWVKnP9ByJUaO0hWVniM50KTsWtyX3up/\nfS0W2R8Cyx4yvasE8QHH8gnNGtr94iiORDC7De2BwHi/iU8FxMVJAIyDLNfyk0hN\neheYKfIDBgJV2v6VaCOGWaZyEuD0FJ6wFeLybFBwibrLIBE5Y/StCrZoVZ5LocFP\nT4o8kT7bU6yonudSCyNMedYmqHj/iF8B2UN1WrYx8zvoDqZk0nxIglmEYKn/6U7U\ngyETGcW9AgMBAAECggEAC231vmkpwA7JG9UYbviVmSW79UecsLzsOAZnbtbn1VLT\nPg7sup7tprD/LXHoyIxK7S/jqINvPU65iuUhgCg3Rhz8+UiBhd0pCH/arlIdiPuD\n2xHpX8RIxAq6pGCsoPJ0kwkHSw8UTnxPV8ZCPSRyHV71oQHQgSl/WjNhRi6PQroB\nSqc/pS1m09cTwyKQIopBBVayRzmI2BtBxyhQp9I8t5b7PYkEZDQlbdq0j5Xipoov\n9EW0+Zvkh1FGNig8IJ9Wp+SZi3rd7KLpkyKPY7BK/g0nXBkDxn019cET0SdJOHQG\nDiHiv4yTRsDCHZhtEbAMKZEpku4WxtQ+JjR31l8ueQKBgQDkO2oC8gi6vQDcx/CX\nZ23x2ZUyar6i0BQ8eJFAEN+IiUapEeCVazuxJSt4RjYfwSa/p117jdZGEWD0GxMC\n+iAXlc5LlrrWs4MWUc0AHTgXna28/vii3ltcsI0AjWMqaybhBTTNbMFa2/fV2OX2\nUimuFyBWbzVc3Zb9KAG4Y7OmJQKBgQC5324IjXPq5oH8UWZTdJPuO2cgRsvKmR/r\n9zl4loRjkS7FiOMfzAgUiXfH9XCnvwXMqJpuMw2PEUjUT+OyWjJONEK4qGFJkbN5\n3ykc7p5V7iPPc7Zxj4mFvJ1xjkcj+i5LY8Me+gL5mGIrJ2j8hbuv7f+PWIauyjnp\nNx/0GVFRuQKBgGNT4D1L7LSokPmFIpYh811wHliE0Fa3TDdNGZnSPhaD9/aYyy78\nLkxYKuT7WY7UVvLN+gdNoVV5NsLGDa4cAV+CWPfYr5PFKGXMT/Wewcy1WOmJ5des\nAgMC6zq0TdYmMBN6WpKUpEnQtbmh3eMnuvADLJWxbH3wCkg+4xDGg2bpAoGAYRNk\nMGtQQzqoYNNSkfus1xuHPMA8508Z8O9pwKU795R3zQs1NAInpjI1sOVrNPD7Ymwc\nW7mmNzZbxycCUL/yzg1VW4P1a6sBBYGbw1SMtWxun4ZbnuvMc2CTCh+43/1l+FHe\nMmt46kq/2rH2jwx5feTbOE6P6PINVNRJh/9BDWECgYEAsCWcH9D3cI/QDeLG1ao7\nrE2NcknP8N783edM07Z/zxWsIsXhBPY3gjHVz2LDl+QHgPWhGML62M0ja/6SsJW3\nYvLLIc82V7eqcVJTZtaFkuht68qu/Jn1ezbzJMJ4YXDYo1+KFi+2CAGR06QILb+I\nlUtj+/nH3HDQjM4ltYfTPUg=\n-----END PRIVATE KEY-----\n", - "client_email": "foo-email@foo-project.iam.gserviceaccount.com", - "client_id": "100000000000000000001", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://oauth2.googleapis.com/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/foo-email%40foo-project.iam.gserviceaccount.com" -})"""; - -TEST_F(ClientOptionsTest, Default) { - // Create the options with the anonymous credentials because the default - // credentials try to load the application default credentials, and those do - // not exist in the CI environment, which results in errors or warnings. - auto creds = oauth2::CreateAnonymousCredentials(); - ClientOptions options(creds); - EXPECT_FALSE(options.enable_http_tracing()); - EXPECT_FALSE(options.enable_raw_client_tracing()); - EXPECT_TRUE(creds.get() == options.credentials().get()); - EXPECT_EQ("https://storage.googleapis.com", options.endpoint()); - EXPECT_EQ("v1", options.version()); - EXPECT_EQ("https://iamcredentials.googleapis.com/v1", options.iam_endpoint()); -} - -TEST_F(ClientOptionsTest, CreateDefaultError) { - testing_util::ScopedEnvironment creds("GOOGLE_APPLICATION_CREDENTIALS", - "not-a-file-should-fail"); - auto connection = ClientOptions::CreateDefaultClientOptions(); - EXPECT_THAT(connection, Not(IsOk())); -} - -TEST_F(ClientOptionsTest, CreateDefaultWithChannelOptionsError) { - testing_util::ScopedEnvironment creds("GOOGLE_APPLICATION_CREDENTIALS", - "not-a-file-should-fail"); - auto connection = ClientOptions::CreateDefaultClientOptions({}); - EXPECT_THAT(connection, Not(IsOk())); -} - -TEST_F(ClientOptionsTest, CreateDefault) { - auto file = CreateRandomFileName(); - std::ofstream(file) << kJsonKeyfileContents; - testing_util::ScopedEnvironment creds("GOOGLE_APPLICATION_CREDENTIALS", file); - auto connection = ClientOptions::CreateDefaultClientOptions(); - EXPECT_STATUS_OK(connection); - std::remove(file.c_str()); -} - -TEST_F(ClientOptionsTest, CreateDefaultWithChannelOptions) { - auto file = CreateRandomFileName(); - std::ofstream(file) << kJsonKeyfileContents; - testing_util::ScopedEnvironment creds("GOOGLE_APPLICATION_CREDENTIALS", file); - auto connection = ClientOptions::CreateDefaultClientOptions({}); - EXPECT_STATUS_OK(connection); -} - -TEST_F(ClientOptionsTest, EnableRpc) { - testing_util::ScopedEnvironment enable_tracing("CLOUD_STORAGE_ENABLE_TRACING", - "foo,raw-client,bar"); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_TRUE(options.enable_raw_client_tracing()); -} - -TEST_F(ClientOptionsTest, EnableHttp) { - testing_util::ScopedEnvironment enable_tracing("CLOUD_STORAGE_ENABLE_TRACING", - "foo,http,bar"); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_TRUE(options.enable_http_tracing()); -} - -TEST_F(ClientOptionsTest, EndpointsDefault) { - testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_EMULATOR_ENDPOINT", - {}); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_EQ("https://storage.googleapis.com", options.endpoint()); - auto o = internal::MakeOptions(std::move(options)); - EXPECT_EQ("https://storage.googleapis.com/storage/v1", - internal::JsonEndpoint(o)); - EXPECT_EQ("https://storage.googleapis.com/upload/storage/v1", - internal::JsonUploadEndpoint(o)); - EXPECT_EQ("https://iamcredentials.googleapis.com/v1", - internal::IamEndpoint(o)); -} - -TEST_F(ClientOptionsTest, EndpointsOverride) { - testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_EMULATOR_ENDPOINT", - {}); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - options.set_endpoint("http://127.0.0.1.nip.io:1234"); - EXPECT_EQ("http://127.0.0.1.nip.io:1234", options.endpoint()); - auto o = internal::MakeOptions(std::move(options)); - EXPECT_EQ("http://127.0.0.1.nip.io:1234/storage/v1", - internal::JsonEndpoint(o)); - EXPECT_EQ("http://127.0.0.1.nip.io:1234/upload/storage/v1", - internal::JsonUploadEndpoint(o)); - EXPECT_EQ("http://127.0.0.1.nip.io:1234", internal::XmlEndpoint(o)); - EXPECT_EQ("https://iamcredentials.googleapis.com/v1", - internal::IamEndpoint(o)); -} - -TEST_F(ClientOptionsTest, EndpointsEmulator) { - testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_EMULATOR_ENDPOINT", - "http://localhost:1234"); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_EQ("http://localhost:1234", options.endpoint()); - auto o = internal::MakeOptions(std::move(options)); - EXPECT_EQ("http://localhost:1234/storage/v1", internal::JsonEndpoint(o)); - EXPECT_EQ("http://localhost:1234/upload/storage/v1", - internal::JsonUploadEndpoint(o)); - EXPECT_EQ("http://localhost:1234", internal::XmlEndpoint(o)); - EXPECT_EQ("http://localhost:1234/iamapi", internal::IamEndpoint(o)); -} - -TEST_F(ClientOptionsTest, OldEndpointsEmulator) { - google::cloud::testing_util::UnsetEnv("CLOUD_STORAGE_EMULATOR_ENDPOINT"); - testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_TESTBENCH_ENDPOINT", - "http://localhost:1234"); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_EQ("http://localhost:1234", options.endpoint()); - auto o = internal::MakeOptions(std::move(options)); - EXPECT_EQ("http://localhost:1234/storage/v1", internal::JsonEndpoint(o)); - EXPECT_EQ("http://localhost:1234/upload/storage/v1", - internal::JsonUploadEndpoint(o)); - EXPECT_EQ("http://localhost:1234", internal::XmlEndpoint(o)); - EXPECT_EQ("http://localhost:1234/iamapi", internal::IamEndpoint(o)); -} - -TEST_F(ClientOptionsTest, SetVersion) { - ClientOptions options(oauth2::CreateAnonymousCredentials()); - options.set_version("vTest"); - EXPECT_EQ("vTest", options.version()); - auto o = internal::MakeOptions(std::move(options)); - EXPECT_EQ("https://storage.googleapis.com/storage/vTest", - internal::JsonEndpoint(o)); - EXPECT_EQ("https://storage.googleapis.com/upload/storage/vTest", - internal::JsonUploadEndpoint(o)); -} - -TEST_F(ClientOptionsTest, SetIamEndpoint) { - ClientOptions options(oauth2::CreateAnonymousCredentials()); - options.set_iam_endpoint("http://localhost:1/v2"); - EXPECT_EQ("http://localhost:1/v2", options.iam_endpoint()); -} - -TEST_F(ClientOptionsTest, SetCredentials) { - auto creds = oauth2::CreateAnonymousCredentials(); - ClientOptions options(creds); - auto other = oauth2::CreateAnonymousCredentials(); - options.set_credentials(other); - EXPECT_TRUE(other.get() == options.credentials().get()); - EXPECT_FALSE(creds.get() == other.get()); -} - -TEST_F(ClientOptionsTest, ProjectIdFromEnvironment) { - google::cloud::testing_util::SetEnv("GOOGLE_CLOUD_PROJECT", - "test-project-id"); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_EQ("test-project-id", options.project_id()); -} - -TEST_F(ClientOptionsTest, ProjectIdFromEnvironmentNotSet) { - google::cloud::testing_util::UnsetEnv("GOOGLE_CLOUD_PROJECT"); - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_EQ("", options.project_id()); -} - -TEST_F(ClientOptionsTest, SetProjectId) { - ClientOptions options(oauth2::CreateAnonymousCredentials()); - options.set_project_id("test-project-id"); - EXPECT_EQ("test-project-id", options.project_id()); -} - -TEST_F(ClientOptionsTest, SetDownloadBufferSize) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_size = client_options.download_buffer_size(); - EXPECT_NE(0U, default_size); - client_options.SetDownloadBufferSize(1024); - EXPECT_EQ(1024, client_options.download_buffer_size()); - client_options.SetDownloadBufferSize(0); - EXPECT_EQ(default_size, client_options.download_buffer_size()); -} - -TEST_F(ClientOptionsTest, SetUploadBufferSize) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_size = client_options.upload_buffer_size(); - EXPECT_NE(0U, default_size); - client_options.SetUploadBufferSize(1024); - EXPECT_EQ(1024, client_options.upload_buffer_size()); - client_options.SetUploadBufferSize(0); - EXPECT_EQ(default_size, client_options.upload_buffer_size()); -} - -TEST_F(ClientOptionsTest, UserAgentPrefix) { - ClientOptions options(oauth2::CreateAnonymousCredentials()); - EXPECT_EQ("", options.user_agent_prefix()); - options.add_user_agent_prefix("foo-1.0"); - EXPECT_EQ("foo-1.0", options.user_agent_prefix()); - options.add_user_agent_prefix("bar-2.2"); - EXPECT_EQ("bar-2.2 foo-1.0", options.user_agent_prefix()); -} - -TEST_F(ClientOptionsTest, SetMaximumSimpleUploadSize) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_size = client_options.maximum_simple_upload_size(); - EXPECT_NE(0U, default_size); - client_options.set_maximum_simple_upload_size(1024); - EXPECT_EQ(1024, client_options.maximum_simple_upload_size()); - client_options.set_maximum_simple_upload_size(0); - EXPECT_EQ(0, client_options.maximum_simple_upload_size()); -} - -TEST_F(ClientOptionsTest, SetEnableLockingCallbacks) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_value = client_options.enable_ssl_locking_callbacks(); - EXPECT_TRUE(default_value); - client_options.set_enable_ssl_locking_callbacks(false); - EXPECT_FALSE(client_options.enable_ssl_locking_callbacks()); - client_options.set_enable_ssl_locking_callbacks(true); - EXPECT_TRUE(client_options.enable_ssl_locking_callbacks()); -} - -TEST_F(ClientOptionsTest, SetMaximumSocketRecvSize) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_value = client_options.maximum_socket_recv_size(); - EXPECT_EQ(0, default_value); - client_options.set_maximum_socket_recv_size(16 * 1024); - EXPECT_EQ(16 * 1024, client_options.maximum_socket_recv_size()); -} - -TEST_F(ClientOptionsTest, SetMaximumSocketSendSize) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_value = client_options.maximum_socket_send_size(); - EXPECT_EQ(0, default_value); - client_options.set_maximum_socket_send_size(16 * 1024); - EXPECT_EQ(16 * 1024, client_options.maximum_socket_send_size()); -} - -TEST_F(ClientOptionsTest, SetMaximumDownloadStall) { - ClientOptions client_options(oauth2::CreateAnonymousCredentials()); - auto default_value = client_options.download_stall_timeout(); - EXPECT_NE(0, default_value.count()); - client_options.set_download_stall_timeout(std::chrono::seconds(60)); - EXPECT_EQ(60, client_options.download_stall_timeout().count()); -} - -TEST_F(ClientOptionsTest, MakeOptionsFromDefault) { - google::cloud::testing_util::SetEnv("GOOGLE_CLOUD_PROJECT", - "test-project-id"); - auto const opts = internal::MakeOptions( - ClientOptions(oauth2::CreateAnonymousCredentials())); - EXPECT_EQ("https://storage.googleapis.com", opts.get()); - EXPECT_EQ("https://iamcredentials.googleapis.com/v1", - opts.get()); - EXPECT_TRUE(opts.has()); - EXPECT_EQ("v1", opts.get()); - EXPECT_EQ("test-project-id", opts.get()); - EXPECT_LT(0, opts.get()); - EXPECT_LT(0, opts.get()); - EXPECT_LT(0, opts.get()); - EXPECT_LT(0, opts.get()); - EXPECT_LT(0, opts.get()); - EXPECT_TRUE(opts.has()); - EXPECT_TRUE(opts.has()); - EXPECT_EQ(0, opts.get()); - EXPECT_EQ(0, opts.get()); - EXPECT_LT(0, opts.get().count()); - EXPECT_LT(0, opts.get()); - EXPECT_THAT(opts.get(), IsEmpty()); -} - -TEST_F(ClientOptionsTest, DefaultOptions) { - auto o = internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_EQ("https://storage.googleapis.com", o.get()); - - // Verify any set values are respected overridden. - o = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{}.set("https://private.googleapis.com")); - EXPECT_EQ("https://private.googleapis.com", o.get()); - - o = internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_EQ("https://storage.googleapis.com", o.get()); - EXPECT_EQ("https://iamcredentials.googleapis.com/v1", - o.get()); - - EXPECT_EQ("v1", o.get()); - EXPECT_LT(0, o.get()); - EXPECT_LT(0, o.get()); - EXPECT_LT(0, o.get()); - EXPECT_LE(0, o.get()); - EXPECT_TRUE(o.get()); - EXPECT_TRUE(o.get()); - EXPECT_EQ(0, o.get()); - EXPECT_EQ(0, o.get()); - EXPECT_LT(std::chrono::seconds(0), o.get()); - EXPECT_LT(0, o.get()); - EXPECT_LT(std::chrono::seconds(0), o.get()); - EXPECT_LT(0, o.get()); - - namespace rest = ::google::cloud::rest_internal; - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - EXPECT_EQ(o.get(), - o.get()); - - EXPECT_FALSE(o.has()); - EXPECT_FALSE(o.has()); -} - -TEST_F(ClientOptionsTest, IncorporatesUniverseDomain) { - auto o = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{}.set( - "my-ud.net")); - EXPECT_EQ(o.get(), "https://storage.my-ud.net"); - EXPECT_EQ(o.get(), "https://iamcredentials.my-ud.net/v1"); -} - -TEST_F(ClientOptionsTest, IncorporatesUniverseDomainEnvVar) { - ScopedEnvironment ud("GOOGLE_CLOUD_UNIVERSE_DOMAIN", "ud-env-var.net"); - - auto o = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{}.set( - "ud-option.net")); - EXPECT_EQ(o.get(), "https://storage.ud-env-var.net"); - EXPECT_EQ(o.get(), - "https://iamcredentials.ud-env-var.net/v1"); -} - -TEST_F(ClientOptionsTest, CustomEndpointOverridesUniverseDomain) { - ScopedEnvironment ud("GOOGLE_CLOUD_UNIVERSE_DOMAIN", "ud-env-var.net"); - - auto o = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{} - .set("https://custom-storage.googleapis.com") - .set( - "https://custom-iamcredentials.googleapis.com/v1") - .set("ud-option.net")); - EXPECT_EQ(o.get(), - "https://custom-storage.googleapis.com"); - EXPECT_EQ(o.get(), - "https://custom-iamcredentials.googleapis.com/v1"); -} - -TEST_F(ClientOptionsTest, HttpVersion) { - namespace rest = ::google::cloud::rest_internal; - auto const options = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{}.set("2.0")); - EXPECT_EQ("2.0", options.get()); -} - -TEST_F(ClientOptionsTest, CAPathOption) { - namespace rest = ::google::cloud::rest_internal; - auto const options = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{}.set("test-only")); - EXPECT_EQ("test-only", options.get()); -} - -TEST_F(ClientOptionsTest, LoggingWithoutEnv) { - ScopedEnvironment env_common("GOOGLE_CLOUD_CPP_ENABLE_TRACING", - absl::nullopt); - ScopedEnvironment env("CLOUD_STORAGE_ENABLE_TRACING", absl::nullopt); - auto const options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_FALSE(options.has()); -} - -TEST_F(ClientOptionsTest, LoggingWithEnv) { - ScopedEnvironment env_common("GOOGLE_CLOUD_CPP_ENABLE_TRACING", - absl::nullopt); - ScopedEnvironment env("CLOUD_STORAGE_ENABLE_TRACING", "rpc,http"); - auto const options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_THAT(options.get(), - UnorderedElementsAre("rpc", "http")); -} - -TEST_F(ClientOptionsTest, TracingWithoutEnv) { - ScopedEnvironment env("GOOGLE_CLOUD_CPP_OPENTELEMETRY_TRACING", - absl::nullopt); - auto options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_FALSE(options.get()); - - options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), - Options{}.set(true)); - EXPECT_TRUE(options.get()); -} - -TEST_F(ClientOptionsTest, TracingWithEnv) { - ScopedEnvironment env("GOOGLE_CLOUD_CPP_OPENTELEMETRY_TRACING", "ON"); - auto const options = internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{}.set(false)); - EXPECT_TRUE(options.get()); -} - -TEST_F(ClientOptionsTest, ProjectIdWithoutEnv) { - ScopedEnvironment env("GOOGLE_CLOUD_PROJECT", absl::nullopt); - auto const options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_FALSE(options.has()); -} - -TEST_F(ClientOptionsTest, ProjecIdtWithEnv) { - ScopedEnvironment env("GOOGLE_CLOUD_PROJECT", "my-project"); - auto const options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); - EXPECT_EQ("my-project", options.get()); -} - -TEST_F(ClientOptionsTest, OverrideWithRestInternal) { - namespace rest = ::google::cloud::rest_internal; - auto const options = - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), - Options{} - .set(1234) - .set(2345)); - EXPECT_EQ(1234, options.get()); - EXPECT_EQ(2345, options.get()); -} - -TEST_F(ClientOptionsTest, Timeouts) { - EXPECT_EQ(std::chrono::seconds(42), - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), - Options{}.set( - std::chrono::seconds(42))) - .get()); - - EXPECT_EQ(std::chrono::seconds(7), - internal::DefaultOptions( - oauth2::CreateAnonymousCredentials(), - Options{} - .set(std::chrono::seconds(42)) - .set(std::chrono::seconds(7))) - .get()); - - EXPECT_EQ(std::chrono::seconds(7), - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), - Options{}.set( - std::chrono::seconds(7))) - .get()); - - EXPECT_NE( - std::chrono::seconds(0), - internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), Options{}) - .get()); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google diff --git a/google/cloud/storage/client_test.cc b/google/cloud/storage/client_test.cc index 07ebb8a424bbc..f3dd8ae3a7310 100644 --- a/google/cloud/storage/client_test.cc +++ b/google/cloud/storage/client_test.cc @@ -17,15 +17,25 @@ #include "google/cloud/storage/retry_policy.h" #include "google/cloud/storage/testing/canonical_errors.h" #include "google/cloud/storage/testing/mock_client.h" +#include "google/cloud/internal/curl_options.h" +#include "google/cloud/internal/filesystem.h" #include "google/cloud/internal/getenv.h" +#include "google/cloud/internal/random.h" +#include "google/cloud/internal/rest_options.h" +#include "google/cloud/internal/rest_response.h" #include "google/cloud/opentelemetry_options.h" #include "google/cloud/testing_util/mock_backoff_policy.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/scoped_environment.h" +#include "google/cloud/testing_util/setenv.h" #include "google/cloud/testing_util/status_matchers.h" +#include "google/cloud/universe_domain_options.h" #include #include +#include +#include #include +#include #include #include @@ -37,12 +47,11 @@ namespace { using ::google::cloud::storage::internal::ClientImplDetails; using ::google::cloud::storage::testing::canonical_errors::TransientError; -using ::google::cloud::testing_util::IsOkAndHolds; -using ::google::cloud::testing_util::MockBackoffPolicy; using ::google::cloud::testing_util::ScopedEnvironment; using ::testing::ElementsAre; using ::testing::NotNull; using ::testing::Return; +using ::testing::UnorderedElementsAre; class ObservableRetryPolicy : public LimitedErrorCountRetryPolicy { public: @@ -81,6 +90,13 @@ class ObservableBackoffPolicy : public ExponentialBackoffPolicy { int ObservableBackoffPolicy::on_completion_call_count_; class ClientTest : public ::testing::Test { + public: + ClientTest() + : enable_tracing_("CLOUD_STORAGE_ENABLE_TRACING", {}), + endpoint_("CLOUD_STORAGE_EMULATOR_ENDPOINT", {}), + old_endpoint_("CLOUD_STORAGE_TESTBENCH_ENDPOINT", {}), + generator_(std::random_device{}()) {} + protected: void SetUp() override { mock_ = std::make_shared(); @@ -94,6 +110,10 @@ class ClientTest : public ::testing::Test { } std::shared_ptr mock_; + ScopedEnvironment enable_tracing_; + ScopedEnvironment endpoint_; + ScopedEnvironment old_endpoint_; + google::cloud::internal::DefaultPRNG generator_; }; TEST_F(ClientTest, Equality) { @@ -196,7 +216,6 @@ TEST_F(ClientTest, LoggingDecoratorsRestClient) { ElementsAre("RestStub", "LoggingStub", "StorageConnectionImpl")); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; @@ -239,63 +258,243 @@ TEST_F(ClientTest, OTelDisableTracing) { ElementsAre("RestStub", "LoggingStub", "StorageConnectionImpl")); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +TEST_F(ClientTest, EndpointsDefault) { + testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_EMULATOR_ENDPOINT", + {}); + auto options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_EQ("https://storage.googleapis.com", + options.get()); + EXPECT_EQ("https://iamcredentials.googleapis.com/v1", + options.get()); +} + +TEST_F(ClientTest, EndpointsOverride) { + testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_EMULATOR_ENDPOINT", + {}); + auto options = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set("http://127.0.0.1.nip.io:1234")); + EXPECT_EQ("http://127.0.0.1.nip.io:1234", options.get()); + EXPECT_EQ("https://iamcredentials.googleapis.com/v1", + options.get()); +} -#include "google/cloud/internal/disable_deprecation_warnings.inc" +TEST_F(ClientTest, EndpointsEmulator) { + testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_EMULATOR_ENDPOINT", + "http://localhost:1234"); + auto options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_EQ("http://localhost:1234", options.get()); + EXPECT_EQ("http://localhost:1234/iamapi", options.get()); +} -TEST_F(ClientTest, DeprecatedButNotDecommissioned) { - auto m1 = std::make_shared(); +TEST_F(ClientTest, OldEndpointsEmulator) { + google::cloud::testing_util::UnsetEnv("CLOUD_STORAGE_EMULATOR_ENDPOINT"); + testing_util::ScopedEnvironment endpoint("CLOUD_STORAGE_TESTBENCH_ENDPOINT", + "http://localhost:1234"); + auto options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_EQ("http://localhost:1234", options.get()); + EXPECT_EQ("http://localhost:1234/iamapi", options.get()); +} - auto c1 = storage::Client(m1, Client::NoDecorations{}); - EXPECT_EQ(c1.raw_client().get(), m1.get()); +TEST_F(ClientTest, DefaultOptions) { + auto o = internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_EQ("https://storage.googleapis.com", o.get()); + + // Verify any set values are respected overridden. + o = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set("https://private.googleapis.com")); + EXPECT_EQ("https://private.googleapis.com", o.get()); + + o = internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_EQ("https://storage.googleapis.com", o.get()); + EXPECT_EQ("https://iamcredentials.googleapis.com/v1", + o.get()); + + EXPECT_EQ("v1", o.get()); + EXPECT_LT(0, o.get()); + EXPECT_LT(0, o.get()); + EXPECT_LT(0, o.get()); + EXPECT_LE(0, o.get()); + EXPECT_TRUE(o.get()); + EXPECT_TRUE(o.get()); + EXPECT_EQ(0, o.get()); + EXPECT_EQ(0, o.get()); + EXPECT_LT(std::chrono::seconds(0), o.get()); + EXPECT_LT(0, o.get()); + EXPECT_LT(std::chrono::seconds(0), o.get()); + EXPECT_LT(0, o.get()); + + namespace rest = ::google::cloud::rest_internal; + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + EXPECT_EQ(o.get(), + o.get()); + + EXPECT_FALSE(o.has()); + EXPECT_FALSE(o.has()); +} + +TEST_F(ClientTest, IncorporatesUniverseDomain) { + auto o = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set( + "my-ud.net")); + EXPECT_EQ(o.get(), "https://storage.my-ud.net"); + EXPECT_EQ(o.get(), "https://iamcredentials.my-ud.net/v1"); +} + +TEST_F(ClientTest, IncorporatesUniverseDomainEnvVar) { + ScopedEnvironment ud("GOOGLE_CLOUD_UNIVERSE_DOMAIN", "ud-env-var.net"); + + auto o = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set( + "ud-option.net")); + EXPECT_EQ(o.get(), "https://storage.ud-env-var.net"); + EXPECT_EQ(o.get(), + "https://iamcredentials.ud-env-var.net/v1"); +} + +TEST_F(ClientTest, CustomEndpointOverridesUniverseDomain) { + ScopedEnvironment ud("GOOGLE_CLOUD_UNIVERSE_DOMAIN", "ud-env-var.net"); + + auto o = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{} + .set("https://custom-storage.googleapis.com") + .set( + "https://custom-iamcredentials.googleapis.com/v1") + .set("ud-option.net")); + EXPECT_EQ(o.get(), + "https://custom-storage.googleapis.com"); + EXPECT_EQ(o.get(), + "https://custom-iamcredentials.googleapis.com/v1"); +} + +TEST_F(ClientTest, HttpVersion) { + namespace rest = ::google::cloud::rest_internal; + auto const options = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set("2.0")); + EXPECT_EQ("2.0", options.get()); +} + +TEST_F(ClientTest, CAPathOption) { + namespace rest = ::google::cloud::rest_internal; + auto const options = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set("test-only")); + EXPECT_EQ("test-only", options.get()); +} + +TEST_F(ClientTest, LoggingWithoutEnv) { + ScopedEnvironment env_common("GOOGLE_CLOUD_CPP_ENABLE_TRACING", + absl::nullopt); + ScopedEnvironment env("CLOUD_STORAGE_ENABLE_TRACING", absl::nullopt); + auto const options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_FALSE(options.has()); +} + +TEST_F(ClientTest, LoggingWithEnv) { + ScopedEnvironment env_common("GOOGLE_CLOUD_CPP_ENABLE_TRACING", + absl::nullopt); + ScopedEnvironment env("CLOUD_STORAGE_ENABLE_TRACING", "rpc,http"); + auto const options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_THAT(options.get(), + UnorderedElementsAre("rpc", "http")); +} + +TEST_F(ClientTest, TracingWithoutEnv) { + ScopedEnvironment env("GOOGLE_CLOUD_CPP_OPENTELEMETRY_TRACING", + absl::nullopt); + auto options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_FALSE(options.get()); + + options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), + Options{}.set(true)); + EXPECT_TRUE(options.get()); +} + +TEST_F(ClientTest, TracingWithEnv) { + ScopedEnvironment env("GOOGLE_CLOUD_CPP_OPENTELEMETRY_TRACING", "ON"); + auto const options = internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{}.set(false)); + EXPECT_TRUE(options.get()); +} + +TEST_F(ClientTest, ProjectIdWithoutEnv) { + ScopedEnvironment env("GOOGLE_CLOUD_PROJECT", absl::nullopt); + auto const options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_FALSE(options.has()); +} - auto m2 = std::make_shared(); - auto c2 = storage::Client(m2, LimitedErrorCountRetryPolicy(3)); - EXPECT_NE(c2.raw_client().get(), m2.get()); +TEST_F(ClientTest, ProjectIdtWithEnv) { + ScopedEnvironment env("GOOGLE_CLOUD_PROJECT", "my-project"); + auto const options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {}); + EXPECT_EQ("my-project", options.get()); } -TEST_F(ClientTest, DeprecatedRetryPolicies) { - auto constexpr kNumRetries = 2; - auto mock_b = std::make_unique(); - EXPECT_CALL(*mock_b, clone).WillOnce([=] { - auto clone_1 = std::make_unique(); - EXPECT_CALL(*clone_1, clone).WillOnce([=] { - auto clone_2 = std::make_unique(); - EXPECT_CALL(*clone_2, OnCompletion) - .Times(kNumRetries) - .WillRepeatedly(Return(std::chrono::milliseconds(0))); - return clone_2; - }); - return clone_1; - }); - - auto mock = std::make_shared(); - EXPECT_CALL(*mock, ListBuckets) - .Times(kNumRetries + 1) - .WillRepeatedly(Return(TransientError())); - - auto client = storage::Client(mock, LimitedErrorCountRetryPolicy(kNumRetries), - std::move(*mock_b)); - (void)client.ListBuckets(OverrideDefaultProject("fake-project")); +TEST_F(ClientTest, OverrideWithRestInternal) { + namespace rest = ::google::cloud::rest_internal; + auto const options = + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), + Options{} + .set(1234) + .set(2345)); + EXPECT_EQ(1234, options.get()); + EXPECT_EQ(2345, options.get()); } -TEST_F(ClientTest, DeprecatedClientFromMock) { - auto mock = std::make_shared(); - auto client = testing::ClientFromMock(mock); - - internal::ListObjectsResponse response; - response.items.push_back( - ObjectMetadata{}.set_bucket("bucket").set_name("object/1")); - response.items.push_back( - ObjectMetadata{}.set_bucket("bucket").set_name("object/2")); - EXPECT_CALL(*mock, ListObjects) - .WillOnce(Return(TransientError())) - .WillOnce(Return(response)); - - auto stream = client.ListObjects("bucket", Prefix("object/")); - std::vector> objects{stream.begin(), stream.end()}; - EXPECT_THAT(objects, ElementsAre(IsOkAndHolds(response.items[0]), - IsOkAndHolds(response.items[1]))); +TEST_F(ClientTest, Timeouts) { + EXPECT_EQ(std::chrono::seconds(42), + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), + Options{}.set( + std::chrono::seconds(42))) + .get()); + + EXPECT_EQ(std::chrono::seconds(7), + internal::DefaultOptions( + oauth2::CreateAnonymousCredentials(), + Options{} + .set(std::chrono::seconds(42)) + .set(std::chrono::seconds(7))) + .get()); + + EXPECT_EQ(std::chrono::seconds(7), + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), + Options{}.set( + std::chrono::seconds(7))) + .get()); + + EXPECT_NE( + std::chrono::seconds(0), + internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), Options{}) + .get()); } } // namespace diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in index 9f10f775d01bf..fc0d2a1f3e37d 100644 --- a/google/cloud/storage/config.cmake.in +++ b/google/cloud/storage/config.cmake.in @@ -17,7 +17,6 @@ find_dependency(google_cloud_cpp_rest_internal) find_dependency(google_cloud_cpp_common) find_dependency(absl) find_dependency(CURL) -find_dependency(Crc32c) find_dependency(nlohmann_json) if (NOT WIN32) find_dependency(OpenSSL) diff --git a/google/cloud/storage/examples/BUILD.bazel b/google/cloud/storage/examples/BUILD.bazel index 4cdc4c6d3c531..dce88abeeec74 100644 --- a/google/cloud/storage/examples/BUILD.bazel +++ b/google/cloud/storage/examples/BUILD.bazel @@ -44,7 +44,7 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in storage_examples_unit_tests] @@ -75,7 +75,7 @@ cc_library( "//:storage_grpc_mocks", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in storage_grpc_unit_tests] diff --git a/google/cloud/storage/examples/storage_bucket_iam_samples.cc b/google/cloud/storage/examples/storage_bucket_iam_samples.cc index 13db584e8cc57..e7a40f4b931e1 100644 --- a/google/cloud/storage/examples/storage_bucket_iam_samples.cc +++ b/google/cloud/storage/examples/storage_bucket_iam_samples.cc @@ -328,8 +328,9 @@ void RunAll(std::vector const& argv) { client, {bucket_name, "roles/storage.objectViewer", condition_title, condition_description, condition_expression}); - std::cout << "\nRunning NativeSetBucketPublicIam() example" << std::endl; - NativeSetBucketPublicIam(client, {bucket_name}); + // TODO(#15854): Enable this test when the issue is resolved. + // std::cout << "\nRunning NativeSetBucketPublicIam() example" << std::endl; + // NativeSetBucketPublicIam(client, {bucket_name}); if (!examples::UsingEmulator()) std::this_thread::sleep_until(pause); (void)examples::RemoveBucketAndContents(client, bucket_name); diff --git a/google/cloud/storage/google_cloud_cpp_storage.bzl b/google/cloud/storage/google_cloud_cpp_storage.bzl index 41bb9f343edbb..7b1dda7134f8e 100644 --- a/google/cloud/storage/google_cloud_cpp_storage.bzl +++ b/google/cloud/storage/google_cloud_cpp_storage.bzl @@ -36,7 +36,6 @@ google_cloud_cpp_storage_hdrs = [ "bucket_versioning.h", "bucket_website.h", "client.h", - "client_options.h", "download_options.h", "enable_object_retention.h", "hash_mismatch_error.h", @@ -46,8 +45,6 @@ google_cloud_cpp_storage_hdrs = [ "iam_policy.h", "idempotency_policy.h", "include_folders_as_prefixes.h", - "internal/access_control_common.h", - "internal/access_control_common_parser.h", "internal/access_token_credentials.h", "internal/base64.h", "internal/binary_data_as_debug_string.h", @@ -55,8 +52,6 @@ google_cloud_cpp_storage_hdrs = [ "internal/bucket_acl_requests.h", "internal/bucket_metadata_parser.h", "internal/bucket_requests.h", - "internal/common_metadata.h", - "internal/common_metadata_parser.h", "internal/complex_option.h", "internal/compute_engine_util.h", "internal/connection_factory.h", @@ -174,12 +169,10 @@ google_cloud_cpp_storage_srcs = [ "bucket_retention_policy.cc", "bucket_soft_delete_policy.cc", "client.cc", - "client_options.cc", "hashing_options.cc", "hmac_key_metadata.cc", "iam_policy.cc", "idempotency_policy.cc", - "internal/access_control_common_parser.cc", "internal/access_token_credentials.cc", "internal/base64.cc", "internal/bucket_access_control_parser.cc", diff --git a/google/cloud/storage/google_cloud_cpp_storage.cmake b/google/cloud/storage/google_cloud_cpp_storage.cmake index 6867722eadaf7..c374c34ce4a34 100644 --- a/google/cloud/storage/google_cloud_cpp_storage.cmake +++ b/google/cloud/storage/google_cloud_cpp_storage.cmake @@ -54,8 +54,6 @@ add_library( bucket_website.h client.cc client.h - client_options.cc - client_options.h download_options.h enable_object_retention.h hash_mismatch_error.h @@ -69,9 +67,6 @@ add_library( idempotency_policy.cc idempotency_policy.h include_folders_as_prefixes.h - internal/access_control_common.h - internal/access_control_common_parser.cc - internal/access_control_common_parser.h internal/access_token_credentials.cc internal/access_token_credentials.h internal/base64.cc @@ -85,8 +80,6 @@ add_library( internal/bucket_metadata_parser.h internal/bucket_requests.cc internal/bucket_requests.h - internal/common_metadata.h - internal/common_metadata_parser.h internal/complex_option.h internal/compute_engine_util.cc internal/compute_engine_util.h @@ -274,7 +267,6 @@ target_link_libraries( google-cloud-cpp::common google-cloud-cpp::rest_internal nlohmann_json::nlohmann_json - Crc32c::crc32c CURL::libcurl Threads::Threads) if (WIN32) @@ -348,8 +340,6 @@ google_cloud_cpp_add_pkgconfig( "absl_variant" NON_WIN32_REQUIRES openssl - LIBS - crc32c WIN32_LIBS ws2_32 bcrypt) @@ -441,7 +431,6 @@ if (BUILD_TESTING) client_object_acl_test.cc client_object_copy_test.cc client_object_test.cc - client_options_test.cc client_service_account_test.cc client_sign_policy_document_test.cc client_sign_url_test.cc @@ -452,8 +441,6 @@ if (BUILD_TESTING) hashing_options_test.cc hmac_key_metadata_test.cc idempotency_policy_test.cc - internal/access_control_common_parser_test.cc - internal/access_control_common_test.cc internal/access_token_credentials_test.cc internal/base64_test.cc internal/bucket_acl_requests_test.cc diff --git a/google/cloud/storage/internal/access_control_common.h b/google/cloud/storage/internal/access_control_common.h deleted file mode 100644 index 2ab66207ac7b0..0000000000000 --- a/google/cloud/storage/internal/access_control_common.h +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ACCESS_CONTROL_COMMON_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ACCESS_CONTROL_COMMON_H - -#include "google/cloud/storage/project_team.h" -#include "google/cloud/storage/version.h" -#include "google/cloud/status.h" -#include "absl/types/optional.h" -#include -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -struct AccessControlCommonParser; - -/** - * Defines common code to both `BucketAccessControl` and `ObjectAccessControl`. - * - * @see - * https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls - * https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls - */ -// TODO(#9897) - remove this class and any references to it -class GOOGLE_CLOUD_CPP_DEPRECATED( - "This class will be removed shortly after 2023-06-01") AccessControlCommon { - public: - AccessControlCommon() = default; - - ///@{ - /** - * @name Well-known values for the role() field.. - * - * The following functions are handy to avoid common typos in the role names. - * We use functions instead of enums because enums are not backwards - * compatible and are brittle to changes in the server-side. - */ - static std::string ROLE_OWNER() { return "OWNER"; } - static std::string ROLE_READER() { return "READER"; } - ///@} - - ///@{ - /** - * @name Well-known values for the project_team().team field.. - * - * The following functions are handy to avoid common typos in the team names. - * We use functions instead of enums because enums are not backwards - * compatible and are brittle to changes in the server-side. - */ - static std::string TEAM_EDITORS() { return storage::TEAM_EDITORS(); } - static std::string TEAM_OWNERS() { return storage::TEAM_OWNERS(); } - static std::string TEAM_VIEWERS() { return storage::TEAM_VIEWERS(); } - ///@} - - std::string const& bucket() const { return bucket_; } - std::string const& domain() const { return domain_; } - std::string const& email() const { return email_; } - - std::string const& entity() const { return entity_; } - void set_entity(std::string e) { entity_ = std::move(e); } - - std::string const& entity_id() const { return entity_id_; } - std::string const& etag() const { return etag_; } - std::string const& id() const { return id_; } - std::string const& kind() const { return kind_; } - - bool has_project_team() const { return project_team_.has_value(); } - ProjectTeam const& project_team() const { return *project_team_; } - absl::optional const& project_team_as_optional() const { - return project_team_; - } - - std::string const& role() const { return role_; } - void set_role(std::string r) { role_ = std::move(r); } - - std::string const& self_link() const { return self_link_; } - - private: - friend struct internal::AccessControlCommonParser; - - std::string bucket_; - std::string domain_; - std::string email_; - std::string entity_; - std::string entity_id_; - std::string etag_; - std::string id_; - std::string kind_; - absl::optional project_team_; - std::string role_; - std::string self_link_; -}; - -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -inline bool operator==(AccessControlCommon const& lhs, - AccessControlCommon const& rhs) { - // Start with id, bucket, etag because they should fail early, then - // alphabetical for readability. - return lhs.id() == rhs.id() && lhs.bucket() == rhs.bucket() && - lhs.etag() == rhs.etag() && lhs.domain() == rhs.domain() && - lhs.email() == rhs.email() && lhs.entity() == rhs.entity() && - lhs.entity_id() == rhs.entity_id() && lhs.kind() == rhs.kind() && - lhs.has_project_team() == rhs.has_project_team() && - (!lhs.has_project_team() || - lhs.project_team() == rhs.project_team()) && - lhs.role() == rhs.role() && lhs.self_link() == rhs.self_link(); -} - -inline bool operator!=(AccessControlCommon const& lhs, - AccessControlCommon const& rhs) { - return std::rel_ops::operator!=(lhs, rhs); -} - -#include "google/cloud/internal/diagnostics_pop.inc" - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ACCESS_CONTROL_COMMON_H diff --git a/google/cloud/storage/internal/access_control_common_parser.cc b/google/cloud/storage/internal/access_control_common_parser.cc deleted file mode 100644 index 66efe5f967354..0000000000000 --- a/google/cloud/storage/internal/access_control_common_parser.cc +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/storage/internal/access_control_common_parser.h" -#include "google/cloud/storage/internal/metadata_parser.h" -#include -// This file contains the implementation for deprecated functions, we need to -// disable the warnings. -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -Status AccessControlCommonParser::FromJson(AccessControlCommon& result, - nlohmann::json const& json) { - if (!json.is_object()) return NotJsonObject(json, GCP_ERROR_INFO()); - result.bucket_ = json.value("bucket", ""); - result.domain_ = json.value("domain", ""); - result.email_ = json.value("email", ""); - result.entity_ = json.value("entity", ""); - result.entity_id_ = json.value("entityId", ""); - result.etag_ = json.value("etag", ""); - result.id_ = json.value("id", ""); - result.kind_ = json.value("kind", ""); - result.role_ = json.value("role", ""); - result.self_link_ = json.value("selfLink", ""); - if (json.count("projectTeam") != 0) { - auto const& tmp = json["projectTeam"]; - if (tmp.is_null()) return Status{}; - ProjectTeam p; - p.project_number = tmp.value("projectNumber", ""); - p.team = tmp.value("team", ""); - result.project_team_ = std::move(p); - } - return Status(); -} - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google diff --git a/google/cloud/storage/internal/access_control_common_parser.h b/google/cloud/storage/internal/access_control_common_parser.h deleted file mode 100644 index 459efdc619ecb..0000000000000 --- a/google/cloud/storage/internal/access_control_common_parser.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ACCESS_CONTROL_COMMON_PARSER_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ACCESS_CONTROL_COMMON_PARSER_H - -#include "google/cloud/storage/internal/access_control_common.h" -#include "google/cloud/status.h" -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { - -// TODO(#9897) - remove this class and any references to it -struct GOOGLE_CLOUD_CPP_DEPRECATED( - "This class will be removed shortly after 2023-06-01") - AccessControlCommonParser { -#include "google/cloud/internal/disable_deprecation_warnings.inc" - - static Status FromJson(AccessControlCommon& result, - nlohmann::json const& json); - -#include "google/cloud/internal/diagnostics_pop.inc" -}; - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ACCESS_CONTROL_COMMON_PARSER_H diff --git a/google/cloud/storage/internal/access_control_common_parser_test.cc b/google/cloud/storage/internal/access_control_common_parser_test.cc deleted file mode 100644 index ceb919627dd7d..0000000000000 --- a/google/cloud/storage/internal/access_control_common_parser_test.cc +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/storage/internal/access_control_common_parser.h" -#include "google/cloud/testing_util/status_matchers.h" -#include -#include -#include -// This file contains tests for deprecated functions, we need to disable the -// warnings -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace { - -using ::testing::Eq; - -TEST(AccessControlCommonParserTest, FromJson) { - std::string bucket = "bucket-0"; - std::string role = internal::AccessControlCommon::ROLE_OWNER(); - std::string email = "foo@example.com"; - nlohmann::json metadata{{"bucket", bucket}, {"role", role}, {"email", email}}; - internal::AccessControlCommon result{}; - auto status = internal::AccessControlCommonParser::FromJson(result, metadata); - ASSERT_STATUS_OK(status); - - EXPECT_THAT(result.bucket(), Eq(bucket)); - EXPECT_THAT(result.role(), Eq(role)); - EXPECT_THAT(result.email(), Eq(email)); - EXPECT_FALSE(result.has_project_team()); -} - -TEST(AccessControlCommonParserTest, NullProjectTeamIsValid) { - nlohmann::json metadata{{"projectTeam", nullptr}}; - internal::AccessControlCommon result{}; - auto status = internal::AccessControlCommonParser::FromJson(result, metadata); - ASSERT_STATUS_OK(status); - - EXPECT_FALSE(result.has_project_team()); -} - -} // namespace -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google diff --git a/google/cloud/storage/internal/access_control_common_test.cc b/google/cloud/storage/internal/access_control_common_test.cc deleted file mode 100644 index ae8acc14d6c8e..0000000000000 --- a/google/cloud/storage/internal/access_control_common_test.cc +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "google/cloud/storage/internal/access_control_common.h" -#include -// This file contains tests for deprecated functions, we need to disable the -// warnings. -#include "google/cloud/internal/disable_deprecation_warnings.inc" - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -namespace { -/// @test Verify the well-known values defined in AccessControlCommon. -TEST(AccessControlCommonTest, WellKnownValues) { - EXPECT_EQ("OWNER", AccessControlCommon::ROLE_OWNER()); - EXPECT_EQ("READER", AccessControlCommon::ROLE_READER()); - - EXPECT_EQ("editors", AccessControlCommon::TEAM_EDITORS()); - EXPECT_EQ("owners", AccessControlCommon::TEAM_OWNERS()); - EXPECT_EQ("viewers", AccessControlCommon::TEAM_VIEWERS()); -} - -} // namespace -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google diff --git a/google/cloud/storage/internal/async/connection_impl.h b/google/cloud/storage/internal/async/connection_impl.h index b3afe674e93b9..7eaaab3df02a2 100644 --- a/google/cloud/storage/internal/async/connection_impl.h +++ b/google/cloud/storage/internal/async/connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/version.h" #include "absl/strings/cord.h" #include "absl/strings/string_view.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/connection_tracing.cc b/google/cloud/storage/internal/async/connection_tracing.cc index 66b89607f4031..57526c2b995c5 100644 --- a/google/cloud/storage/internal/async/connection_tracing.cc +++ b/google/cloud/storage/internal/async/connection_tracing.cc @@ -27,8 +27,6 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { class AsyncConnectionTracing : public storage_experimental::AsyncConnection { @@ -233,16 +231,6 @@ MakeTracingAsyncConnection( return std::make_unique(std::move(impl)); } -#else - -std::shared_ptr -MakeTracingAsyncConnection( - std::shared_ptr impl) { - return impl; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/async/connection_tracing_test.cc b/google/cloud/storage/internal/async/connection_tracing_test.cc index 72bbfaaddf676..a5a0e21c8d71f 100644 --- a/google/cloud/storage/internal/async/connection_tracing_test.cc +++ b/google/cloud/storage/internal/async/connection_tracing_test.cc @@ -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 "google/cloud/storage/internal/async/connection_tracing.h" #include "google/cloud/storage/async/object_descriptor_connection.h" #include "google/cloud/storage/async/reader_connection.h" @@ -744,5 +742,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/handle_redirect_error.h b/google/cloud/storage/internal/async/handle_redirect_error.h index 2026203fc8b4d..5cdf3b1b3d181 100644 --- a/google/cloud/storage/internal/async/handle_redirect_error.h +++ b/google/cloud/storage/internal/async/handle_redirect_error.h @@ -17,8 +17,8 @@ #include "google/cloud/status.h" #include "google/cloud/version.h" -#include -#include +#include "google/rpc/status.pb.h" +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/async/handle_redirect_error_test.cc b/google/cloud/storage/internal/async/handle_redirect_error_test.cc index 0324afd1fb069..d681cdf1e790c 100644 --- a/google/cloud/storage/internal/async/handle_redirect_error_test.cc +++ b/google/cloud/storage/internal/async/handle_redirect_error_test.cc @@ -17,9 +17,9 @@ #include "google/cloud/internal/status_payload_keys.h" #include "google/cloud/status.h" #include "google/cloud/testing_util/status_matchers.h" +#include "google/rpc/error_details.pb.h" +#include "google/rpc/status.pb.h" #include -#include -#include #include namespace google { diff --git a/google/cloud/storage/internal/async/insert_object.h b/google/cloud/storage/internal/async/insert_object.h index 7b2714fdc4ffa..475a8b1f190df 100644 --- a/google/cloud/storage/internal/async/insert_object.h +++ b/google/cloud/storage/internal/async/insert_object.h @@ -23,7 +23,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/strings/cord.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/async/object_descriptor_connection_tracing.cc b/google/cloud/storage/internal/async/object_descriptor_connection_tracing.cc index 379eb343bdc8d..9d95f8cd34d0a 100644 --- a/google/cloud/storage/internal/async/object_descriptor_connection_tracing.cc +++ b/google/cloud/storage/internal/async/object_descriptor_connection_tracing.cc @@ -17,9 +17,7 @@ #include "google/cloud/storage/internal/async/reader_connection_tracing.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/version.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include #include namespace google { @@ -27,11 +25,9 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { -namespace sc = ::opentelemetry::trace::SemanticConventions; +namespace sc = ::opentelemetry::semconv; class AsyncObjectDescriptorConnectionTracing : public storage_experimental::ObjectDescriptorConnection { @@ -56,7 +52,7 @@ class AsyncObjectDescriptorConnectionTracing internal::OTelScope scope(span_); auto result = impl_->Read(p); span_->AddEvent("gl-cpp.open.read", - {{sc::kThreadId, internal::CurrentThreadId()}, + {{sc::thread::kThreadId, internal::CurrentThreadId()}, {"read-start", p.start}, {"read-length", p.length}}); return MakeTracingReaderConnection(span_, std::move(result)); @@ -81,8 +77,6 @@ MakeTracingObjectDescriptorConnection( std::move(span), std::move(impl)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/async/object_descriptor_connection_tracing.h b/google/cloud/storage/internal/async/object_descriptor_connection_tracing.h index cff3325993113..8e81c2ff6570b 100644 --- a/google/cloud/storage/internal/async/object_descriptor_connection_tracing.h +++ b/google/cloud/storage/internal/async/object_descriptor_connection_tracing.h @@ -16,24 +16,18 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_OBJECT_DESCRIPTOR_CONNECTION_TRACING_H #include "google/cloud/storage/async/object_descriptor_connection.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/opentelemetry.h" -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY namespace google { namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTracingObjectDescriptorConnection( opentelemetry::nostd::shared_ptr span, std::shared_ptr impl); -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/async/object_descriptor_connection_tracing_test.cc b/google/cloud/storage/internal/async/object_descriptor_connection_tracing_test.cc index 46c1e049c2208..2a82fb788776b 100644 --- a/google/cloud/storage/internal/async/object_descriptor_connection_tracing_test.cc +++ b/google/cloud/storage/internal/async/object_descriptor_connection_tracing_test.cc @@ -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 "google/cloud/storage/internal/async/object_descriptor_connection_tracing.h" #include "google/cloud/storage/async/object_descriptor_connection.h" #include "google/cloud/storage/mocks/mock_async_object_descriptor_connection.h" @@ -23,7 +21,7 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include #include -#include +#include namespace google { namespace cloud { @@ -70,7 +68,7 @@ auto expect_no_context = [](auto f) { }; TEST(ObjectDescriptorConnectionTracing, Read) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_unique(); @@ -86,21 +84,22 @@ TEST(ObjectDescriptorConnectionTracing, Read) { actual.reset(); auto spans = span_catcher->GetSpans(); - EXPECT_THAT(spans, - ElementsAre(AllOf( - SpanNamed("test-span-name"), - SpanWithStatus(opentelemetry::trace::StatusCode::kOk), - SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanHasEvents(AllOf( - EventNamed("gl-cpp.open.read"), - SpanEventAttributesAre( - OTelAttribute("read-length", 200), - OTelAttribute("read-start", 100), - OTelAttribute(sc::kThreadId, _))))))); + EXPECT_THAT( + spans, + ElementsAre(AllOf( + SpanNamed("test-span-name"), + SpanWithStatus(opentelemetry::trace::StatusCode::kOk), + SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanHasEvents(AllOf( + EventNamed("gl-cpp.open.read"), + SpanEventAttributesAre( + OTelAttribute("read-length", 200), + OTelAttribute("read-start", 100), + OTelAttribute(sc::thread::kThreadId, _))))))); } TEST(ObjectDescriptorConnectionTracing, ReadThenRead) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock_connection = @@ -127,25 +126,26 @@ TEST(ObjectDescriptorConnectionTracing, ReadThenRead) { auto spans = span_catcher->GetSpans(); EXPECT_THAT( - spans, ElementsAre(AllOf( - SpanNamed("test-span"), - SpanWithStatus(opentelemetry::trace::StatusCode::kOk), - SpanHasInstrumentationScope(), SpanKindIsClient(), - SpanEventsAre( - AllOf(EventNamed("gl-cpp.open.read"), - SpanEventAttributesAre( - OTelAttribute("read-length", 0), - OTelAttribute("read-start", 0), - OTelAttribute(sc::kThreadId, _))), - AllOf(EventNamed("gl-cpp.read"), - SpanEventAttributesAre( - OTelAttribute( - "message.starting_offset", 123), - OTelAttribute(sc::kThreadId, _), - OTelAttribute("rpc.message.id", 1), - // THIS WAS THE MISSING ATTRIBUTE: - OTelAttribute("rpc.message.type", - "RECEIVED"))))))); + spans, + ElementsAre(AllOf( + SpanNamed("test-span"), + SpanWithStatus(opentelemetry::trace::StatusCode::kOk), + SpanHasInstrumentationScope(), SpanKindIsClient(), + SpanEventsAre( + AllOf(EventNamed("gl-cpp.open.read"), + SpanEventAttributesAre( + OTelAttribute("read-length", 0), + OTelAttribute("read-start", 0), + OTelAttribute(sc::thread::kThreadId, _))), + AllOf(EventNamed("gl-cpp.read"), + SpanEventAttributesAre( + OTelAttribute("message.starting_offset", + 123), + OTelAttribute(sc::thread::kThreadId, _), + OTelAttribute("rpc.message.id", 1), + // THIS WAS THE MISSING ATTRIBUTE: + OTelAttribute("rpc.message.type", + "RECEIVED"))))))); } } // namespace @@ -153,5 +153,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/object_descriptor_impl.cc b/google/cloud/storage/internal/async/object_descriptor_impl.cc index cebca0a2bbfc5..99b4b697d8019 100644 --- a/google/cloud/storage/internal/async/object_descriptor_impl.cc +++ b/google/cloud/storage/internal/async/object_descriptor_impl.cc @@ -20,7 +20,7 @@ #include "google/cloud/storage/internal/hash_function_impl.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/opentelemetry.h" -#include +#include "google/rpc/status.pb.h" #include #include diff --git a/google/cloud/storage/internal/async/object_descriptor_impl.h b/google/cloud/storage/internal/async/object_descriptor_impl.h index f4c467de5c42e..82a7e318d9459 100644 --- a/google/cloud/storage/internal/async/object_descriptor_impl.h +++ b/google/cloud/storage/internal/async/object_descriptor_impl.h @@ -24,7 +24,7 @@ #include "google/cloud/status.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/object_descriptor_impl_test.cc b/google/cloud/storage/internal/async/object_descriptor_impl_test.cc index 595dd34231b6d..7edd33292c9c2 100644 --- a/google/cloud/storage/internal/async/object_descriptor_impl_test.cc +++ b/google/cloud/storage/internal/async/object_descriptor_impl_test.cc @@ -23,9 +23,9 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" #include "absl/strings/string_view.h" +#include "google/storage/v2/storage.pb.h" #include #include -#include #include namespace google { diff --git a/google/cloud/storage/internal/async/object_descriptor_reader_tracing.cc b/google/cloud/storage/internal/async/object_descriptor_reader_tracing.cc index 3754120c02ed9..f070ed5286825 100644 --- a/google/cloud/storage/internal/async/object_descriptor_reader_tracing.cc +++ b/google/cloud/storage/internal/async/object_descriptor_reader_tracing.cc @@ -17,9 +17,7 @@ #include "google/cloud/storage/internal/async/object_descriptor_reader.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/version.h" -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY -#include -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY +#include #include namespace google { @@ -27,11 +25,9 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { -namespace sc = ::opentelemetry::trace::SemanticConventions; +namespace sc = ::opentelemetry::semconv; class ObjectDescriptorReaderTracing : public ObjectDescriptorReader { public: @@ -56,13 +52,13 @@ class ObjectDescriptorReaderTracing : public ObjectDescriptorReader { span->AddEvent( "gl-cpp.read-range", {{/*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, {"message.size", static_cast(payload.size())}}); } else { span->AddEvent( "gl-cpp.read-range", {{/*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"}, - {sc::kThreadId, internal::CurrentThreadId()}}); + {sc::thread::kThreadId, internal::CurrentThreadId()}}); return internal::EndSpan(*span, absl::get(std::move(result))); } @@ -78,15 +74,6 @@ MakeTracingObjectDescriptorReader(std::shared_ptr impl) { return std::make_unique(std::move(impl)); } -#else // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - -std::unique_ptr -MakeTracingObjectDescriptorReader(std::shared_ptr impl) { - return std::make_unique(std::move(impl)); -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/async/object_descriptor_reader_tracing_test.cc b/google/cloud/storage/internal/async/object_descriptor_reader_tracing_test.cc index c82015c8bf8e6..5b759637e3596 100644 --- a/google/cloud/storage/internal/async/object_descriptor_reader_tracing_test.cc +++ b/google/cloud/storage/internal/async/object_descriptor_reader_tracing_test.cc @@ -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 "google/cloud/storage/internal/async/object_descriptor_reader_tracing.h" #include "google/cloud/storage/testing/canonical_errors.h" #include "google/cloud/opentelemetry_options.h" @@ -22,7 +20,7 @@ #include #include #include -#include +#include namespace google { namespace cloud { @@ -41,7 +39,7 @@ using ::google::cloud::testing_util::SpanNamed; using ::google::protobuf::TextFormat; using ::testing::_; -namespace sc = ::opentelemetry::trace::SemanticConventions; +namespace sc = ::opentelemetry::semconv; TEST(ObjectDescriptorReaderTracing, Read) { auto span_catcher = InstallSpanCatcher(); @@ -60,16 +58,16 @@ TEST(ObjectDescriptorReaderTracing, Read) { auto actual = reader->Read().get(); auto spans = span_catcher->GetSpans(); - EXPECT_THAT( - spans, ElementsAre( - AllOf(SpanNamed("storage::AsyncConnection::ReadRange"), - SpanHasEvents(AllOf( - EventNamed("gl-cpp.read-range"), - SpanEventAttributesAre( - OTelAttribute("message.size", 10), - OTelAttribute(sc::kThreadId, _), - OTelAttribute("rpc.message.type", - "RECEIVED"))))))); + EXPECT_THAT(spans, + ElementsAre(AllOf( + SpanNamed("storage::AsyncConnection::ReadRange"), + SpanHasEvents(AllOf( + EventNamed("gl-cpp.read-range"), + SpanEventAttributesAre( + OTelAttribute("message.size", 10), + OTelAttribute(sc::thread::kThreadId, _), + OTelAttribute("rpc.message.type", + "RECEIVED"))))))); } TEST(ObjectDescriptorReaderTracing, ReadError) { @@ -81,17 +79,17 @@ TEST(ObjectDescriptorReaderTracing, ReadError) { auto actual = reader->Read().get(); auto spans = span_catcher->GetSpans(); - EXPECT_THAT( - spans, - ElementsAre(AllOf( - SpanNamed("storage::AsyncConnection::ReadRange"), - SpanHasAttributes( - OTelAttribute("gl-cpp.status_code", "NOT_FOUND")), - SpanHasEvents(AllOf(EventNamed("gl-cpp.read-range"), - SpanEventAttributesAre( - OTelAttribute(sc::kThreadId, _), - OTelAttribute("rpc.message.type", - "RECEIVED"))))))); + EXPECT_THAT(spans, + ElementsAre(AllOf( + SpanNamed("storage::AsyncConnection::ReadRange"), + SpanHasAttributes(OTelAttribute( + "gl-cpp.status_code", "NOT_FOUND")), + SpanHasEvents(AllOf( + EventNamed("gl-cpp.read-range"), + SpanEventAttributesAre( + OTelAttribute(sc::thread::kThreadId, _), + OTelAttribute("rpc.message.type", + "RECEIVED"))))))); } } // namespace @@ -99,5 +97,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/open_object.h b/google/cloud/storage/internal/async/open_object.h index a3e4c4b6972b6..6398778622da1 100644 --- a/google/cloud/storage/internal/async/open_object.h +++ b/google/cloud/storage/internal/async/open_object.h @@ -23,7 +23,7 @@ #include "google/cloud/status.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/open_stream.h b/google/cloud/storage/internal/async/open_stream.h index bea42960f1336..c0922781b83a2 100644 --- a/google/cloud/storage/internal/async/open_stream.h +++ b/google/cloud/storage/internal/async/open_stream.h @@ -21,7 +21,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/open_stream_test.cc b/google/cloud/storage/internal/async/open_stream_test.cc index eade037781006..1848992311ef1 100644 --- a/google/cloud/storage/internal/async/open_stream_test.cc +++ b/google/cloud/storage/internal/async/open_stream_test.cc @@ -17,7 +17,7 @@ #include "google/cloud/internal/make_status.h" #include "google/cloud/testing_util/async_sequencer.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/async/partial_upload.h b/google/cloud/storage/internal/async/partial_upload.h index f15ae1bb83526..bf4a7be3b2bf4 100644 --- a/google/cloud/storage/internal/async/partial_upload.h +++ b/google/cloud/storage/internal/async/partial_upload.h @@ -21,7 +21,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/strings/cord.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/async/read_payload_impl_test.cc b/google/cloud/storage/internal/async/read_payload_impl_test.cc index 70d03ce5c0dd7..a9752bf9c4dfe 100644 --- a/google/cloud/storage/internal/async/read_payload_impl_test.cc +++ b/google/cloud/storage/internal/async/read_payload_impl_test.cc @@ -15,7 +15,7 @@ #include "google/cloud/storage/internal/async/read_payload_impl.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "absl/strings/string_view.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/async/read_range.h b/google/cloud/storage/internal/async/read_range.h index f955e15291c72..da8da87ad5963 100644 --- a/google/cloud/storage/internal/async/read_range.h +++ b/google/cloud/storage/internal/async/read_range.h @@ -21,7 +21,7 @@ #include "google/cloud/status.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/reader_connection_factory.h b/google/cloud/storage/internal/async/reader_connection_factory.h index 733689c35081f..666b257fde834 100644 --- a/google/cloud/storage/internal/async/reader_connection_factory.h +++ b/google/cloud/storage/internal/async/reader_connection_factory.h @@ -20,7 +20,7 @@ #include "google/cloud/future.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/reader_connection_factory_test.cc b/google/cloud/storage/internal/async/reader_connection_factory_test.cc index ca055e0332251..53b0bbabd8fe6 100644 --- a/google/cloud/storage/internal/async/reader_connection_factory_test.cc +++ b/google/cloud/storage/internal/async/reader_connection_factory_test.cc @@ -14,8 +14,8 @@ #include "google/cloud/storage/internal/async/reader_connection_factory.h" #include "google/cloud/testing_util/is_proto_equal.h" +#include "google/storage/v2/storage.pb.h" #include -#include #include namespace google { diff --git a/google/cloud/storage/internal/async/reader_connection_impl.h b/google/cloud/storage/internal/async/reader_connection_impl.h index 3b2fa229452fe..1fe819e25bec6 100644 --- a/google/cloud/storage/internal/async/reader_connection_impl.h +++ b/google/cloud/storage/internal/async/reader_connection_impl.h @@ -21,7 +21,7 @@ #include "google/cloud/options.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/reader_connection_resume.h b/google/cloud/storage/internal/async/reader_connection_resume.h index 2f3ab2b2d94a4..2b07eba95b499 100644 --- a/google/cloud/storage/internal/async/reader_connection_resume.h +++ b/google/cloud/storage/internal/async/reader_connection_resume.h @@ -25,7 +25,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/version.h" #include "absl/types/optional.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/reader_connection_tracing.cc b/google/cloud/storage/internal/async/reader_connection_tracing.cc index cf27bd19275b1..f549116e16f8d 100644 --- a/google/cloud/storage/internal/async/reader_connection_tracing.cc +++ b/google/cloud/storage/internal/async/reader_connection_tracing.cc @@ -13,10 +13,8 @@ // limitations under the License. #include "google/cloud/storage/internal/async/reader_connection_tracing.h" - -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/internal/opentelemetry.h" -#include +#include #include #include #include @@ -27,7 +25,7 @@ namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = ::opentelemetry::trace::SemanticConventions; +namespace sc = ::opentelemetry::semconv; class AsyncReaderConnectionTracing : public storage_experimental::AsyncReaderConnection { @@ -41,7 +39,7 @@ class AsyncReaderConnectionTracing auto scope = opentelemetry::trace::Scope(span_); span_->AddEvent("gl-cpp.cancel", { - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, }); return impl_->Cancel(); } @@ -57,7 +55,7 @@ class AsyncReaderConnectionTracing { {/*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"}, {/*sc::kRpcMessageId=*/"rpc.message.id", count}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, }); return internal::EndSpan(*span, absl::get(std::move(r))); } @@ -67,7 +65,7 @@ class AsyncReaderConnectionTracing { {/*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"}, {/*sc::kRpcMessageId=*/"rpc.message.id", count}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, {"message.starting_offset", payload.offset()}, }); return r; @@ -104,5 +102,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/reader_connection_tracing.h b/google/cloud/storage/internal/async/reader_connection_tracing.h index ed74f7756bfc3..46bac9b365839 100644 --- a/google/cloud/storage/internal/async/reader_connection_tracing.h +++ b/google/cloud/storage/internal/async/reader_connection_tracing.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_READER_CONNECTION_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_READER_CONNECTION_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/storage/async/reader_connection.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/options.h" @@ -38,6 +36,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_READER_CONNECTION_TRACING_H diff --git a/google/cloud/storage/internal/async/reader_connection_tracing_test.cc b/google/cloud/storage/internal/async/reader_connection_tracing_test.cc index 2e68b1f04ed3f..e7aa366acb375 100644 --- a/google/cloud/storage/internal/async/reader_connection_tracing_test.cc +++ b/google/cloud/storage/internal/async/reader_connection_tracing_test.cc @@ -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 "google/cloud/storage/internal/async/reader_connection_tracing.h" #include "google/cloud/storage/mocks/mock_async_reader_connection.h" #include "google/cloud/storage/testing/canonical_errors.h" @@ -21,7 +19,7 @@ #include "google/cloud/opentelemetry_options.h" #include "google/cloud/testing_util/opentelemetry_matchers.h" #include -#include +#include #include namespace google { @@ -71,7 +69,7 @@ auto expect_no_context = [](auto f) { }; TEST(ReaderConnectionTracing, WithError) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); PromiseWithOTelContext p1; PromiseWithOTelContext p2; @@ -112,7 +110,7 @@ TEST(ReaderConnectionTracing, WithError) { /*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"), OTelAttribute("message.starting_offset", 0), - OTelAttribute(sc::kThreadId, _))), + OTelAttribute(sc::thread::kThreadId, _))), AllOf(EventNamed("gl-cpp.read"), SpanEventAttributesAre( OTelAttribute( @@ -120,11 +118,12 @@ TEST(ReaderConnectionTracing, WithError) { OTelAttribute( /*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"), - OTelAttribute(sc::kThreadId, _))))))); + OTelAttribute(sc::thread::kThreadId, + _))))))); } TEST(ReaderConnectionTracing, WithSuccess) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); PromiseWithOTelContext p1; PromiseWithOTelContext p2; @@ -170,7 +169,7 @@ TEST(ReaderConnectionTracing, WithSuccess) { /*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"), OTelAttribute("message.starting_offset", 0), - OTelAttribute(sc::kThreadId, _))), + OTelAttribute(sc::thread::kThreadId, _))), AllOf(EventNamed("gl-cpp.read"), SpanEventAttributesAre( OTelAttribute( @@ -180,7 +179,7 @@ TEST(ReaderConnectionTracing, WithSuccess) { "RECEIVED"), OTelAttribute("message.starting_offset", 1024), - OTelAttribute(sc::kThreadId, _))), + OTelAttribute(sc::thread::kThreadId, _))), AllOf(EventNamed("gl-cpp.read"), SpanEventAttributesAre( OTelAttribute( @@ -188,7 +187,8 @@ TEST(ReaderConnectionTracing, WithSuccess) { OTelAttribute( /*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVED"), - OTelAttribute(sc::kThreadId, _))))))); + OTelAttribute(sc::thread::kThreadId, + _))))))); auto const metadata = actual->GetRequestMetadata(); EXPECT_THAT(metadata.headers, @@ -202,5 +202,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/rewriter_connection_impl.h b/google/cloud/storage/internal/async/rewriter_connection_impl.h index 7bf703b23b8a4..39ccce887737d 100644 --- a/google/cloud/storage/internal/async/rewriter_connection_impl.h +++ b/google/cloud/storage/internal/async/rewriter_connection_impl.h @@ -17,12 +17,12 @@ #include "google/cloud/storage/async/rewriter_connection.h" #include "google/cloud/storage/internal/storage_stub.h" +#include "google/cloud/storage/options.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" -#include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/async/rewriter_connection_tracing.cc b/google/cloud/storage/internal/async/rewriter_connection_tracing.cc index 197b7bfe4cf7a..a7417863e55c9 100644 --- a/google/cloud/storage/internal/async/rewriter_connection_tracing.cc +++ b/google/cloud/storage/internal/async/rewriter_connection_tracing.cc @@ -21,8 +21,6 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - namespace { using google::cloud::internal::EndSpan; @@ -76,17 +74,6 @@ MakeTracingAsyncRewriterConnection( std::move(span)); } -#else - -std::shared_ptr -MakeTracingAsyncRewriterConnection( - std::shared_ptr impl, - bool /*enabled*/) { - return impl; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/async/rewriter_connection_tracing_test.cc b/google/cloud/storage/internal/async/rewriter_connection_tracing_test.cc index 064af5ed4d1fb..417eabf621e71 100644 --- a/google/cloud/storage/internal/async/rewriter_connection_tracing_test.cc +++ b/google/cloud/storage/internal/async/rewriter_connection_tracing_test.cc @@ -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 "google/cloud/storage/internal/async/rewriter_connection_tracing.h" #include "google/cloud/storage/mocks/mock_async_rewriter_connection.h" #include "google/cloud/storage/testing/canonical_errors.h" @@ -23,7 +21,6 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include #include namespace google { @@ -158,5 +155,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/write_object.h b/google/cloud/storage/internal/async/write_object.h index 4f7d3f51c1870..4131c8d0db1cb 100644 --- a/google/cloud/storage/internal/async/write_object.h +++ b/google/cloud/storage/internal/async/write_object.h @@ -22,7 +22,7 @@ #include "google/cloud/status.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/writer_connection_impl.h b/google/cloud/storage/internal/async/writer_connection_impl.h index 044d07c9f74b5..d7288820133fd 100644 --- a/google/cloud/storage/internal/async/writer_connection_impl.h +++ b/google/cloud/storage/internal/async/writer_connection_impl.h @@ -20,7 +20,7 @@ #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/async/writer_connection_resumed_test.cc b/google/cloud/storage/internal/async/writer_connection_resumed_test.cc index 66735e8cc877b..17d344b33599c 100644 --- a/google/cloud/storage/internal/async/writer_connection_resumed_test.cc +++ b/google/cloud/storage/internal/async/writer_connection_resumed_test.cc @@ -20,7 +20,7 @@ #include "google/cloud/testing_util/async_sequencer.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/async/writer_connection_tracing.cc b/google/cloud/storage/internal/async/writer_connection_tracing.cc index 3bb930e6e9b3c..e0b3d4b14cc92 100644 --- a/google/cloud/storage/internal/async/writer_connection_tracing.cc +++ b/google/cloud/storage/internal/async/writer_connection_tracing.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/storage/internal/async/writer_connection_tracing.h" #include "google/cloud/internal/opentelemetry.h" -#include +#include #include #include #include @@ -26,7 +25,7 @@ namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -namespace sc = ::opentelemetry::trace::SemanticConventions; +namespace sc = ::opentelemetry::semconv; class AsyncWriterConnectionTracing : public storage_experimental::AsyncWriterConnection { @@ -40,7 +39,7 @@ class AsyncWriterConnectionTracing auto scope = opentelemetry::trace::Scope(span_); span_->AddEvent("gl-cpp.cancel", { - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, }); return impl_->Cancel(); } @@ -66,7 +65,7 @@ class AsyncWriterConnectionTracing { {/*sc::kRpcMessageType=*/"rpc.message.type", "SENT"}, {/*sc::kRpcMessageId=*/"rpc.message.id", count}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, {"gl-cpp.size", size}, }); auto status = f.get(); @@ -86,7 +85,7 @@ class AsyncWriterConnectionTracing { {/*sc::kRpcMessageType=*/"rpc.message.type", "SENT"}, {/*sc::kRpcMessageId=*/"rpc.message.id", count}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, {"gl-cpp.size", size}, }); return internal::EndSpan(*span, f.get()); @@ -103,7 +102,7 @@ class AsyncWriterConnectionTracing { {/*sc::kRpcMessageType=*/"rpc.message.type", "SENT"}, {/*sc::kRpcMessageId=*/"rpc.message.id", count}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, {"gl-cpp.size", size}, }); auto status = f.get(); @@ -120,7 +119,7 @@ class AsyncWriterConnectionTracing { {/*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVE"}, {/*sc::kRpcMessageId=*/"rpc.message.id", count}, - {sc::kThreadId, internal::CurrentThreadId()}, + {sc::thread::kThreadId, internal::CurrentThreadId()}, }); auto response = f.get(); if (!response) return internal::EndSpan(*span, std::move(response)); @@ -153,5 +152,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/async/writer_connection_tracing.h b/google/cloud/storage/internal/async/writer_connection_tracing.h index 92ca8838a6d73..2f7e3ab9d650f 100644 --- a/google/cloud/storage/internal/async/writer_connection_tracing.h +++ b/google/cloud/storage/internal/async/writer_connection_tracing.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_WRITER_CONNECTION_TRACING_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_WRITER_CONNECTION_TRACING_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/storage/async/writer_connection.h" #include "google/cloud/version.h" #include @@ -38,6 +36,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_WRITER_CONNECTION_TRACING_H diff --git a/google/cloud/storage/internal/async/writer_connection_tracing_test.cc b/google/cloud/storage/internal/async/writer_connection_tracing_test.cc index 8d156a9a5ab6c..234c34f4c3b28 100644 --- a/google/cloud/storage/internal/async/writer_connection_tracing_test.cc +++ b/google/cloud/storage/internal/async/writer_connection_tracing_test.cc @@ -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 "google/cloud/storage/internal/async/writer_connection_tracing.h" #include "google/cloud/storage/mocks/mock_async_writer_connection.h" #include "google/cloud/storage/testing/canonical_errors.h" @@ -22,7 +20,7 @@ #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/testing_util/status_matchers.h" #include -#include +#include #include namespace google { @@ -53,12 +51,12 @@ using ::testing::UnorderedElementsAre; using ::testing::VariantWith; auto ExpectSent(std::int64_t id, std::uint64_t size) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; return SpanEventAttributesAre( OTelAttribute(/*sc::kRpcMessageType=*/"rpc.message.type", "SENT"), OTelAttribute(/*sc::kRpcMessageId=*/"rpc.message.id", id), - OTelAttribute(sc::kThreadId, _), + OTelAttribute(sc::thread::kThreadId, _), OTelAttribute("gl-cpp.size", size)); } @@ -71,14 +69,14 @@ auto ExpectFlush(std::int64_t id, std::uint64_t size) { } auto ExpectQuery(std::int64_t id) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; return AllOf(EventNamed("gl-cpp.query"), SpanEventAttributesAre( OTelAttribute( /*sc::kRpcMessageType=*/"rpc.message.type", "RECEIVE"), OTelAttribute( /*sc::kRpcMessageId=*/"rpc.message.id", id), - OTelAttribute(sc::kThreadId, _))); + OTelAttribute(sc::thread::kThreadId, _))); } TEST(WriterConnectionTracing, FullCycle) { @@ -224,7 +222,7 @@ TEST(WriterConnectionTracing, QueryError) { } TEST(WriterConnectionTracing, Cancel) { - namespace sc = ::opentelemetry::trace::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto span_catcher = InstallSpanCatcher(); auto mock = std::make_unique(); @@ -247,7 +245,7 @@ TEST(WriterConnectionTracing, Cancel) { SpanHasInstrumentationScope(), SpanKindIsClient(), SpanHasEvents(AllOf(EventNamed("gl-cpp.cancel"), SpanEventAttributesAre(OTelAttribute( - sc::kThreadId, _))))))); + sc::thread::kThreadId, _))))))); } } // namespace @@ -255,5 +253,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/bucket_access_control_parser.cc b/google/cloud/storage/internal/bucket_access_control_parser.cc index 5a7d4161880e2..d03fde1f23579 100644 --- a/google/cloud/storage/internal/bucket_access_control_parser.cc +++ b/google/cloud/storage/internal/bucket_access_control_parser.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/storage/internal/bucket_access_control_parser.h" -#include "google/cloud/storage/internal/access_control_common_parser.h" #include "google/cloud/storage/internal/metadata_parser.h" #include #include diff --git a/google/cloud/storage/internal/common_metadata.h b/google/cloud/storage/internal/common_metadata.h deleted file mode 100644 index d13daef446c7a..0000000000000 --- a/google/cloud/storage/internal/common_metadata.h +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_COMMON_METADATA_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_COMMON_METADATA_H - -#include "google/cloud/storage/owner.h" -#include "google/cloud/storage/version.h" -#include "google/cloud/status_or.h" -#include "absl/types/optional.h" -#include -#include -#include -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { - -/** - * Defines common attributes to both `BucketMetadata` and `ObjectMetadata`. - * - * @tparam Derived a class derived from CommonMetadata. This class uses - * the Curiously recurring template pattern. - * - * @see https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern - */ -// TODO(#9897) - remove this class and any references to it -template -class GOOGLE_CLOUD_CPP_DEPRECATED( - "This class will be removed shortly after 2023-06-01") CommonMetadata { - public: - CommonMetadata() = default; - - std::string const& etag() const { return etag_; } - std::string const& id() const { return id_; } - std::string const& kind() const { return kind_; } - std::int64_t metageneration() const { return metageneration_; } - - std::string const& name() const { return name_; } - void set_name(std::string value) { name_ = std::move(value); } - - bool has_owner() const { return owner_.has_value(); } - Owner const& owner() const { return owner_.value(); } - - std::string const& self_link() const { return self_link_; } - - std::string const& storage_class() const { return storage_class_; } - void set_storage_class(std::string value) { - storage_class_ = std::move(value); - } - - std::chrono::system_clock::time_point time_created() const { - return time_created_; - } - std::chrono::system_clock::time_point updated() const { return updated_; } - - private: - template - friend struct CommonMetadataParser; - - // Keep the fields in alphabetical order. - std::string etag_; - std::string id_; - std::string kind_; - std::int64_t metageneration_{0}; - std::string name_; - absl::optional owner_; - std::string self_link_; - std::string storage_class_; - std::chrono::system_clock::time_point time_created_; - std::chrono::system_clock::time_point updated_; -}; - -template -GOOGLE_CLOUD_CPP_DEPRECATED( - "This function will be removed shortly after 2023-06-01") -inline bool -operator==(CommonMetadata const& lhs, CommonMetadata const& rhs) { - // etag changes each time the metadata changes, so that is the best field - // to short-circuit this comparison. The check the name, project number, - // and metadata generation, which have the next best chance to - // short-circuit. The rest just put in alphabetical order. - return lhs.name() == rhs.name() && - lhs.metageneration() == rhs.metageneration() && lhs.id() == rhs.id() && - lhs.etag() == rhs.etag() && lhs.kind() == rhs.kind() && - lhs.self_link() == rhs.self_link() && - lhs.storage_class() == rhs.storage_class() && - lhs.time_created() == rhs.time_created() && - lhs.updated() == rhs.updated() && lhs.has_owner() == rhs.has_owner() && - (!lhs.has_owner() || lhs.owner() == rhs.owner()); -} - -template -GOOGLE_CLOUD_CPP_DEPRECATED( - "This function will be removed shortly after 2023-06-01") -inline bool -operator!=(CommonMetadata const& lhs, CommonMetadata const& rhs) { - return std::rel_ops::operator!=(lhs, rhs); -} - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_COMMON_METADATA_H diff --git a/google/cloud/storage/internal/common_metadata_parser.h b/google/cloud/storage/internal/common_metadata_parser.h deleted file mode 100644 index 8357ed5c4162f..0000000000000 --- a/google/cloud/storage/internal/common_metadata_parser.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_COMMON_METADATA_PARSER_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_COMMON_METADATA_PARSER_H - -#include "google/cloud/storage/internal/common_metadata.h" -#include "google/cloud/storage/internal/metadata_parser.h" -#include "google/cloud/status.h" -#include -#include -#include - -namespace google { -namespace cloud { -namespace storage { -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -namespace internal { -// TODO(#9897) - remove this class and any references to it -template -struct GOOGLE_CLOUD_CPP_DEPRECATED( - "This class will be removed shortly after 2023-06-01") - CommonMetadataParser { - static Status FromJson(CommonMetadata& result, - nlohmann::json const& json) { - if (!json.is_object()) return NotJsonObject(json, GCP_ERROR_INFO()); - result.etag_ = json.value("etag", ""); - result.id_ = json.value("id", ""); - result.kind_ = json.value("kind", ""); - auto metageneration = ParseLongField(json, "metageneration"); - if (!metageneration) return std::move(metageneration).status(); - result.metageneration_ = *metageneration; - result.name_ = json.value("name", ""); - if (json.count("owner") != 0) { - Owner o; - o.entity = json["owner"].value("entity", ""); - o.entity_id = json["owner"].value("entityId", ""); - result.owner_ = std::move(o); - } - result.self_link_ = json.value("selfLink", ""); - result.storage_class_ = json.value("storageClass", ""); - auto time_created = ParseTimestampField(json, "timeCreated"); - if (!time_created) return std::move(time_created).status(); - result.time_created_ = *time_created; - auto updated = ParseTimestampField(json, "updated"); - if (!updated) return std::move(updated).status(); - result.updated_ = *updated; - return Status(); - } - static StatusOr> FromString( - std::string const& payload) { - auto json = nlohmann::json::parse(payload); - return FromJson(json); - } -}; - -} // namespace internal -GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace storage -} // namespace cloud -} // namespace google -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_COMMON_METADATA_PARSER_H diff --git a/google/cloud/storage/internal/connection_impl.cc b/google/cloud/storage/internal/connection_impl.cc index e86236b7942ab..6078d137b10d8 100644 --- a/google/cloud/storage/internal/connection_impl.cc +++ b/google/cloud/storage/internal/connection_impl.cc @@ -154,12 +154,7 @@ std::shared_ptr StorageConnectionImpl::Create( StorageConnectionImpl::StorageConnectionImpl( std::unique_ptr stub, Options options) : stub_(std::move(stub)), - options_(MergeOptions(std::move(options), stub_->options())), - client_options_(MakeBackwardsCompatibleClientOptions(options_)) {} - -ClientOptions const& StorageConnectionImpl::client_options() const { - return client_options_; -} + options_(MergeOptions(std::move(options), stub_->options())) {} Options StorageConnectionImpl::options() const { return options_; } diff --git a/google/cloud/storage/internal/connection_impl.h b/google/cloud/storage/internal/connection_impl.h index 43bc8795f479d..b487aa6fd6efa 100644 --- a/google/cloud/storage/internal/connection_impl.h +++ b/google/cloud/storage/internal/connection_impl.h @@ -44,7 +44,6 @@ class StorageConnectionImpl ~StorageConnectionImpl() override = default; - ClientOptions const& client_options() const override; Options options() const override; StatusOr ListBuckets( @@ -188,7 +187,6 @@ class StorageConnectionImpl std::unique_ptr stub_; Options options_; - ClientOptions client_options_; // For backwards compatibility google::cloud::internal::InvocationIdGenerator invocation_id_generator_; }; diff --git a/google/cloud/storage/internal/connection_impl_test.cc b/google/cloud/storage/internal/connection_impl_test.cc index 4de482b5ebe87..fd0e59c531c44 100644 --- a/google/cloud/storage/internal/connection_impl_test.cc +++ b/google/cloud/storage/internal/connection_impl_test.cc @@ -637,7 +637,6 @@ TEST(RetryClientTest, UploadFinalChunkQueryTooManyMissingPayloads) { ASSERT_THAT(response, Not(IsOk())); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::SpanNamed; @@ -695,7 +694,6 @@ TEST(RetryClientTest, BackoffSpansUploadChunk) { SpanNamed("Backoff"), SpanNamed("storage::Client::WriteObject/UploadChunk"))); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace } // namespace internal diff --git a/google/cloud/storage/internal/crc32c.cc b/google/cloud/storage/internal/crc32c.cc index 57c16dfe38e20..9357d7c03f35d 100644 --- a/google/cloud/storage/internal/crc32c.cc +++ b/google/cloud/storage/internal/crc32c.cc @@ -14,13 +14,7 @@ #include "google/cloud/storage/internal/crc32c.h" #include "absl/base/config.h" -#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION >= 20230125 #include "absl/crc/crc32c.h" -#define GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C 1 -#else -#define GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C 0 -#endif // ABSL_LTS_RELEASE_VERSION -#include namespace google { namespace cloud { @@ -28,8 +22,8 @@ namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data) { - return crc32c::Extend(crc, reinterpret_cast(data.data()), - data.size()); + return static_cast( + absl::ExtendCrc32c(absl::crc32c_t{crc}, data)); } std::uint32_t ExtendCrc32c(std::uint32_t crc, @@ -47,8 +41,6 @@ std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data) { return crc; } -#if GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C - std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data, std::uint32_t data_crc) { return static_cast(absl::ConcatCrc32c( @@ -69,26 +61,6 @@ std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data, absl::crc32c_t{crc}, absl::crc32c_t{data_crc}, data.size())); } -#else - -std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data, - std::uint32_t /*data_crc*/) { - return ExtendCrc32c(crc, data); -} - -std::uint32_t ExtendCrc32c(std::uint32_t crc, - storage::internal::ConstBufferSequence const& data, - std::uint32_t /*data_crc*/) { - return ExtendCrc32c(crc, data); -} - -std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data, - std::uint32_t /*data_crc*/) { - return ExtendCrc32c(crc, data); -} - -#endif // GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/crc32c_benchmark.cc b/google/cloud/storage/internal/crc32c_benchmark.cc index 5dcf8a8450194..5975b713d78c0 100644 --- a/google/cloud/storage/internal/crc32c_benchmark.cc +++ b/google/cloud/storage/internal/crc32c_benchmark.cc @@ -13,8 +13,8 @@ // limitations under the License. #include "google/cloud/storage/internal/crc32c.h" +#include "absl/crc/crc32c.h" #include -#include #include namespace google { @@ -33,7 +33,7 @@ namespace { // ---------------------------------------------------------------------- // Benchmark Time CPU Iterations // ---------------------------------------------------------------------- -// BM_Crc32cDuplicateNonAbseil 25520759 ns 25520833 ns 28 +// BM_Crc32cExtendStringView 25520759 ns 25520833 ns 28 // BM_Crc32cDuplicate 24168074 ns 24168122 ns 28 // BM_Crc32cConcat 12213494 ns 12213077 ns 57 @@ -41,23 +41,21 @@ auto constexpr kMessage = 2 * 1024 * std::size_t{1024}; auto constexpr kWriteSize = 16 * kMessage; auto constexpr kUploadSize = 8 * kWriteSize; -void BM_Crc32cDuplicateNonAbseil(benchmark::State& state) { +void BM_Crc32cExtendStringView(benchmark::State& state) { auto buffer = std::string(kWriteSize, '0'); - auto crc = std::uint32_t{0}; + auto crc = absl::crc32c_t{0}; for (auto _ : state) { for (std::size_t offset = 0; offset < kUploadSize; offset += kWriteSize) { for (std::size_t m = 0; m < kWriteSize; m += kMessage) { auto w = absl::string_view{buffer}.substr(m, kMessage); - benchmark::DoNotOptimize(crc32c::Crc32c(w.data(), w.size())); + benchmark::DoNotOptimize(absl::ComputeCrc32c(w)); } - crc = crc32c::Extend(crc, - reinterpret_cast(buffer.data()), - buffer.size()); + crc = absl::ExtendCrc32c(crc, buffer); } } benchmark::DoNotOptimize(crc); } -BENCHMARK(BM_Crc32cDuplicateNonAbseil); +BENCHMARK(BM_Crc32cExtendStringView); void BM_Crc32cDuplicate(benchmark::State& state) { auto buffer = std::string(kWriteSize, '0'); diff --git a/google/cloud/storage/internal/generic_stub.h b/google/cloud/storage/internal/generic_stub.h index ddf35b377488a..1e03abe2f5a4c 100644 --- a/google/cloud/storage/internal/generic_stub.h +++ b/google/cloud/storage/internal/generic_stub.h @@ -16,7 +16,6 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_GENERIC_STUB_H #include "google/cloud/storage/bucket_metadata.h" -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/internal/bucket_acl_requests.h" #include "google/cloud/storage/internal/bucket_requests.h" #include "google/cloud/storage/internal/default_object_acl_requests.h" diff --git a/google/cloud/storage/internal/grpc/bucket_access_control_parser.h b/google/cloud/storage/internal/grpc/bucket_access_control_parser.h index ceeac76b5b301..a01c28487de21 100644 --- a/google/cloud/storage/internal/grpc/bucket_access_control_parser.h +++ b/google/cloud/storage/internal/grpc/bucket_access_control_parser.h @@ -17,7 +17,7 @@ #include "google/cloud/storage/internal/storage_connection.h" #include "google/cloud/storage/version.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/grpc/bucket_metadata_parser.h b/google/cloud/storage/internal/grpc/bucket_metadata_parser.h index 4efc7631ffabe..3cadf64c7b98e 100644 --- a/google/cloud/storage/internal/grpc/bucket_metadata_parser.h +++ b/google/cloud/storage/internal/grpc/bucket_metadata_parser.h @@ -17,7 +17,7 @@ #include "google/cloud/storage/internal/storage_connection.h" #include "google/cloud/storage/version.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/grpc/bucket_request_parser.h b/google/cloud/storage/internal/grpc/bucket_request_parser.h index e766f992dac6d..e603285606757 100644 --- a/google/cloud/storage/internal/grpc/bucket_request_parser.h +++ b/google/cloud/storage/internal/grpc/bucket_request_parser.h @@ -17,7 +17,7 @@ #include "google/cloud/storage/internal/bucket_requests.h" #include "google/cloud/storage/version.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/grpc/configure_client_context.h b/google/cloud/storage/internal/grpc/configure_client_context.h index 36b441560f941..7c898fbe9bbd6 100644 --- a/google/cloud/storage/internal/grpc/configure_client_context.h +++ b/google/cloud/storage/internal/grpc/configure_client_context.h @@ -20,7 +20,7 @@ #include "google/cloud/storage/version.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/rest_context.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/grpc/ctype_cord_workaround.h b/google/cloud/storage/internal/grpc/ctype_cord_workaround.h index b265c647d52e8..2273bd03ac474 100644 --- a/google/cloud/storage/internal/grpc/ctype_cord_workaround.h +++ b/google/cloud/storage/internal/grpc/ctype_cord_workaround.h @@ -18,7 +18,7 @@ #include "google/cloud/internal/type_traits.h" #include "google/cloud/version.h" #include "absl/strings/cord.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include diff --git a/google/cloud/storage/internal/grpc/default_options.cc b/google/cloud/storage/internal/grpc/default_options.cc index abd150c40d9ea..77cfc1803f893 100644 --- a/google/cloud/storage/internal/grpc/default_options.cc +++ b/google/cloud/storage/internal/grpc/default_options.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/storage/internal/grpc/default_options.h" -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/grpc_plugin.h" #include "google/cloud/storage/options.h" #include "google/cloud/common_options.h" diff --git a/google/cloud/storage/internal/grpc/metrics_exporter_options.cc b/google/cloud/storage/internal/grpc/metrics_exporter_options.cc index f573eb6cc0248..27c50ec1424a0 100644 --- a/google/cloud/storage/internal/grpc/metrics_exporter_options.cc +++ b/google/cloud/storage/internal/grpc/metrics_exporter_options.cc @@ -20,8 +20,9 @@ #include "google/cloud/internal/invocation_id_generator.h" #include "google/cloud/universe_domain_options.h" #include "absl/types/variant.h" -#include -#include +#include "google/api/monitored_resource.pb.h" +#include +#include #include #include @@ -43,18 +44,20 @@ auto ByName(opentelemetry::sdk::resource::ResourceAttributes const& attributes, Options MetricsExporterOptions( Project const& project, opentelemetry::sdk::resource::Resource const& resource) { - namespace sc = ::opentelemetry::sdk::resource::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto const& attributes = resource.GetAttributes(); auto monitored_resource = google::api::MonitoredResource{}; monitored_resource.set_type("storage.googleapis.com/Client"); auto& labels = *monitored_resource.mutable_labels(); labels["project_id"] = project.project_id(); - labels["location"] = ByName(attributes, sc::kCloudAvailabilityZone, - ByName(attributes, sc::kCloudRegion, "global")); - labels["cloud_platform"] = ByName(attributes, sc::kCloudPlatform, "unknown"); - labels["host_id"] = - ByName(attributes, "faas.id", ByName(attributes, sc::kHostId, "unknown")); + labels["location"] = + ByName(attributes, sc::cloud::kCloudAvailabilityZone, + ByName(attributes, sc::cloud::kCloudRegion, "global")); + labels["cloud_platform"] = + ByName(attributes, sc::cloud::kCloudPlatform, "unknown"); + labels["host_id"] = ByName(attributes, "faas.id", + ByName(attributes, sc::host::kHostId, "unknown")); // We need a UUID because there may be multiple monitored resources within the // same process, and we need these monitored resources to be globally unique diff --git a/google/cloud/storage/internal/grpc/metrics_exporter_options_test.cc b/google/cloud/storage/internal/grpc/metrics_exporter_options_test.cc index e3244780d66f9..7fad2c591d4d4 100644 --- a/google/cloud/storage/internal/grpc/metrics_exporter_options_test.cc +++ b/google/cloud/storage/internal/grpc/metrics_exporter_options_test.cc @@ -23,7 +23,7 @@ #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/scoped_environment.h" #include "google/cloud/universe_domain_options.h" -#include +#include "google/api/monitored_resource.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/grpc/metrics_meter_provider.cc b/google/cloud/storage/internal/grpc/metrics_meter_provider.cc index e0db509b0d7bb..fe7d9552a0d30 100644 --- a/google/cloud/storage/internal/grpc/metrics_meter_provider.cc +++ b/google/cloud/storage/internal/grpc/metrics_meter_provider.cc @@ -66,6 +66,18 @@ void AddHistogramView(opentelemetry::sdk::metrics::MeterProvider& provider, // These are useful on Windows with DLLs and mixed CRTs, and we should try to // them if they are available. #if OPENTELEMETRY_VERSION_MAJOR > 1 || \ + (OPENTELEMETRY_VERSION_MAJOR == 1 && OPENTELEMETRY_VERSION_MINOR >= 23) + (void)unit; + provider.AddView( + opentelemetry::sdk::metrics::InstrumentSelectorFactory::Create( + opentelemetry::sdk::metrics::InstrumentType::kHistogram, name, unit), + opentelemetry::sdk::metrics::MeterSelectorFactory::Create( + kGrpcMeterName, grpc::Version(), kGrpcSchema), + opentelemetry::sdk::metrics::ViewFactory::Create( + name, std::move(description), + opentelemetry::sdk::metrics::AggregationType::kHistogram, + std::move(aggregation_config))); +#elif OPENTELEMETRY_VERSION_MAJOR > 1 || \ (OPENTELEMETRY_VERSION_MAJOR == 1 && OPENTELEMETRY_VERSION_MINOR >= 10) provider.AddView( opentelemetry::sdk::metrics::InstrumentSelectorFactory::Create( diff --git a/google/cloud/storage/internal/grpc/monitoring_project.cc b/google/cloud/storage/internal/grpc/monitoring_project.cc index f69f9ce9b6b95..598f41fac210b 100644 --- a/google/cloud/storage/internal/grpc/monitoring_project.cc +++ b/google/cloud/storage/internal/grpc/monitoring_project.cc @@ -17,7 +17,7 @@ #include "google/cloud/storage/internal/grpc/monitoring_project.h" #include "google/cloud/storage/options.h" #include "google/cloud/internal/unified_rest_credentials.h" -#include +#include namespace google { namespace cloud { @@ -46,14 +46,14 @@ absl::optional MonitoringProject(Credentials const& credentials) { absl::optional MonitoringProject( opentelemetry::sdk::resource::Resource const& resource) { - namespace sc = ::opentelemetry::sdk::resource::SemanticConventions; + namespace sc = ::opentelemetry::semconv; auto const& attributes = resource.GetAttributes(); - auto l = attributes.find(sc::kCloudProvider); + auto l = attributes.find(sc::cloud::kCloudProvider); if (l == attributes.end() || opentelemetry::nostd::get(l->second) != "gcp") { return absl::nullopt; } - l = attributes.find(sc::kCloudAccountId); + l = attributes.find(sc::cloud::kCloudAccountId); if (l == attributes.end()) return absl::nullopt; return Project(opentelemetry::nostd::get(l->second)); } diff --git a/google/cloud/storage/internal/grpc/object_access_control_parser.h b/google/cloud/storage/internal/grpc/object_access_control_parser.h index c030944d08b7e..813b033dc2adc 100644 --- a/google/cloud/storage/internal/grpc/object_access_control_parser.h +++ b/google/cloud/storage/internal/grpc/object_access_control_parser.h @@ -17,7 +17,7 @@ #include "google/cloud/storage/internal/storage_connection.h" #include "google/cloud/storage/version.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/grpc/object_metadata_parser.h b/google/cloud/storage/internal/grpc/object_metadata_parser.h index 0e7e11a590299..d0459631145f7 100644 --- a/google/cloud/storage/internal/grpc/object_metadata_parser.h +++ b/google/cloud/storage/internal/grpc/object_metadata_parser.h @@ -19,7 +19,7 @@ #include "google/cloud/storage/version.h" #include "google/cloud/options.h" #include "absl/strings/string_view.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/grpc/object_read_source.h b/google/cloud/storage/internal/grpc/object_read_source.h index e8acc9c4e9dbd..93e2068f1e2ef 100644 --- a/google/cloud/storage/internal/grpc/object_read_source.h +++ b/google/cloud/storage/internal/grpc/object_read_source.h @@ -21,7 +21,7 @@ #include "google/cloud/future.h" #include "google/cloud/internal/streaming_read_rpc.h" #include "absl/functional/function_ref.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include diff --git a/google/cloud/storage/internal/grpc/object_request_parser.h b/google/cloud/storage/internal/grpc/object_request_parser.h index 6e90bcb942e45..a135ae6ed5eac 100644 --- a/google/cloud/storage/internal/grpc/object_request_parser.h +++ b/google/cloud/storage/internal/grpc/object_request_parser.h @@ -18,7 +18,7 @@ #include "google/cloud/storage/internal/storage_connection.h" #include "google/cloud/storage/version.h" #include "google/cloud/rpc_metadata.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/grpc/owner_parser.h b/google/cloud/storage/internal/grpc/owner_parser.h index 28cafcfce2067..0e8ace0ca229a 100644 --- a/google/cloud/storage/internal/grpc/owner_parser.h +++ b/google/cloud/storage/internal/grpc/owner_parser.h @@ -17,7 +17,7 @@ #include "google/cloud/storage/owner.h" #include "google/cloud/storage/version.h" -#include +#include "google/storage/v2/storage.pb.h" namespace google { namespace cloud { diff --git a/google/cloud/storage/internal/grpc/split_write_object_data.cc b/google/cloud/storage/internal/grpc/split_write_object_data.cc index 9a8e1a15422f6..c346ac71ce63e 100644 --- a/google/cloud/storage/internal/grpc/split_write_object_data.cc +++ b/google/cloud/storage/internal/grpc/split_write_object_data.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "google/cloud/storage/internal/grpc/split_write_object_data.h" -#include +#include "google/storage/v2/storage.pb.h" #include namespace google { diff --git a/google/cloud/storage/internal/grpc/stub.cc b/google/cloud/storage/internal/grpc/stub.cc index 9a7120c6ebae8..461310381baee 100644 --- a/google/cloud/storage/internal/grpc/stub.cc +++ b/google/cloud/storage/internal/grpc/stub.cc @@ -30,6 +30,7 @@ #include "google/cloud/storage/internal/grpc/split_write_object_data.h" #include "google/cloud/storage/internal/grpc/synthetic_self_link.h" #include "google/cloud/storage/internal/storage_stub_factory.h" +#include "google/cloud/storage/options.h" #include "google/cloud/internal/big_endian.h" #include "google/cloud/internal/invoke_result.h" #include "google/cloud/internal/make_status.h" diff --git a/google/cloud/storage/internal/grpc/stub.h b/google/cloud/storage/internal/grpc/stub.h index d5cfe4db066e4..9e6024bdb781e 100644 --- a/google/cloud/storage/internal/grpc/stub.h +++ b/google/cloud/storage/internal/grpc/stub.h @@ -20,7 +20,7 @@ #include "google/cloud/background_threads.h" #include "google/cloud/internal/minimal_iam_credentials_stub.h" #include "google/cloud/internal/streaming_write_rpc.h" -#include +#include "google/storage/v2/storage.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/grpc/stub_insert_object_media_test.cc b/google/cloud/storage/internal/grpc/stub_insert_object_media_test.cc index f3f207b9a1e00..3318c9fbba411 100644 --- a/google/cloud/storage/internal/grpc/stub_insert_object_media_test.cc +++ b/google/cloud/storage/internal/grpc/stub_insert_object_media_test.cc @@ -14,6 +14,7 @@ #include "google/cloud/storage/internal/grpc/stub.h" #include "google/cloud/storage/oauth2/google_credentials.h" +#include "google/cloud/storage/options.h" #include "google/cloud/storage/testing/mock_storage_stub.h" #include "google/cloud/grpc_options.h" #include "google/cloud/testing_util/is_proto_equal.h" diff --git a/google/cloud/storage/internal/grpc/stub_read_object_test.cc b/google/cloud/storage/internal/grpc/stub_read_object_test.cc index aa191d6733c0a..ea3ddea3cbf2a 100644 --- a/google/cloud/storage/internal/grpc/stub_read_object_test.cc +++ b/google/cloud/storage/internal/grpc/stub_read_object_test.cc @@ -14,14 +14,15 @@ #include "google/cloud/storage/internal/grpc/object_read_source.h" #include "google/cloud/storage/internal/grpc/stub.h" +#include "google/cloud/storage/options.h" #include "google/cloud/storage/testing/mock_storage_stub.h" #include "google/cloud/grpc_options.h" #include "google/cloud/options.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" +#include "google/storage/v2/storage.pb.h" #include -#include #include namespace google { diff --git a/google/cloud/storage/internal/grpc/stub_upload_chunk_test.cc b/google/cloud/storage/internal/grpc/stub_upload_chunk_test.cc index 2c42cb69d45df..a50a5b6cfefd9 100644 --- a/google/cloud/storage/internal/grpc/stub_upload_chunk_test.cc +++ b/google/cloud/storage/internal/grpc/stub_upload_chunk_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "google/cloud/storage/internal/grpc/stub.h" +#include "google/cloud/storage/options.h" #include "google/cloud/storage/testing/mock_storage_stub.h" #include "google/cloud/grpc_options.h" #include "google/cloud/options.h" diff --git a/google/cloud/storage/internal/object_access_control_parser.cc b/google/cloud/storage/internal/object_access_control_parser.cc index 2f4ba2fb67e8d..c60472ed9c53f 100644 --- a/google/cloud/storage/internal/object_access_control_parser.cc +++ b/google/cloud/storage/internal/object_access_control_parser.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/storage/internal/object_access_control_parser.h" -#include "google/cloud/storage/internal/access_control_common_parser.h" #include "google/cloud/storage/internal/metadata_parser.h" #include #include diff --git a/google/cloud/storage/internal/rest/stub.cc b/google/cloud/storage/internal/rest/stub.cc index 32c0e93542be9..62acc29fc847e 100644 --- a/google/cloud/storage/internal/rest/stub.cc +++ b/google/cloud/storage/internal/rest/stub.cc @@ -31,6 +31,7 @@ #include "google/cloud/internal/curl_wrappers.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/internal/make_status.h" +#include "google/cloud/internal/rest_options.h" #include "google/cloud/internal/url_encode.h" #include "absl/strings/match.h" #include "absl/strings/strip.h" @@ -44,6 +45,7 @@ namespace internal { namespace rest = google::cloud::rest_internal; using ::google::cloud::internal::AuthHeaderError; +using ::google::cloud::internal::GetEnv; using ::google::cloud::internal::UrlEncode; namespace { @@ -132,6 +134,22 @@ Status AddHeaders(Options const& options, RestRequestBuilder& builder) { return {}; } +absl::optional GetEmulator() { + auto emulator = GetEnv("CLOUD_STORAGE_EMULATOR_ENDPOINT"); + if (emulator) return emulator; + return GetEnv("CLOUD_STORAGE_TESTBENCH_ENDPOINT"); +} + +std::string RestEndpoint(Options const& options) { + return GetEmulator().value_or(options.get()); +} + +std::string IamEndpoint(Options const& options) { + auto emulator = GetEmulator(); + if (emulator) return *emulator + "/iamapi"; + return options.get(); +} + } // namespace RestStub::RestStub(Options options) diff --git a/google/cloud/storage/internal/rest/stub.h b/google/cloud/storage/internal/rest/stub.h index d6a04a96c2a20..e0d100bc486cb 100644 --- a/google/cloud/storage/internal/rest/stub.h +++ b/google/cloud/storage/internal/rest/stub.h @@ -17,6 +17,7 @@ #include "google/cloud/storage/internal/generic_stub.h" #include "google/cloud/storage/internal/rest/request_builder.h" +#include "google/cloud/storage/options.h" #include "google/cloud/storage/version.h" #include "google/cloud/internal/random.h" #include "google/cloud/internal/rest_client.h" diff --git a/google/cloud/storage/internal/retry_object_read_source_test.cc b/google/cloud/storage/internal/retry_object_read_source_test.cc index dca08aeabfe08..f264e3e743539 100644 --- a/google/cloud/storage/internal/retry_object_read_source_test.cc +++ b/google/cloud/storage/internal/retry_object_read_source_test.cc @@ -489,7 +489,6 @@ TEST(RetryObjectReadSourceTest, DiscardDataForDecompressiveTranscoding) { Contains(Pair("x-test-only", "download 3 r1"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -600,8 +599,6 @@ TEST(RetryObjectReadSourceTest, TracingDisabled) { EXPECT_THAT(spans, IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace } // namespace internal GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storage/internal/storage_auth_decorator.cc b/google/cloud/storage/internal/storage_auth_decorator.cc index da06fadad2694..91b4b37ad1c6d 100644 --- a/google/cloud/storage/internal/storage_auth_decorator.cc +++ b/google/cloud/storage/internal/storage_auth_decorator.cc @@ -21,7 +21,7 @@ #include "google/cloud/internal/async_streaming_read_rpc_auth.h" #include "google/cloud/internal/async_streaming_write_rpc_auth.h" #include "google/cloud/internal/streaming_write_rpc_impl.h" -#include +#include "google/storage/v2/storage.grpc.pb.h" #include #include diff --git a/google/cloud/storage/internal/storage_connection.h b/google/cloud/storage/internal/storage_connection.h index 0cc24e6876125..28cfe3af468cb 100644 --- a/google/cloud/storage/internal/storage_connection.h +++ b/google/cloud/storage/internal/storage_connection.h @@ -16,7 +16,6 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_STORAGE_CONNECTION_H #include "google/cloud/storage/bucket_metadata.h" -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/internal/bucket_acl_requests.h" #include "google/cloud/storage/internal/bucket_requests.h" #include "google/cloud/storage/internal/default_object_acl_requests.h" @@ -57,8 +56,6 @@ class StorageConnection { public: virtual ~StorageConnection() = default; - virtual ClientOptions const& client_options() const = 0; - virtual google::cloud::Options options() const { return {}; } ///@{ diff --git a/google/cloud/storage/internal/storage_connection_test.cc b/google/cloud/storage/internal/storage_connection_test.cc index 09c0e539bd234..54b23c3172d50 100644 --- a/google/cloud/storage/internal/storage_connection_test.cc +++ b/google/cloud/storage/internal/storage_connection_test.cc @@ -33,7 +33,6 @@ class TestStorageConnection : public StorageConnection { public: ~TestStorageConnection() override = default; // LCOV_EXCL_START - MOCK_METHOD(ClientOptions const&, client_options, (), (const, override)); MOCK_METHOD(StatusOr, ListBuckets, (ListBucketsRequest const&), (override)); MOCK_METHOD(StatusOr, CreateBucket, diff --git a/google/cloud/storage/internal/storage_logging_decorator.cc b/google/cloud/storage/internal/storage_logging_decorator.cc index 4bbb9223f347f..717be07f61b41 100644 --- a/google/cloud/storage/internal/storage_logging_decorator.cc +++ b/google/cloud/storage/internal/storage_logging_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/streaming_read_rpc_logging.h" #include "google/cloud/internal/streaming_write_rpc_logging.h" #include "google/cloud/status_or.h" -#include +#include "google/storage/v2/storage.grpc.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/storage_metadata_decorator.cc b/google/cloud/storage/internal/storage_metadata_decorator.cc index 6d21d4590c994..f7efe7f771de1 100644 --- a/google/cloud/storage/internal/storage_metadata_decorator.cc +++ b/google/cloud/storage/internal/storage_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/storage/v2/storage.grpc.pb.h" #include #include #include diff --git a/google/cloud/storage/internal/storage_stub.cc b/google/cloud/storage/internal/storage_stub.cc index 716556f4d2f76..517eb0991a6c1 100644 --- a/google/cloud/storage/internal/storage_stub.cc +++ b/google/cloud/storage/internal/storage_stub.cc @@ -23,7 +23,7 @@ #include "google/cloud/internal/async_streaming_write_rpc_impl.h" #include "google/cloud/internal/streaming_write_rpc_impl.h" #include "google/cloud/status_or.h" -#include +#include "google/storage/v2/storage.grpc.pb.h" #include #include diff --git a/google/cloud/storage/internal/storage_stub.h b/google/cloud/storage/internal/storage_stub.h index ca8dde86c7564..3522e3e3bc780 100644 --- a/google/cloud/storage/internal/storage_stub.h +++ b/google/cloud/storage/internal/storage_stub.h @@ -29,7 +29,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/storage/v2/storage.grpc.pb.h" #include #include diff --git a/google/cloud/storage/internal/storage_stub_factory_test.cc b/google/cloud/storage/internal/storage_stub_factory_test.cc index e7464a9254e34..4505906939c7e 100644 --- a/google/cloud/storage/internal/storage_stub_factory_test.cc +++ b/google/cloud/storage/internal/storage_stub_factory_test.cc @@ -258,7 +258,6 @@ TEST_F(StorageStubFactory, QueryWriteStatus) { EXPECT_THAT(log.ExtractLines(), Contains(HasSubstr("QueryWriteStatus"))); } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::SpanNamed; @@ -315,7 +314,6 @@ TEST_F(StorageStubFactory, TracingDisabled) { EXPECT_THAT(span_catcher->GetSpans(), IsEmpty()); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storage/internal/storage_tracing_stub.cc b/google/cloud/storage/internal/storage_tracing_stub.cc index f78e0e85ec7d4..7c7eb672ebc8a 100644 --- a/google/cloud/storage/internal/storage_tracing_stub.cc +++ b/google/cloud/storage/internal/storage_tracing_stub.cc @@ -31,8 +31,6 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageTracingStub::StorageTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -432,15 +430,9 @@ StorageTracingStub::AsyncQueryWriteStatus( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storage/internal/storage_tracing_stub.h b/google/cloud/storage/internal/storage_tracing_stub.h index 68c2d70b1cda6..397b32d1fef71 100644 --- a/google/cloud/storage/internal/storage_tracing_stub.h +++ b/google/cloud/storage/internal/storage_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageTracingStub : public StorageStub { public: ~StorageTracingStub() override = default; @@ -202,8 +200,6 @@ class StorageTracingStub : public StorageStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/storage/internal/tracing_connection.cc b/google/cloud/storage/internal/tracing_connection.cc index a282a1133cc08..6d7e20a2d349b 100644 --- a/google/cloud/storage/internal/tracing_connection.cc +++ b/google/cloud/storage/internal/tracing_connection.cc @@ -26,14 +26,9 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TracingConnection::TracingConnection(std::shared_ptr impl) : impl_(std::move(impl)) {} -storage::ClientOptions const& TracingConnection::client_options() const { - return impl_->client_options(); -} Options TracingConnection::options() const { return impl_->options(); } StatusOr TracingConnection::ListBuckets( @@ -507,15 +502,6 @@ std::shared_ptr MakeTracingClient( return std::make_shared(std::move(impl)); } -#else - -std::shared_ptr MakeTracingClient( - std::shared_ptr impl) { - return impl; -} - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud diff --git a/google/cloud/storage/internal/tracing_connection.h b/google/cloud/storage/internal/tracing_connection.h index c59ec011d91ec..45df6239f956d 100644 --- a/google/cloud/storage/internal/tracing_connection.h +++ b/google/cloud/storage/internal/tracing_connection.h @@ -27,14 +27,11 @@ namespace cloud { namespace storage_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TracingConnection : public storage::internal::StorageConnection { public: explicit TracingConnection(std::shared_ptr impl); ~TracingConnection() override = default; - storage::ClientOptions const& client_options() const override; Options options() const override; StatusOr ListBuckets( @@ -184,8 +181,6 @@ class TracingConnection : public storage::internal::StorageConnection { std::shared_ptr impl_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTracingClient( std::shared_ptr impl); diff --git a/google/cloud/storage/internal/tracing_connection_test.cc b/google/cloud/storage/internal/tracing_connection_test.cc index 9e952293db9eb..bda9bc46d0a2d 100644 --- a/google/cloud/storage/internal/tracing_connection_test.cc +++ b/google/cloud/storage/internal/tracing_connection_test.cc @@ -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 "google/cloud/storage/internal/tracing_connection.h" #include "google/cloud/storage/object_read_stream.h" #include "google/cloud/storage/testing/canonical_errors.h" @@ -1491,5 +1489,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/tracing_object_read_source.cc b/google/cloud/storage/internal/tracing_object_read_source.cc index 4dc148b1937fa..f6f642a9cd132 100644 --- a/google/cloud/storage/internal/tracing_object_read_source.cc +++ b/google/cloud/storage/internal/tracing_object_read_source.cc @@ -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 "google/cloud/storage/internal/tracing_object_read_source.h" #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/status.h" @@ -80,5 +78,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/internal/tracing_object_read_source.h b/google/cloud/storage/internal/tracing_object_read_source.h index 2914d33584627..2c608f6982565 100644 --- a/google/cloud/storage/internal/tracing_object_read_source.h +++ b/google/cloud/storage/internal/tracing_object_read_source.h @@ -15,8 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_TRACING_OBJECT_READ_SOURCE_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_TRACING_OBJECT_READ_SOURCE_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #include "google/cloud/storage/internal/object_read_source.h" #include "google/cloud/storage/version.h" #include "google/cloud/internal/opentelemetry.h" @@ -57,6 +55,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_TRACING_OBJECT_READ_SOURCE_H diff --git a/google/cloud/storage/internal/tracing_object_read_source_test.cc b/google/cloud/storage/internal/tracing_object_read_source_test.cc index 56edc4e4974b0..43869203758fe 100644 --- a/google/cloud/storage/internal/tracing_object_read_source_test.cc +++ b/google/cloud/storage/internal/tracing_object_read_source_test.cc @@ -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 "google/cloud/storage/internal/tracing_object_read_source.h" #include "google/cloud/storage/testing/canonical_errors.h" #include "google/cloud/storage/testing/mock_client.h" @@ -205,5 +203,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage_internal } // namespace cloud } // namespace google - -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/storage/oauth2/anonymous_credentials.h b/google/cloud/storage/oauth2/anonymous_credentials.h index d127eb0fcfa09..21b54463f5b7b 100644 --- a/google/cloud/storage/oauth2/anonymous_credentials.h +++ b/google/cloud/storage/oauth2/anonymous_credentials.h @@ -36,7 +36,10 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -class AnonymousCredentials : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. " + "Prefer using the unified credentials " + "documented in @ref guac.") AnonymousCredentials : public Credentials { public: AnonymousCredentials() = default; diff --git a/google/cloud/storage/oauth2/authorized_user_credentials.cc b/google/cloud/storage/oauth2/authorized_user_credentials.cc index d17956c5c7d49..2aa7c4ba50bd7 100644 --- a/google/cloud/storage/oauth2/authorized_user_credentials.cc +++ b/google/cloud/storage/oauth2/authorized_user_credentials.cc @@ -69,22 +69,20 @@ ParseAuthorizedUserRefreshResponse( AuthorizedUserCredentials:: AuthorizedUserCredentials(AuthorizedUserCredentialsInfo const& info, - ChannelOptions const& channel_options) + Options options) : AuthorizedUserCredentials( google::cloud::oauth2_internal::AuthorizedUserCredentialsInfo{ info.client_id, info.client_secret, info.refresh_token, info.token_uri, info.universe_domain}, - channel_options) {} + std::move(options)) {} AuthorizedUserCredentials:: AuthorizedUserCredentials( google::cloud::oauth2_internal::AuthorizedUserCredentialsInfo info, - ChannelOptions const& channel_options) + Options options) : AuthorizedUserCredentials( - std::move(info), - Options{}.set(channel_options.ssl_root_path()), - [](Options const& o) { + std::move(info), std::move(options), [](Options const& o) { return rest_internal::MakeDefaultRestClient(std::string{}, o); }) {} diff --git a/google/cloud/storage/oauth2/authorized_user_credentials.h b/google/cloud/storage/oauth2/authorized_user_credentials.h index 240698c47da9c..8393e73a5d4ce 100644 --- a/google/cloud/storage/oauth2/authorized_user_credentials.h +++ b/google/cloud/storage/oauth2/authorized_user_credentials.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_OAUTH2_AUTHORIZED_USER_CREDENTIALS_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_OAUTH2_AUTHORIZED_USER_CREDENTIALS_H -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/internal/curl/request_builder.h" #include "google/cloud/storage/internal/http_response.h" #include "google/cloud/storage/oauth2/credential_constants.h" @@ -26,6 +25,7 @@ #include "google/cloud/internal/oauth2_authorized_user_credentials.h" #include "google/cloud/internal/oauth2_cached_credentials.h" #include "google/cloud/internal/oauth2_credential_constants.h" +#include "google/cloud/options.h" #include "google/cloud/status.h" #include #include @@ -45,7 +45,10 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -struct AuthorizedUserCredentialsInfo { +struct GOOGLE_CLOUD_CPP_DEPRECATED( + "This struct will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") + AuthorizedUserCredentialsInfo { std::string client_id; std::string client_secret; std::string refresh_token; @@ -60,6 +63,9 @@ struct AuthorizedUserCredentialsInfo { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseAuthorizedUserRefreshResponse( storage::internal::HttpResponse const& response, @@ -70,6 +76,9 @@ ParseAuthorizedUserRefreshResponse( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseAuthorizedUserCredentials( std::string const& content, std::string const& source, std::string const& default_token_uri = @@ -106,17 +115,18 @@ class AuthorizedUserCredentials; /// @copydoc AuthorizedUserCredentials template <> -class AuthorizedUserCredentials - : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") + AuthorizedUserCredentials : public Credentials { public: - explicit AuthorizedUserCredentials( - AuthorizedUserCredentialsInfo const& info, - ChannelOptions const& channel_options = {}); + explicit AuthorizedUserCredentials(AuthorizedUserCredentialsInfo const& info, + Options options = {}); explicit AuthorizedUserCredentials( google::cloud::oauth2_internal::AuthorizedUserCredentialsInfo info, - ChannelOptions const& channel_options = {}); + Options options = {}); StatusOr AuthorizationHeader() override { return oauth2_internal::AuthenticationHeaderJoined(*impl_); @@ -138,14 +148,14 @@ class AuthorizedUserCredentials -class AuthorizedUserCredentials : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") AuthorizedUserCredentials + : public Credentials { public: explicit AuthorizedUserCredentials(AuthorizedUserCredentialsInfo info, - ChannelOptions const& channel_options = {}) - : info_(std::move(info)), - options_(Options{}.set( - channel_options.ssl_root_path())), - clock_() {} + Options options = {}) + : info_(std::move(info)), options_(std::move(options)), clock_() {} StatusOr AuthorizationHeader() override { std::unique_lock lock(mu_); diff --git a/google/cloud/storage/oauth2/authorized_user_credentials_test.cc b/google/cloud/storage/oauth2/authorized_user_credentials_test.cc index 141872cd2e76c..785f6e9ee7b92 100644 --- a/google/cloud/storage/oauth2/authorized_user_credentials_test.cc +++ b/google/cloud/storage/oauth2/authorized_user_credentials_test.cc @@ -15,6 +15,7 @@ #include "google/cloud/storage/oauth2/authorized_user_credentials.h" #include "google/cloud/storage/oauth2/credential_constants.h" #include "google/cloud/storage/testing/mock_http_request.h" +#include "google/cloud/common_options.h" #include "google/cloud/testing_util/mock_fake_clock.h" #include "google/cloud/testing_util/mock_http_payload.h" #include "google/cloud/testing_util/mock_rest_client.h" @@ -272,7 +273,7 @@ TEST_F(AuthorizedUserCredentialsTest, UsesCARootsInfo) { auto info = ParseAuthorizedUserCredentials(config, "test"); ASSERT_STATUS_OK(info); AuthorizedUserCredentials credentials( - *info, ChannelOptions().set_ssl_root_path(cainfo)); + *info, Options{}.set(cainfo)); EXPECT_EQ("Authorization: Mock-Type fake-token", credentials.AuthorizationHeader().value()); } diff --git a/google/cloud/storage/oauth2/compute_engine_credentials.h b/google/cloud/storage/oauth2/compute_engine_credentials.h index 7c4772e438754..603fd331a4b06 100644 --- a/google/cloud/storage/oauth2/compute_engine_credentials.h +++ b/google/cloud/storage/oauth2/compute_engine_credentials.h @@ -47,7 +47,9 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -struct ServiceAccountMetadata { +struct GOOGLE_CLOUD_CPP_DEPRECATED( + "This struct will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") ServiceAccountMetadata { std::set scopes; std::string email; }; @@ -57,6 +59,9 @@ struct ServiceAccountMetadata { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseMetadataServerResponse( storage::internal::HttpResponse const& response); @@ -67,6 +72,9 @@ StatusOr ParseMetadataServerResponse( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseComputeEngineRefreshResponse( storage::internal::HttpResponse const& response, @@ -104,8 +112,11 @@ class ComputeEngineCredentials; /// @copydoc ComputeEngineCredentials template <> -class ComputeEngineCredentials : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") + ComputeEngineCredentials : public Credentials { public: explicit ComputeEngineCredentials() : ComputeEngineCredentials("default") {} explicit ComputeEngineCredentials(std::string service_account_email); @@ -152,7 +163,10 @@ class ComputeEngineCredentials -class ComputeEngineCredentials : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") ComputeEngineCredentials + : public Credentials { public: explicit ComputeEngineCredentials() : ComputeEngineCredentials("default") {} diff --git a/google/cloud/storage/oauth2/credential_constants.h b/google/cloud/storage/oauth2/credential_constants.h index a26831ed4cd81..b9081f9d3afa2 100644 --- a/google/cloud/storage/oauth2/credential_constants.h +++ b/google/cloud/storage/oauth2/credential_constants.h @@ -32,14 +32,21 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -// NOLINTNEXTLINE(readability-identifier-naming) -enum class JwtSigningAlgorithms { RS256 }; +enum class GOOGLE_CLOUD_CPP_DEPRECATED( + "This enum will be removed in v4.0.0 and later. Prefer using the unified " + "credentials documented in @ref guac.") JwtSigningAlgorithms { + // NOLINTNEXTLINE(readability-identifier-naming) + RS256 +}; /** * The max lifetime in seconds of an access token. * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This constant will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") constexpr std::chrono::seconds GoogleOAuthAccessTokenLifetime() { return std::chrono::seconds(3600); } @@ -55,6 +62,9 @@ constexpr std::chrono::seconds GoogleOAuthAccessTokenLifetime() { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This constant will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") constexpr std::chrono::seconds GoogleOAuthAccessTokenExpirationSlack() { return std::chrono::seconds(300); } @@ -64,6 +74,9 @@ constexpr std::chrono::seconds GoogleOAuthAccessTokenExpirationSlack() { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This constant will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") inline char const* GoogleOAuthRefreshEndpoint() { static constexpr char kEndpoint[] = "https://oauth2.googleapis.com/token"; return kEndpoint; @@ -74,6 +87,9 @@ inline char const* GoogleOAuthRefreshEndpoint() { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This constant will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") inline char const* GoogleOAuthScopeCloudPlatform() { static constexpr char kScope[] = "https://www.googleapis.com/auth/cloud-platform"; diff --git a/google/cloud/storage/oauth2/credentials.h b/google/cloud/storage/oauth2/credentials.h index 962dbc0ce8e3e..1c8570dc6b895 100644 --- a/google/cloud/storage/oauth2/credentials.h +++ b/google/cloud/storage/oauth2/credentials.h @@ -44,7 +44,9 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -class Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") Credentials { public: virtual ~Credentials() = default; diff --git a/google/cloud/storage/oauth2/google_application_default_credentials_file.h b/google/cloud/storage/oauth2/google_application_default_credentials_file.h index 0b3f903e01e14..5c9b41d1c053c 100644 --- a/google/cloud/storage/oauth2/google_application_default_credentials_file.h +++ b/google/cloud/storage/oauth2/google_application_default_credentials_file.h @@ -32,6 +32,9 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") char const* GoogleAdcEnvVar(); /** @@ -43,6 +46,9 @@ char const* GoogleAdcEnvVar(); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::string GoogleAdcFilePathFromEnvVarOrEmpty(); /** @@ -54,6 +60,9 @@ std::string GoogleAdcFilePathFromEnvVarOrEmpty(); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::string GoogleAdcFilePathFromWellKnownPathOrEmpty(); /** @@ -64,6 +73,9 @@ std::string GoogleAdcFilePathFromWellKnownPathOrEmpty(); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") char const* GoogleGcloudAdcFileEnvVar(); /** @@ -76,6 +88,9 @@ char const* GoogleGcloudAdcFileEnvVar(); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") char const* GoogleAdcHomeEnvVar(); } // namespace oauth2 diff --git a/google/cloud/storage/oauth2/google_credentials.cc b/google/cloud/storage/oauth2/google_credentials.cc index 31f384f7543e2..357db5c71ac41 100644 --- a/google/cloud/storage/oauth2/google_credentials.cc +++ b/google/cloud/storage/oauth2/google_credentials.cc @@ -51,7 +51,7 @@ StatusOr> LoadCredsFromPath( std::string const& path, bool non_service_account_ok, absl::optional> service_account_scopes, absl::optional service_account_subject, - ChannelOptions const& options) { + Options const& options) { std::ifstream ifs(path); if (!ifs.is_open()) { // We use kUnknown here because we don't know if the file does not exist, or @@ -119,7 +119,7 @@ StatusOr> MaybeLoadCredsFromAdcPaths( bool non_service_account_ok, absl::optional> service_account_scopes, absl::optional service_account_subject, - ChannelOptions const& options = {}) { + Options const& options = {}) { // 1) Check if the GOOGLE_APPLICATION_CREDENTIALS environment variable is set. auto path = GoogleAdcFilePathFromEnvVarOrEmpty(); if (path.empty()) { @@ -146,7 +146,7 @@ StatusOr> MaybeLoadCredsFromAdcPaths( } StatusOr> GoogleDefaultCredentials( - ChannelOptions const& options) { + Options const& options) { // 1 and 2) Check if the GOOGLE_APPLICATION_CREDENTIALS environment variable // is set or if the gcloud ADC file exists. auto creds = MaybeLoadCredsFromAdcPaths(true, {}, {}, options); @@ -181,7 +181,7 @@ CreateAuthorizedUserCredentialsFromJsonFilePath(std::string const& path) { StatusOr> CreateAuthorizedUserCredentialsFromJsonContents(std::string const& contents, - ChannelOptions const& options) { + Options const& options) { auto info = ParseAuthorizedUserCredentials(contents, "memory"); if (!info) { return StatusOr>(info.status()); @@ -216,7 +216,7 @@ CreateServiceAccountCredentialsFromJsonFilePath(std::string const& path) { StatusOr> CreateServiceAccountCredentialsFromJsonFilePath( std::string const& path, absl::optional> scopes, - absl::optional subject, ChannelOptions const& options) { + absl::optional subject, Options const& options) { std::ifstream is(path); std::string contents(std::istreambuf_iterator{is}, {}); auto info = ParseServiceAccountCredentials(contents, path); @@ -234,7 +234,7 @@ CreateServiceAccountCredentialsFromJsonFilePath( StatusOr> CreateServiceAccountCredentialsFromP12FilePath( std::string const& path, absl::optional> scopes, - absl::optional subject, ChannelOptions const& options) { + absl::optional subject, Options const& options) { auto info = ParseServiceAccountP12File(path); if (!info) { return StatusOr>(info.status()); @@ -253,14 +253,14 @@ CreateServiceAccountCredentialsFromP12FilePath(std::string const& path) { } StatusOr> -CreateServiceAccountCredentialsFromDefaultPaths(ChannelOptions const& options) { +CreateServiceAccountCredentialsFromDefaultPaths(Options const& options) { return CreateServiceAccountCredentialsFromDefaultPaths({}, {}, options); } StatusOr> CreateServiceAccountCredentialsFromDefaultPaths( absl::optional> scopes, - absl::optional subject, ChannelOptions const& options) { + absl::optional subject, Options const& options) { auto creds = MaybeLoadCredsFromAdcPaths(false, std::move(scopes), std::move(subject), options); if (!creds) { @@ -280,7 +280,7 @@ CreateServiceAccountCredentialsFromDefaultPaths( StatusOr> CreateServiceAccountCredentialsFromJsonContents(std::string const& contents, - ChannelOptions const& options) { + Options const& options) { return CreateServiceAccountCredentialsFromJsonContents(contents, {}, {}, options); } @@ -288,7 +288,7 @@ CreateServiceAccountCredentialsFromJsonContents(std::string const& contents, StatusOr> CreateServiceAccountCredentialsFromJsonContents( std::string const& contents, absl::optional> scopes, - absl::optional subject, ChannelOptions const& options) { + absl::optional subject, Options const& options) { auto info = ParseServiceAccountCredentials(contents, "memory"); if (!info) { return StatusOr>(info.status()); diff --git a/google/cloud/storage/oauth2/google_credentials.h b/google/cloud/storage/oauth2/google_credentials.h index 11c81abdcd717..dd891ac1acad6 100644 --- a/google/cloud/storage/oauth2/google_credentials.h +++ b/google/cloud/storage/oauth2/google_credentials.h @@ -15,10 +15,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_OAUTH2_GOOGLE_CREDENTIALS_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_OAUTH2_GOOGLE_CREDENTIALS_H -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/oauth2/credentials.h" #include "google/cloud/storage/version.h" #include "google/cloud/optional.h" +#include "google/cloud/options.h" #include "absl/types/optional.h" #include #include @@ -44,8 +44,11 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> GoogleDefaultCredentials( - ChannelOptions const& options = {}); + Options const& options = {}); ///@{ /** @@ -59,6 +62,9 @@ StatusOr> GoogleDefaultCredentials( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::shared_ptr CreateAnonymousCredentials(); /** @@ -69,6 +75,9 @@ std::shared_ptr CreateAnonymousCredentials(); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateAuthorizedUserCredentialsFromJsonFilePath(std::string const& path); @@ -80,9 +89,12 @@ CreateAuthorizedUserCredentialsFromJsonFilePath(std::string const& path); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> -CreateAuthorizedUserCredentialsFromJsonContents( - std::string const& contents, ChannelOptions const& options = {}); +CreateAuthorizedUserCredentialsFromJsonContents(std::string const& contents, + Options const& options = {}); ///@{ /** @@ -105,6 +117,9 @@ CreateAuthorizedUserCredentialsFromJsonContents( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromFilePath(std::string const& path); @@ -132,6 +147,9 @@ CreateServiceAccountCredentialsFromFilePath(std::string const& path); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromFilePath( std::string const& path, absl::optional> scopes, @@ -146,6 +164,9 @@ CreateServiceAccountCredentialsFromFilePath( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromJsonFilePath(std::string const& path); @@ -170,10 +191,13 @@ CreateServiceAccountCredentialsFromJsonFilePath(std::string const& path); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromJsonFilePath( std::string const& path, absl::optional> scopes, - absl::optional subject, ChannelOptions const& options = {}); + absl::optional subject, Options const& options = {}); /** * Creates a ServiceAccountCredentials from a P12 file at the specified path. @@ -184,6 +208,9 @@ CreateServiceAccountCredentialsFromJsonFilePath( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromP12FilePath(std::string const& path); @@ -208,10 +235,13 @@ CreateServiceAccountCredentialsFromP12FilePath(std::string const& path); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromP12FilePath( std::string const& path, absl::optional> scopes, - absl::optional subject, ChannelOptions const& options = {}); + absl::optional subject, Options const& options = {}); ///@} /** @@ -231,9 +261,11 @@ CreateServiceAccountCredentialsFromP12FilePath( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> -CreateServiceAccountCredentialsFromDefaultPaths( - ChannelOptions const& options = {}); +CreateServiceAccountCredentialsFromDefaultPaths(Options const& options = {}); /** * Produces a ServiceAccountCredentials type by trying to load the standard @@ -261,10 +293,13 @@ CreateServiceAccountCredentialsFromDefaultPaths( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromDefaultPaths( absl::optional> scopes, - absl::optional subject, ChannelOptions const& options = {}); + absl::optional subject, Options const& options = {}); /** * Creates a ServiceAccountCredentials from a JSON string. @@ -275,9 +310,12 @@ CreateServiceAccountCredentialsFromDefaultPaths( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> -CreateServiceAccountCredentialsFromJsonContents( - std::string const& contents, ChannelOptions const& options = {}); +CreateServiceAccountCredentialsFromJsonContents(std::string const& contents, + Options const& options = {}); /** * Creates a ServiceAccountCredentials from a JSON string. @@ -301,16 +339,22 @@ CreateServiceAccountCredentialsFromJsonContents( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr> CreateServiceAccountCredentialsFromJsonContents( std::string const& contents, absl::optional> scopes, - absl::optional subject, ChannelOptions const& options = {}); + absl::optional subject, Options const& options = {}); /** * Creates a ComputeEngineCredentials for the VM's default service account. * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::shared_ptr CreateComputeEngineCredentials(); /** @@ -318,6 +362,9 @@ std::shared_ptr CreateComputeEngineCredentials(); * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::shared_ptr CreateComputeEngineCredentials( std::string const& service_account_email); diff --git a/google/cloud/storage/oauth2/refreshing_credentials_wrapper.h b/google/cloud/storage/oauth2/refreshing_credentials_wrapper.h index 85496c491f7c2..2f63398024904 100644 --- a/google/cloud/storage/oauth2/refreshing_credentials_wrapper.h +++ b/google/cloud/storage/oauth2/refreshing_credentials_wrapper.h @@ -35,11 +35,16 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -class RefreshingCredentialsWrapper { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") + RefreshingCredentialsWrapper { public: RefreshingCredentialsWrapper(); - struct TemporaryToken { + struct GOOGLE_CLOUD_CPP_DEPRECATED( + "This struct will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") TemporaryToken { std::string token; std::chrono::system_clock::time_point expiration_time; }; diff --git a/google/cloud/storage/oauth2/service_account_credentials.cc b/google/cloud/storage/oauth2/service_account_credentials.cc index 248152e8b64ad..25a1bc4ce2f4e 100644 --- a/google/cloud/storage/oauth2/service_account_credentials.cc +++ b/google/cloud/storage/oauth2/service_account_credentials.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "google/cloud/storage/oauth2/service_account_credentials.h" -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/internal/base64.h" #include "google/cloud/storage/internal/make_jwt_assertion.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -125,12 +124,11 @@ bool ServiceAccountUseOAuth(ServiceAccountCredentialsInfo const& info) { ServiceAccountCredentials:: ServiceAccountCredentials(ServiceAccountCredentialsInfo info, - ChannelOptions const& options) + Options options) : impl_(std::make_unique( std::make_unique( internal::MapServiceAccountCredentialsInfo(std::move(info)), - Options{}.set(options.ssl_root_path()), - [](Options const& o) { + std::move(options), [](Options const& o) { return rest_internal::MakeDefaultRestClient(std::string{}, o); }))) {} diff --git a/google/cloud/storage/oauth2/service_account_credentials.h b/google/cloud/storage/oauth2/service_account_credentials.h index 7da214edbea8b..9bc28128beee8 100644 --- a/google/cloud/storage/oauth2/service_account_credentials.h +++ b/google/cloud/storage/oauth2/service_account_credentials.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_OAUTH2_SERVICE_ACCOUNT_CREDENTIALS_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_OAUTH2_SERVICE_ACCOUNT_CREDENTIALS_H -#include "google/cloud/storage/client_options.h" #include "google/cloud/storage/internal/base64.h" #include "google/cloud/storage/internal/curl/request_builder.h" #include "google/cloud/storage/internal/http_response.h" @@ -30,6 +29,7 @@ #include "google/cloud/internal/sha256_hash.h" #include "google/cloud/internal/sign_using_sha256.h" #include "google/cloud/optional.h" +#include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "absl/types/optional.h" #include @@ -54,7 +54,10 @@ namespace oauth2 { * * @deprecated Prefer using the unified credentials documented in @ref guac */ -struct ServiceAccountCredentialsInfo { +struct GOOGLE_CLOUD_CPP_DEPRECATED( + "This struct will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") + ServiceAccountCredentialsInfo { std::string client_email; std::string private_key_id; std::string private_key; @@ -70,7 +73,9 @@ struct ServiceAccountCredentialsInfo { * * @deprecated Prefer using the unified credentials documented in @ref guac */ - +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseServiceAccountCredentials( std::string const& content, std::string const& source, std::string const& default_token_uri = GoogleOAuthRefreshEndpoint()); @@ -86,6 +91,9 @@ StatusOr ParseServiceAccountCredentials( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseServiceAccountP12File( std::string const& source, std::string const& default_token_uri = GoogleOAuthRefreshEndpoint()); @@ -96,6 +104,9 @@ StatusOr ParseServiceAccountP12File( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr ParseServiceAccountRefreshResponse( storage::internal::HttpResponse const& response, @@ -112,6 +123,9 @@ ParseServiceAccountRefreshResponse( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::pair AssertionComponentsFromInfo( ServiceAccountCredentialsInfo const& info, std::chrono::system_clock::time_point now); @@ -123,6 +137,9 @@ std::pair AssertionComponentsFromInfo( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::string MakeJWTAssertion(std::string const& header, std::string const& payload, std::string const& pem_contents); @@ -136,6 +153,9 @@ std::string MakeJWTAssertion(std::string const& header, * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") std::string CreateServiceAccountRefreshPayload( ServiceAccountCredentialsInfo const& info, std::string const& grant_type, std::chrono::system_clock::time_point now); @@ -166,6 +186,9 @@ std::string CreateServiceAccountRefreshPayload( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") StatusOr MakeSelfSignedJWT( ServiceAccountCredentialsInfo const& info, std::chrono::system_clock::time_point tp); @@ -175,6 +198,9 @@ StatusOr MakeSelfSignedJWT( * * @deprecated Prefer using the unified credentials documented in @ref guac */ +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") bool ServiceAccountUseOAuth(ServiceAccountCredentialsInfo const& info); /** @@ -211,14 +237,16 @@ class ServiceAccountCredentials; /// @copydoc ServiceAccountCredentials template <> -class ServiceAccountCredentials - : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") + ServiceAccountCredentials : public Credentials { public: explicit ServiceAccountCredentials(ServiceAccountCredentialsInfo info) : ServiceAccountCredentials(std::move(info), {}) {} ServiceAccountCredentials(ServiceAccountCredentialsInfo info, - ChannelOptions const& options); + Options options); StatusOr AuthorizationHeader() override { return oauth2_internal::AuthenticationHeaderJoined(*impl_); @@ -260,15 +288,15 @@ class ServiceAccountCredentials -class ServiceAccountCredentials : public Credentials { +class GOOGLE_CLOUD_CPP_DEPRECATED( + "This class will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") ServiceAccountCredentials + : public Credentials { public: explicit ServiceAccountCredentials(ServiceAccountCredentialsInfo info) : ServiceAccountCredentials(std::move(info), {}) {} - ServiceAccountCredentials(ServiceAccountCredentialsInfo info, - ChannelOptions const& options) - : info_(std::move(info)), - options_(Options{}.set(options.ssl_root_path())), - clock_() {} + ServiceAccountCredentials(ServiceAccountCredentialsInfo info, Options options) + : info_(std::move(info)), options_(std::move(options)), clock_() {} StatusOr AuthorizationHeader() override { std::unique_lock lock(mu_); @@ -353,6 +381,9 @@ class ServiceAccountCredentials : public Credentials { namespace internal { +GOOGLE_CLOUD_CPP_DEPRECATED( + "This function will be removed in v4.0.0 and later. Prefer using the " + "unified credentials documented in @ref guac.") oauth2_internal::ServiceAccountCredentialsInfo MapServiceAccountCredentialsInfo( oauth2::ServiceAccountCredentialsInfo info); diff --git a/google/cloud/storage/oauth2/service_account_credentials_test.cc b/google/cloud/storage/oauth2/service_account_credentials_test.cc index e0dbfececf785..948095d24e30f 100644 --- a/google/cloud/storage/oauth2/service_account_credentials_test.cc +++ b/google/cloud/storage/oauth2/service_account_credentials_test.cc @@ -18,6 +18,8 @@ #include "google/cloud/storage/testing/constants.h" #include "google/cloud/storage/testing/mock_http_request.h" #include "google/cloud/storage/testing/write_base64.h" +#include "google/cloud/common_options.h" +#include "google/cloud/credentials.h" #include "google/cloud/internal/base64_transforms.h" #include "google/cloud/internal/filesystem.h" #include "google/cloud/internal/random.h" @@ -389,7 +391,7 @@ TEST_F(ServiceAccountCredentialsTest, UsesCARootsInfo) { }); ServiceAccountCredentials credentials( - *info, ChannelOptions().set_ssl_root_path(cainfo)); + *info, Options{}.set(cainfo)); // Call Refresh to obtain the access token for our authorization header. auto authorization_header = credentials.AuthorizationHeader(); ASSERT_STATUS_OK(authorization_header); diff --git a/google/cloud/storage/quickstart/.bazelrc b/google/cloud/storage/quickstart/.bazelrc index f8f4bb3e07a87..5dddf1f14d7ef 100644 --- a/google/cloud/storage/quickstart/.bazelrc +++ b/google/cloud/storage/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -30,4 +30,4 @@ build:macos --host_cxxopt=-std=c++14 build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod -build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/storage/quickstart/MODULE.bazel b/google/cloud/storage/quickstart/MODULE.bazel new file mode 100644 index 0000000000000..697b80b4bedbf --- /dev/null +++ b/google/cloud/storage/quickstart/MODULE.bazel @@ -0,0 +1,3 @@ +module(name = "storage-quickstart") + +bazel_dep(name = "google_cloud_cpp", version = "3.0.0-rc0") diff --git a/google/cloud/storage/storage_client_unit_tests.bzl b/google/cloud/storage/storage_client_unit_tests.bzl index b1a8a1bdb56e3..065d4f6240a4b 100644 --- a/google/cloud/storage/storage_client_unit_tests.bzl +++ b/google/cloud/storage/storage_client_unit_tests.bzl @@ -31,7 +31,6 @@ storage_client_unit_tests = [ "client_object_acl_test.cc", "client_object_copy_test.cc", "client_object_test.cc", - "client_options_test.cc", "client_service_account_test.cc", "client_sign_policy_document_test.cc", "client_sign_url_test.cc", @@ -42,8 +41,6 @@ storage_client_unit_tests = [ "hashing_options_test.cc", "hmac_key_metadata_test.cc", "idempotency_policy_test.cc", - "internal/access_control_common_parser_test.cc", - "internal/access_control_common_test.cc", "internal/access_token_credentials_test.cc", "internal/base64_test.cc", "internal/bucket_acl_requests_test.cc", diff --git a/google/cloud/storage/testing/client_unit_test.cc b/google/cloud/storage/testing/client_unit_test.cc index 66a2cb45f389a..b7c828a523d22 100644 --- a/google/cloud/storage/testing/client_unit_test.cc +++ b/google/cloud/storage/testing/client_unit_test.cc @@ -21,13 +21,9 @@ namespace storage { namespace testing { using ::testing::Return; -using ::testing::ReturnRef; ClientUnitTest::ClientUnitTest() - : mock_(std::make_shared()), - client_options_(ClientOptions(oauth2::CreateAnonymousCredentials())) { - EXPECT_CALL(*mock_, client_options()) - .WillRepeatedly(ReturnRef(client_options_)); + : mock_(std::make_shared()) { EXPECT_CALL(*mock_, options) .WillRepeatedly(Return(storage::internal::DefaultOptionsWithCredentials( Options{} diff --git a/google/cloud/storage/testing/client_unit_test.h b/google/cloud/storage/testing/client_unit_test.h index 5cb34074af098..17734caf5b2e1 100644 --- a/google/cloud/storage/testing/client_unit_test.h +++ b/google/cloud/storage/testing/client_unit_test.h @@ -34,7 +34,6 @@ class ClientUnitTest : public ::testing::Test { google::cloud::storage::Client ClientForMock(); std::shared_ptr mock_; - ClientOptions client_options_; }; } // namespace testing diff --git a/google/cloud/storage/testing/mock_client.h b/google/cloud/storage/testing/mock_client.h index 0c4161f9d3343..0f63951d28920 100644 --- a/google/cloud/storage/testing/mock_client.h +++ b/google/cloud/storage/testing/mock_client.h @@ -31,11 +31,7 @@ namespace testing { class MockClient : public google::cloud::storage::internal::StorageConnection { public: - MockClient() - : client_options_( - google::cloud::storage::oauth2::CreateAnonymousCredentials()) { - EXPECT_CALL(*this, client_options()) - .WillRepeatedly(::testing::ReturnRef(client_options_)); + MockClient() { EXPECT_CALL(*this, options) .WillRepeatedly( ::testing::Return(storage::internal::DefaultOptionsWithCredentials( @@ -43,7 +39,6 @@ class MockClient : public google::cloud::storage::internal::StorageConnection { MakeInsecureCredentials())))); } - MOCK_METHOD(ClientOptions const&, client_options, (), (const, override)); MOCK_METHOD(Options, options, (), (const, override)); MOCK_METHOD(StatusOr, ListBuckets, (internal::ListBucketsRequest const&), (override)); @@ -187,9 +182,6 @@ class MockClient : public google::cloud::storage::internal::StorageConnection { MOCK_METHOD(std::vector, InspectStackStructure, (), (const, override)); - - private: - ClientOptions client_options_; }; class MockObjectReadSource : public internal::ObjectReadSource { diff --git a/google/cloud/storage/tests/BUILD.bazel b/google/cloud/storage/tests/BUILD.bazel index 177246db5be7a..675cdb0664eb7 100644 --- a/google/cloud/storage/tests/BUILD.bazel +++ b/google/cloud/storage/tests/BUILD.bazel @@ -48,10 +48,9 @@ VARIATIONS = { "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", "//protos/google/cloud/storage/tests:storage_conformance_tests_cc_proto", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest_main", ], ) for test in storage_client_integration_tests for v_label, v_env in VARIATIONS.items()] @@ -76,9 +75,8 @@ VARIATIONS = { "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "//protos:system_includes", "//protos/google/cloud/storage/tests:storage_conformance_tests_cc_proto", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest_main", ], ) for test in ["universe_domain_integration_test.cc"]] diff --git a/google/cloud/storage/tests/bucket_acl_integration_test.cc b/google/cloud/storage/tests/bucket_acl_integration_test.cc index eff5a62caa675..b42a03e3ac654 100644 --- a/google/cloud/storage/tests/bucket_acl_integration_test.cc +++ b/google/cloud/storage/tests/bucket_acl_integration_test.cc @@ -154,6 +154,8 @@ TEST_F(BucketAclIntegrationTest, AclCRUD) { } TEST_F(BucketAclIntegrationTest, CreatePredefinedAcl) { + // TODO(#15854): Enable this test when the issue is resolved. + if (!UsingEmulator()) GTEST_SKIP(); std::vector test_values{ PredefinedAcl::AuthenticatedRead(), PredefinedAcl::Private(), PredefinedAcl::ProjectPrivate(), PredefinedAcl::PublicRead(), diff --git a/google/cloud/storage/tests/bucket_integration_test.cc b/google/cloud/storage/tests/bucket_integration_test.cc index 81ab844176b9f..01509bc547546 100644 --- a/google/cloud/storage/tests/bucket_integration_test.cc +++ b/google/cloud/storage/tests/bucket_integration_test.cc @@ -226,6 +226,8 @@ TEST_F(BucketIntegrationTest, PatchLifecycleConditions) { } TEST_F(BucketIntegrationTest, FullPatch) { + // TODO(#15854): Enable this test when the issue is resolved. + if (!UsingEmulator()) GTEST_SKIP(); std::string bucket_name = MakeRandomBucketName(); auto client = MakeBucketIntegrationTestClient(); @@ -561,6 +563,8 @@ TEST_F(BucketIntegrationTest, GetMetadataIfMetagenerationNotMatchFailure) { } TEST_F(BucketIntegrationTest, NativeIamCRUD) { + // TODO(#15854): Enable this test when the issue is resolved. + if (!UsingEmulator()) GTEST_SKIP(); std::string bucket_name = MakeRandomBucketName(); auto client = MakeBucketIntegrationTestClient(); diff --git a/google/cloud/storage/tests/create_client_integration_test.cc b/google/cloud/storage/tests/create_client_integration_test.cc index 1af30e631c788..fafdeedebd5fb 100644 --- a/google/cloud/storage/tests/create_client_integration_test.cc +++ b/google/cloud/storage/tests/create_client_integration_test.cc @@ -66,10 +66,9 @@ class CreateClientIntegrationTest #include "google/cloud/internal/disable_deprecation_warnings.inc" TEST_F(CreateClientIntegrationTest, DefaultWorks) { - auto client = Client::CreateDefaultClient(); - ASSERT_THAT(client, IsOk()); + auto client = Client(Options{}); ASSERT_NO_FATAL_FAILURE( - UseClient(*client, bucket_name(), MakeRandomObjectName(), LoremIpsum())); + UseClient(client, bucket_name(), MakeRandomObjectName(), LoremIpsum())); } TEST_F(CreateClientIntegrationTest, SettingPolicies) { @@ -79,24 +78,20 @@ TEST_F(CreateClientIntegrationTest, SettingPolicies) { ASSERT_THAT(c, IsOk()); credentials = *std::move(c); } - auto client = - Client(ClientOptions(std::move(credentials)), - LimitedErrorCountRetryPolicy(/*maximum_failures=*/5), - ExponentialBackoffPolicy(/*initial_delay=*/std::chrono::seconds(1), - /*maximum_delay=*/std::chrono::minutes(5), - /*scaling=*/1.5)); + auto client = Client( + Options{} + .set( + LimitedErrorCountRetryPolicy(/*maximum_failures=*/5).clone()) + .set( + ExponentialBackoffPolicy( + /*initial_delay=*/std::chrono::seconds(1), + /*maximum_delay=*/std::chrono::minutes(5), + /*scaling=*/1.5) + .clone())); ASSERT_NO_FATAL_FAILURE( UseClient(client, bucket_name(), MakeRandomObjectName(), LoremIpsum())); } -/// @test Verify the backwards compatibility `v1` namespace still exists. -TEST_F(CreateClientIntegrationTest, BackwardsCompatibility) { - auto client = ::google::cloud::storage::v1::Client::CreateDefaultClient(); - ASSERT_THAT(client, IsOk()); - ASSERT_NO_FATAL_FAILURE( - UseClient(*client, bucket_name(), MakeRandomObjectName(), LoremIpsum())); -} - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace storage diff --git a/google/cloud/storage/tests/default_object_acl_integration_test.cc b/google/cloud/storage/tests/default_object_acl_integration_test.cc index cf56260a5d045..7bb812d2b9519 100644 --- a/google/cloud/storage/tests/default_object_acl_integration_test.cc +++ b/google/cloud/storage/tests/default_object_acl_integration_test.cc @@ -53,6 +53,8 @@ class DefaultObjectAclIntegrationTest }; TEST_F(DefaultObjectAclIntegrationTest, AclCRUD) { + // TODO(#15854): Enable this test when the issue is resolved. + if (!UsingEmulator()) GTEST_SKIP(); std::string bucket_name = MakeRandomBucketName(); auto client = MakeIntegrationTestClient(MakeBucketTestOptions()); @@ -157,6 +159,8 @@ TEST_F(DefaultObjectAclIntegrationTest, AclCRUD) { } TEST_F(DefaultObjectAclIntegrationTest, CreatePredefinedDefaultObjectAcl) { + // TODO(#15854): Enable this test when the issue is resolved. + if (!UsingEmulator()) GTEST_SKIP(); std::vector test_values{ PredefinedDefaultObjectAcl::AuthenticatedRead(), PredefinedDefaultObjectAcl::BucketOwnerFullControl(), diff --git a/google/cloud/storage/tests/object_media_integration_test.cc b/google/cloud/storage/tests/object_media_integration_test.cc index 604bffe1364d6..5250461ee1d24 100644 --- a/google/cloud/storage/tests/object_media_integration_test.cc +++ b/google/cloud/storage/tests/object_media_integration_test.cc @@ -515,9 +515,6 @@ TEST_F(ObjectMediaIntegrationTest, ConnectionFailureUploadFile) { TEST_F(ObjectMediaIntegrationTest, StreamingReadTimeout) { // The emulator does not support this type of fault injection for gRPC. if (!UsingEmulator() || UsingGrpc()) GTEST_SKIP(); - auto options = ClientOptions::CreateDefaultClientOptions(); - ASSERT_STATUS_OK(options); - auto client = MakeIntegrationTestClient( Options{} .set(std::chrono::seconds(3)) diff --git a/google/cloud/storage/tests/signed_url_conformance_test.cc b/google/cloud/storage/tests/signed_url_conformance_test.cc index 7f14085984059..d50dbb2014b08 100644 --- a/google/cloud/storage/tests/signed_url_conformance_test.cc +++ b/google/cloud/storage/tests/signed_url_conformance_test.cc @@ -24,7 +24,7 @@ #include "google/cloud/terminate_handler.h" #include "google/cloud/testing_util/scoped_environment.h" #include "google/cloud/testing_util/status_matchers.h" -#include +#include "protos/google/cloud/storage/tests/conformance_tests.pb.h" #include #include #include diff --git a/google/cloud/storagebatchoperations/BUILD.bazel b/google/cloud/storagebatchoperations/BUILD.bazel index f05f2910d2c2c..a26e644ab257f 100644 --- a/google/cloud/storagebatchoperations/BUILD.bazel +++ b/google/cloud/storagebatchoperations/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/storagebatchoperations/v1:storagebatchoperations_cc_grpc", + "@googleapis//google/cloud/storagebatchoperations/v1:storagebatchoperations_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.cc index df5fb995355da..c80bbf1e441cf 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/storagebatchoperations/v1/storage_batch_operations.proto #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.h" -#include +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.grpc.pb.h" #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.h index 17eb28183145e..153337a8d4b9b 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_connection_impl.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_connection_impl.h index e29375c992691..ed06e6eb84fdc 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_connection_impl.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.cc index 82c46b1a5b246..0f70901105e61 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/storagebatchoperations/v1/storage_batch_operations.proto #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.h index b91f4cbe7f599..f3f2cd4b874a9 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.cc index 8d91b559ab837..5654899d37b9e 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/storagebatchoperations/v1/storage_batch_operations.proto #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.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 #include #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.h index 3eff602c4a1cc..994416d2da93c 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.cc index 192e6e020c65b..72ee6204b16fe 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/storagebatchoperations/v1/storage_batch_operations.proto #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h index 8ff52e50d0fc8..b1a90462577a4 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEBATCHOPERATIONS_V1_INTERNAL_STORAGE_BATCH_OPERATIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEBATCHOPERATIONS_V1_INTERNAL_STORAGE_BATCH_OPERATIONS_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub_factory.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub_factory.cc index f1d2c22489e82..137dc5f85f80e 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub_factory.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/storagebatchoperations/v1/storage_batch_operations.proto #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_auth_decorator.h" #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_logging_decorator.h" #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_metadata_decorator.h" #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_stub.h" #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.cc index ed4ce4f9fa179..4507ae057f7bf 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace storagebatchoperations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageBatchOperationsTracingConnection:: StorageBatchOperationsTracingConnection( std::shared_ptr< @@ -168,18 +166,14 @@ Status StorageBatchOperationsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageBatchOperationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.h index cdf667b1f1a27..94c5884629f83 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace storagebatchoperations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageBatchOperationsTracingConnection : public storagebatchoperations_v1::StorageBatchOperationsConnection { public: @@ -93,8 +91,6 @@ class StorageBatchOperationsTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.cc b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.cc index d2ddee9545e92..5f26196cc9afa 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.cc +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace storagebatchoperations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageBatchOperationsTracingStub::StorageBatchOperationsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -219,16 +217,10 @@ future StorageBatchOperationsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageBatchOperationsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.h b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.h index 583693a77258c..b0568d3cc482d 100644 --- a/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.h +++ b/google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace storagebatchoperations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageBatchOperationsTracingStub : public StorageBatchOperationsStub { public: ~StorageBatchOperationsTracingStub() override = default; @@ -113,8 +111,6 @@ class StorageBatchOperationsTracingStub : public StorageBatchOperationsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/storagebatchoperations/v1/storage_batch_operations_client.h b/google/cloud/storagebatchoperations/v1/storage_batch_operations_client.h index 539670f8419b9..382da97429c16 100644 --- a/google/cloud/storagebatchoperations/v1/storage_batch_operations_client.h +++ b/google/cloud/storagebatchoperations/v1/storage_batch_operations_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection.h b/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection.h index d77bbd7c9db39..c736f8f7913e5 100644 --- a/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection.h +++ b/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEBATCHOPERATIONS_V1_STORAGE_BATCH_OPERATIONS_CONNECTION_H #include "google/cloud/storagebatchoperations/v1/internal/storage_batch_operations_retry_traits.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.pb.h" #include "google/cloud/storagebatchoperations/v1/storage_batch_operations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection_idempotency_policy.h b/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection_idempotency_policy.h index 94841473fe811..49521d6d8c1ce 100644 --- a/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection_idempotency_policy.h +++ b/google/cloud/storagebatchoperations/v1/storage_batch_operations_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEBATCHOPERATIONS_V1_STORAGE_BATCH_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEBATCHOPERATIONS_V1_STORAGE_BATCH_OPERATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/storagebatchoperations/v1/storage_batch_operations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storagecontrol/BUILD.bazel b/google/cloud/storagecontrol/BUILD.bazel index 473c01a78fab9..826731d87d018 100644 --- a/google/cloud/storagecontrol/BUILD.bazel +++ b/google/cloud/storagecontrol/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v2/"] googleapis_deps = [ - "@com_google_googleapis//google/storage/control/v2:control_cc_grpc", + "@googleapis//google/storage/control/v2:control_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/storagecontrol/quickstart/.bazelrc b/google/cloud/storagecontrol/quickstart/.bazelrc index 15d5c055db074..343e7f623d628 100644 --- a/google/cloud/storagecontrol/quickstart/.bazelrc +++ b/google/cloud/storagecontrol/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.cc b/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.cc index e573a58905b17..8270e753016d0 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/storage/control/v2/storage_control.proto #include "google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.h" -#include +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.h b/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.h index 662ab207b57ac..f03ca80659c76 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagecontrol/v2/internal/storage_control_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_connection_impl.h b/google/cloud/storagecontrol/v2/internal/storage_control_connection_impl.h index 0bbf88e1762df..beefbfabcb8cc 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_connection_impl.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_connection_impl.h @@ -33,7 +33,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.cc b/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.cc index 964f753fe8741..d6717dc60f14c 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.h b/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.h index d29b1f0df8425..86a7528899f8a 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagecontrol/v2/internal/storage_control_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.cc b/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.cc index 0d0824faf241a..5ba389397cb86 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.cc @@ -24,7 +24,7 @@ #include "google/cloud/internal/routing_matcher.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.h b/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.h index b3d927f886f4a..4d62488e01124 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagecontrol/v2/internal/storage_control_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc b/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc index b789db663948c..62c7a33df0c05 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/storagecontrol/v2/internal/storage_control_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_stub.h b/google/cloud/storagecontrol/v2/internal/storage_control_stub.h index b1e58a8d61101..5089cd576aa25 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_stub.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_stub_factory.cc b/google/cloud/storagecontrol/v2/internal/storage_control_stub_factory.cc index f9810544ecd3b..b1c10cd54cb06 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_stub_factory.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include #include diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.cc b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.cc index 95f48a9550c31..8fd60f44baf75 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace storagecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageControlTracingConnection::StorageControlTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -351,16 +349,12 @@ StorageControlTracingConnection::TestIamPermissions( return internal::EndSpan(*span, child_->TestIamPermissions(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageControlTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.h b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.h index 7d4b28dad8296..15685ce770850 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace storagecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageControlTracingConnection : public storagecontrol_v2::StorageControlConnection { public: @@ -172,8 +170,6 @@ class StorageControlTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.cc b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.cc index e093f09c70db2..1495366e87851 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace storagecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageControlTracingStub::StorageControlTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -443,15 +441,9 @@ future StorageControlTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageControlTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.h b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.h index 1dcdb7d9ccbfe..67791b521a54e 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace storagecontrol_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageControlTracingStub : public StorageControlStub { public: ~StorageControlTracingStub() override = default; @@ -209,8 +207,6 @@ class StorageControlTracingStub : public StorageControlStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/storagecontrol/v2/samples/storage_control_anywhere_cache_samples.cc b/google/cloud/storagecontrol/v2/samples/storage_control_anywhere_cache_samples.cc index e8ca0dabca6af..62f2f8b52ec08 100644 --- a/google/cloud/storagecontrol/v2/samples/storage_control_anywhere_cache_samples.cc +++ b/google/cloud/storagecontrol/v2/samples/storage_control_anywhere_cache_samples.cc @@ -15,7 +15,7 @@ #include "google/cloud/storagecontrol/v2/storage_control_client.h" #include "google/cloud/internal/getenv.h" #include "google/cloud/testing_util/example_driver.h" -#include +#include "google/storage/control/v2/storage_control.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/samples/storage_control_folder_samples.cc b/google/cloud/storagecontrol/v2/samples/storage_control_folder_samples.cc index 12bedbae3d64d..43e8050f65f4c 100644 --- a/google/cloud/storagecontrol/v2/samples/storage_control_folder_samples.cc +++ b/google/cloud/storagecontrol/v2/samples/storage_control_folder_samples.cc @@ -16,7 +16,7 @@ #include "google/cloud/internal/getenv.h" #include "google/cloud/internal/time_utils.h" #include "google/cloud/testing_util/example_driver.h" -#include +#include "google/storage/control/v2/storage_control.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/samples/storage_control_managed_folder_samples.cc b/google/cloud/storagecontrol/v2/samples/storage_control_managed_folder_samples.cc index bbc9a80c2d3b9..ae3a33b808a12 100644 --- a/google/cloud/storagecontrol/v2/samples/storage_control_managed_folder_samples.cc +++ b/google/cloud/storagecontrol/v2/samples/storage_control_managed_folder_samples.cc @@ -16,7 +16,7 @@ #include "google/cloud/internal/getenv.h" #include "google/cloud/internal/time_utils.h" #include "google/cloud/testing_util/example_driver.h" -#include +#include "google/storage/control/v2/storage_control.pb.h" #include #include #include diff --git a/google/cloud/storagecontrol/v2/storage_control_client.h b/google/cloud/storagecontrol/v2/storage_control_client.h index b0077caac9c01..546564b5f3a08 100644 --- a/google/cloud/storagecontrol/v2/storage_control_client.h +++ b/google/cloud/storagecontrol/v2/storage_control_client.h @@ -28,7 +28,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storagecontrol/v2/storage_control_connection.h b/google/cloud/storagecontrol/v2/storage_control_connection.h index 1c15f550a459a..6c50e4ebfea53 100644 --- a/google/cloud/storagecontrol/v2/storage_control_connection.h +++ b/google/cloud/storagecontrol/v2/storage_control_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storage/control/v2/storage_control.pb.h" #include namespace google { diff --git a/google/cloud/storagecontrol/v2/storage_control_connection_idempotency_policy.h b/google/cloud/storagecontrol/v2/storage_control_connection_idempotency_policy.h index 0db0358f25d5a..4b7a54245a65c 100644 --- a/google/cloud/storagecontrol/v2/storage_control_connection_idempotency_policy.h +++ b/google/cloud/storagecontrol/v2/storage_control_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/storage/control/v2/storage_control.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storageinsights/BUILD.bazel b/google/cloud/storageinsights/BUILD.bazel index eef854b92b79e..82cb84f3d7753 100644 --- a/google/cloud/storageinsights/BUILD.bazel +++ b/google/cloud/storageinsights/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/storageinsights/v1:storageinsights_cc_grpc", + "@googleapis//google/cloud/storageinsights/v1:storageinsights_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/storageinsights/quickstart/.bazelrc b/google/cloud/storageinsights/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/storageinsights/quickstart/.bazelrc +++ b/google/cloud/storageinsights/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.cc b/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.cc index a3f9254900594..2495ed32b87e3 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/storageinsights/v1/storageinsights.proto #include "google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.h" -#include +#include "google/cloud/storageinsights/v1/storageinsights.grpc.pb.h" #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.h b/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.h index c464091c9705f..1a550758ed4e6 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storageinsights/v1/internal/storage_insights_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_connection_impl.h b/google/cloud/storageinsights/v1/internal/storage_insights_connection_impl.h index 278dd32ab1078..0a17475b9c82a 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_connection_impl.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.cc b/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.cc index 002e71d0d495c..feea44f220536 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/storageinsights/v1/storageinsights.proto #include "google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.h" +#include "google/cloud/storageinsights/v1/storageinsights.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.h b/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.h index dad507f7bf240..bb8b6235bd670 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storageinsights/v1/internal/storage_insights_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.cc b/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.cc index da97c85ee551e..21adcf651a22f 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/storageinsights/v1/storageinsights.proto #include "google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.h" +#include "google/cloud/storageinsights/v1/storageinsights.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 #include #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.h b/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.h index b8c76ee37b707..bdda694a4c06b 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storageinsights/v1/internal/storage_insights_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_stub.cc b/google/cloud/storageinsights/v1/internal/storage_insights_stub.cc index 564791c3f98fd..6e72a26739310 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_stub.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/storageinsights/v1/storageinsights.proto #include "google/cloud/storageinsights/v1/internal/storage_insights_stub.h" +#include "google/cloud/storageinsights/v1/storageinsights.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_stub.h b/google/cloud/storageinsights/v1/internal/storage_insights_stub.h index 7f293f2ba6674..4e0ff831b7c0f 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_stub.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEINSIGHTS_V1_INTERNAL_STORAGE_INSIGHTS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEINSIGHTS_V1_INTERNAL_STORAGE_INSIGHTS_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/storageinsights/v1/storageinsights.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_stub_factory.cc b/google/cloud/storageinsights/v1/internal/storage_insights_stub_factory.cc index 5b81f003e9711..14777860f4de0 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_stub_factory.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/storageinsights/v1/storageinsights.proto #include "google/cloud/storageinsights/v1/internal/storage_insights_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/storageinsights/v1/internal/storage_insights_auth_decorator.h" #include "google/cloud/storageinsights/v1/internal/storage_insights_logging_decorator.h" #include "google/cloud/storageinsights/v1/internal/storage_insights_metadata_decorator.h" #include "google/cloud/storageinsights/v1/internal/storage_insights_stub.h" #include "google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.h" +#include "google/cloud/storageinsights/v1/storageinsights.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc index 1b87e43c05c7c..5d5a6b4240d63 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace storageinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageInsightsTracingConnection::StorageInsightsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -337,16 +335,12 @@ Status StorageInsightsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageInsightsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.h b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.h index 2261babdcd84b..2df1f5409e5e7 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace storageinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageInsightsTracingConnection : public storageinsights_v1::StorageInsightsConnection { public: @@ -162,8 +160,6 @@ class StorageInsightsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.cc b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.cc index 7a635c1d500fe..881e2972af530 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace storageinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageInsightsTracingStub::StorageInsightsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -383,15 +381,9 @@ future StorageInsightsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageInsightsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.h b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.h index 067cfdef2bfa0..8b2124e9eea89 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.h +++ b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace storageinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageInsightsTracingStub : public StorageInsightsStub { public: ~StorageInsightsTracingStub() override = default; @@ -189,8 +187,6 @@ class StorageInsightsTracingStub : public StorageInsightsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/storageinsights/v1/storage_insights_client.h b/google/cloud/storageinsights/v1/storage_insights_client.h index 63b8b2c4cd67d..272b5abb1485e 100644 --- a/google/cloud/storageinsights/v1/storage_insights_client.h +++ b/google/cloud/storageinsights/v1/storage_insights_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storageinsights/v1/storage_insights_connection.h b/google/cloud/storageinsights/v1/storage_insights_connection.h index 4d8359507e362..acdaed0c5d193 100644 --- a/google/cloud/storageinsights/v1/storage_insights_connection.h +++ b/google/cloud/storageinsights/v1/storage_insights_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/storageinsights/v1/internal/storage_insights_retry_traits.h" #include "google/cloud/storageinsights/v1/storage_insights_connection_idempotency_policy.h" +#include "google/cloud/storageinsights/v1/storageinsights.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storageinsights/v1/storage_insights_connection_idempotency_policy.h b/google/cloud/storageinsights/v1/storage_insights_connection_idempotency_policy.h index b5f810cb8045a..c504ce1d2791d 100644 --- a/google/cloud/storageinsights/v1/storage_insights_connection_idempotency_policy.h +++ b/google/cloud/storageinsights/v1/storage_insights_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEINSIGHTS_V1_STORAGE_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGEINSIGHTS_V1_STORAGE_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/storageinsights/v1/storageinsights.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storagetransfer/BUILD.bazel b/google/cloud/storagetransfer/BUILD.bazel index 3fdcf167e0153..ae94c5bb0841c 100644 --- a/google/cloud/storagetransfer/BUILD.bazel +++ b/google/cloud/storagetransfer/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/storagetransfer/v1:storagetransfer_cc_grpc", + "@googleapis//google/storagetransfer/v1:storagetransfer_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/storagetransfer/quickstart/.bazelrc b/google/cloud/storagetransfer/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/storagetransfer/quickstart/.bazelrc +++ b/google/cloud/storagetransfer/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.cc index d597f1587909f..d53e7a05a23a7 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/storagetransfer/v1/transfer.proto #include "google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.h" -#include +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.h index d6535c655ac91..15e8b2581a9b9 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_connection_impl.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_connection_impl.h index 914c3f3771f09..f052b8b13ccc6 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_connection_impl.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.cc index 99e198e759bcc..de749e3afae04 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.h index 1b4621d32c0c2..2c1bad3b65876 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.cc index be30ce8d9c5f9..a3ec638886ac0 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.h index ba81033ee6565..a698a5ebdce1d 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc index 3b6d2bef540ce..126e0af5cc6fc 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc @@ -19,8 +19,8 @@ #include "google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h index f7a283590b6af..ebb06dfadad41 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h @@ -24,8 +24,8 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc index 020c9993b656c..21757fb9d3757 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc @@ -28,8 +28,8 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include #include diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc index c8ce2fb649203..841c021f005e6 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace storagetransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageTransferServiceTracingConnection:: StorageTransferServiceTracingConnection( std::shared_ptr @@ -217,18 +215,14 @@ Status StorageTransferServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageTransferServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.h index 068ec7892dcf3..5db8d91dda768 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace storagetransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageTransferServiceTracingConnection : public storagetransfer_v1::StorageTransferServiceConnection { public: @@ -116,8 +114,6 @@ class StorageTransferServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc index 7b9b79cda40eb..f850385910ec0 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace storagetransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - StorageTransferServiceTracingStub::StorageTransferServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -282,16 +280,10 @@ future StorageTransferServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeStorageTransferServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.h index e46afb82b3bde..53ce0762842ca 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace storagetransfer_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class StorageTransferServiceTracingStub : public StorageTransferServiceStub { public: ~StorageTransferServiceTracingStub() override = default; @@ -146,8 +144,6 @@ class StorageTransferServiceTracingStub : public StorageTransferServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/storagetransfer/v1/storage_transfer_client.h b/google/cloud/storagetransfer/v1/storage_transfer_client.h index a257d9cd2131d..6a24cdc15d670 100644 --- a/google/cloud/storagetransfer/v1/storage_transfer_client.h +++ b/google/cloud/storagetransfer/v1/storage_transfer_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/storagetransfer/v1/storage_transfer_connection.h b/google/cloud/storagetransfer/v1/storage_transfer_connection.h index a4fdbef45873b..92b125959eb82 100644 --- a/google/cloud/storagetransfer/v1/storage_transfer_connection.h +++ b/google/cloud/storagetransfer/v1/storage_transfer_connection.h @@ -30,8 +30,8 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storagetransfer/v1/transfer.pb.h" #include namespace google { diff --git a/google/cloud/storagetransfer/v1/storage_transfer_connection_idempotency_policy.h b/google/cloud/storagetransfer/v1/storage_transfer_connection_idempotency_policy.h index 82ae504adfb24..8f9ee0fd3e0ad 100644 --- a/google/cloud/storagetransfer/v1/storage_transfer_connection_idempotency_policy.h +++ b/google/cloud/storagetransfer/v1/storage_transfer_connection_idempotency_policy.h @@ -21,8 +21,8 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" +#include "google/storagetransfer/v1/transfer.grpc.pb.h" #include namespace google { diff --git a/google/cloud/stream_range_test.cc b/google/cloud/stream_range_test.cc index 885688127a18c..bced62056bc11 100644 --- a/google/cloud/stream_range_test.cc +++ b/google/cloud/stream_range_test.cc @@ -273,8 +273,6 @@ TEST(StreamRange, ReaderDestructorOptionsSpan) { // happen with `CurrentOptions()` matching those at `StreamRange` ctor time. } -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - using ::google::cloud::testing_util::IsActive; class FakeReader { @@ -318,8 +316,6 @@ TEST(StreamRange, CallSpanActiveThroughout) { // the active span matching that at `StreamRange` ctor time. } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud diff --git a/google/cloud/support/BUILD.bazel b/google/cloud/support/BUILD.bazel index a6eadc8d21f07..7d9ea7e37fde7 100644 --- a/google/cloud/support/BUILD.bazel +++ b/google/cloud/support/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v2/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/support/v2:support_cc_grpc", + "@googleapis//google/cloud/support/v2:support_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/support/quickstart/.bazelrc b/google/cloud/support/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/support/quickstart/.bazelrc +++ b/google/cloud/support/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/support/v2/case_attachment_connection.h b/google/cloud/support/v2/case_attachment_connection.h index cbb912a173e51..eaac02afff88c 100644 --- a/google/cloud/support/v2/case_attachment_connection.h +++ b/google/cloud/support/v2/case_attachment_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_ATTACHMENT_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_ATTACHMENT_CONNECTION_H +#include "google/cloud/support/v2/attachment_service.pb.h" #include "google/cloud/support/v2/case_attachment_connection_idempotency_policy.h" #include "google/cloud/support/v2/internal/case_attachment_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/support/v2/case_attachment_connection_idempotency_policy.h b/google/cloud/support/v2/case_attachment_connection_idempotency_policy.h index 6c40b027ab08d..0309d9c1264ee 100644 --- a/google/cloud/support/v2/case_attachment_connection_idempotency_policy.h +++ b/google/cloud/support/v2/case_attachment_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_ATTACHMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_ATTACHMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/support/v2/attachment_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/support/v2/case_connection.h b/google/cloud/support/v2/case_connection.h index d3f8a93246066..8e2530c72bbbf 100644 --- a/google/cloud/support/v2/case_connection.h +++ b/google/cloud/support/v2/case_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_CONNECTION_H #include "google/cloud/support/v2/case_connection_idempotency_policy.h" +#include "google/cloud/support/v2/case_service.pb.h" #include "google/cloud/support/v2/internal/case_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/support/v2/case_connection_idempotency_policy.h b/google/cloud/support/v2/case_connection_idempotency_policy.h index 09b2d72707695..6b92765e2ed51 100644 --- a/google/cloud/support/v2/case_connection_idempotency_policy.h +++ b/google/cloud/support/v2/case_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_CASE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/support/v2/case_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/support/v2/comment_connection.h b/google/cloud/support/v2/comment_connection.h index 05673b43ea1aa..48baea34fa581 100644 --- a/google/cloud/support/v2/comment_connection.h +++ b/google/cloud/support/v2/comment_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_COMMENT_CONNECTION_H #include "google/cloud/support/v2/comment_connection_idempotency_policy.h" +#include "google/cloud/support/v2/comment_service.pb.h" #include "google/cloud/support/v2/internal/comment_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/support/v2/comment_connection_idempotency_policy.h b/google/cloud/support/v2/comment_connection_idempotency_policy.h index 45ded57020ca4..c0f89cd65255d 100644 --- a/google/cloud/support/v2/comment_connection_idempotency_policy.h +++ b/google/cloud/support/v2/comment_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_COMMENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_COMMENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/support/v2/comment_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/support/v2/internal/case_attachment_auth_decorator.cc b/google/cloud/support/v2/internal/case_attachment_auth_decorator.cc index 2a5e94ef97ec4..48dd3d2074a1a 100644 --- a/google/cloud/support/v2/internal/case_attachment_auth_decorator.cc +++ b/google/cloud/support/v2/internal/case_attachment_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/support/v2/attachment_service.proto #include "google/cloud/support/v2/internal/case_attachment_auth_decorator.h" -#include +#include "google/cloud/support/v2/attachment_service.grpc.pb.h" #include #include diff --git a/google/cloud/support/v2/internal/case_attachment_logging_decorator.cc b/google/cloud/support/v2/internal/case_attachment_logging_decorator.cc index 91c0e4e4fae7c..438e6e81a3aca 100644 --- a/google/cloud/support/v2/internal/case_attachment_logging_decorator.cc +++ b/google/cloud/support/v2/internal/case_attachment_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/support/v2/attachment_service.proto #include "google/cloud/support/v2/internal/case_attachment_logging_decorator.h" +#include "google/cloud/support/v2/attachment_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/support/v2/internal/case_attachment_metadata_decorator.cc b/google/cloud/support/v2/internal/case_attachment_metadata_decorator.cc index c280791deef12..2030969bc1295 100644 --- a/google/cloud/support/v2/internal/case_attachment_metadata_decorator.cc +++ b/google/cloud/support/v2/internal/case_attachment_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/support/v2/attachment_service.proto #include "google/cloud/support/v2/internal/case_attachment_metadata_decorator.h" +#include "google/cloud/support/v2/attachment_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 #include #include #include diff --git a/google/cloud/support/v2/internal/case_attachment_stub.cc b/google/cloud/support/v2/internal/case_attachment_stub.cc index a8403b967ebdd..bd2294d804926 100644 --- a/google/cloud/support/v2/internal/case_attachment_stub.cc +++ b/google/cloud/support/v2/internal/case_attachment_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/support/v2/attachment_service.proto #include "google/cloud/support/v2/internal/case_attachment_stub.h" +#include "google/cloud/support/v2/attachment_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/case_attachment_stub.h b/google/cloud/support/v2/internal/case_attachment_stub.h index e29d42baf1e84..43db5c4e056fe 100644 --- a/google/cloud/support/v2/internal/case_attachment_stub.h +++ b/google/cloud/support/v2/internal/case_attachment_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_INTERNAL_CASE_ATTACHMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_INTERNAL_CASE_ATTACHMENT_STUB_H +#include "google/cloud/support/v2/attachment_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/case_attachment_stub_factory.cc b/google/cloud/support/v2/internal/case_attachment_stub_factory.cc index f0a2d54f27fd4..2f2900e70e39e 100644 --- a/google/cloud/support/v2/internal/case_attachment_stub_factory.cc +++ b/google/cloud/support/v2/internal/case_attachment_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/support/v2/attachment_service.proto #include "google/cloud/support/v2/internal/case_attachment_stub_factory.h" +#include "google/cloud/support/v2/attachment_service.grpc.pb.h" #include "google/cloud/support/v2/internal/case_attachment_auth_decorator.h" #include "google/cloud/support/v2/internal/case_attachment_logging_decorator.h" #include "google/cloud/support/v2/internal/case_attachment_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc b/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc index c8daa9be34cd4..a26373915f20e 100644 --- a/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc +++ b/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CaseAttachmentServiceTracingConnection::CaseAttachmentServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -44,17 +42,13 @@ CaseAttachmentServiceTracingConnection::ListAttachments( google::cloud::support::v2::Attachment>(std::move(span), std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCaseAttachmentServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/support/v2/internal/case_attachment_tracing_connection.h b/google/cloud/support/v2/internal/case_attachment_tracing_connection.h index ec5c5389a770d..ac4a31b526106 100644 --- a/google/cloud/support/v2/internal/case_attachment_tracing_connection.h +++ b/google/cloud/support/v2/internal/case_attachment_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CaseAttachmentServiceTracingConnection : public support_v2::CaseAttachmentServiceConnection { public: @@ -47,8 +45,6 @@ class CaseAttachmentServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/support/v2/internal/case_attachment_tracing_stub.cc b/google/cloud/support/v2/internal/case_attachment_tracing_stub.cc index a5786c601f26f..0831ed20da0ea 100644 --- a/google/cloud/support/v2/internal/case_attachment_tracing_stub.cc +++ b/google/cloud/support/v2/internal/case_attachment_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CaseAttachmentServiceTracingStub::CaseAttachmentServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -44,15 +42,9 @@ CaseAttachmentServiceTracingStub::ListAttachments( child_->ListAttachments(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCaseAttachmentServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/support/v2/internal/case_attachment_tracing_stub.h b/google/cloud/support/v2/internal/case_attachment_tracing_stub.h index 086799d21108d..d12388b1a673e 100644 --- a/google/cloud/support/v2/internal/case_attachment_tracing_stub.h +++ b/google/cloud/support/v2/internal/case_attachment_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CaseAttachmentServiceTracingStub : public CaseAttachmentServiceStub { public: ~CaseAttachmentServiceTracingStub() override = default; @@ -50,8 +48,6 @@ class CaseAttachmentServiceTracingStub : public CaseAttachmentServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/support/v2/internal/case_auth_decorator.cc b/google/cloud/support/v2/internal/case_auth_decorator.cc index dfb54754f52d2..c5f0360fa028b 100644 --- a/google/cloud/support/v2/internal/case_auth_decorator.cc +++ b/google/cloud/support/v2/internal/case_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/support/v2/case_service.proto #include "google/cloud/support/v2/internal/case_auth_decorator.h" -#include +#include "google/cloud/support/v2/case_service.grpc.pb.h" #include #include diff --git a/google/cloud/support/v2/internal/case_logging_decorator.cc b/google/cloud/support/v2/internal/case_logging_decorator.cc index a051362d61428..6aac27bd4b3e0 100644 --- a/google/cloud/support/v2/internal/case_logging_decorator.cc +++ b/google/cloud/support/v2/internal/case_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/support/v2/case_service.proto #include "google/cloud/support/v2/internal/case_logging_decorator.h" +#include "google/cloud/support/v2/case_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/support/v2/internal/case_metadata_decorator.cc b/google/cloud/support/v2/internal/case_metadata_decorator.cc index a268251575c02..608656bcdf848 100644 --- a/google/cloud/support/v2/internal/case_metadata_decorator.cc +++ b/google/cloud/support/v2/internal/case_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/support/v2/case_service.proto #include "google/cloud/support/v2/internal/case_metadata_decorator.h" +#include "google/cloud/support/v2/case_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 #include #include #include diff --git a/google/cloud/support/v2/internal/case_stub.cc b/google/cloud/support/v2/internal/case_stub.cc index e7745b6c8d65b..9f46fede1a736 100644 --- a/google/cloud/support/v2/internal/case_stub.cc +++ b/google/cloud/support/v2/internal/case_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/support/v2/case_service.proto #include "google/cloud/support/v2/internal/case_stub.h" +#include "google/cloud/support/v2/case_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/case_stub.h b/google/cloud/support/v2/internal/case_stub.h index 06e234e7c3acf..cfed672477be3 100644 --- a/google/cloud/support/v2/internal/case_stub.h +++ b/google/cloud/support/v2/internal/case_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_INTERNAL_CASE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_INTERNAL_CASE_STUB_H +#include "google/cloud/support/v2/case_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/case_stub_factory.cc b/google/cloud/support/v2/internal/case_stub_factory.cc index e76395456dab8..8228bb5c0980f 100644 --- a/google/cloud/support/v2/internal/case_stub_factory.cc +++ b/google/cloud/support/v2/internal/case_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/support/v2/case_service.proto #include "google/cloud/support/v2/internal/case_stub_factory.h" +#include "google/cloud/support/v2/case_service.grpc.pb.h" #include "google/cloud/support/v2/internal/case_auth_decorator.h" #include "google/cloud/support/v2/internal/case_logging_decorator.h" #include "google/cloud/support/v2/internal/case_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/case_tracing_connection.cc b/google/cloud/support/v2/internal/case_tracing_connection.cc index 3ed90fe3b1948..f0b12682c5834 100644 --- a/google/cloud/support/v2/internal/case_tracing_connection.cc +++ b/google/cloud/support/v2/internal/case_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CaseServiceTracingConnection::CaseServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -111,16 +109,12 @@ CaseServiceTracingConnection::SearchCaseClassifications( std::move(sr)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCaseServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/support/v2/internal/case_tracing_connection.h b/google/cloud/support/v2/internal/case_tracing_connection.h index c641c5376a092..37f7056bfee2e 100644 --- a/google/cloud/support/v2/internal/case_tracing_connection.h +++ b/google/cloud/support/v2/internal/case_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CaseServiceTracingConnection : public support_v2::CaseServiceConnection { public: ~CaseServiceTracingConnection() override = default; @@ -69,8 +67,6 @@ class CaseServiceTracingConnection : public support_v2::CaseServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/support/v2/internal/case_tracing_stub.cc b/google/cloud/support/v2/internal/case_tracing_stub.cc index 5663cc757eeea..47c283249d5ad 100644 --- a/google/cloud/support/v2/internal/case_tracing_stub.cc +++ b/google/cloud/support/v2/internal/case_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CaseServiceTracingStub::CaseServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -125,15 +123,9 @@ CaseServiceTracingStub::SearchCaseClassifications( child_->SearchCaseClassifications(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCaseServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/support/v2/internal/case_tracing_stub.h b/google/cloud/support/v2/internal/case_tracing_stub.h index 53099ff0c259b..2f5cb4328d3bd 100644 --- a/google/cloud/support/v2/internal/case_tracing_stub.h +++ b/google/cloud/support/v2/internal/case_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CaseServiceTracingStub : public CaseServiceStub { public: ~CaseServiceTracingStub() override = default; @@ -78,8 +76,6 @@ class CaseServiceTracingStub : public CaseServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/support/v2/internal/comment_auth_decorator.cc b/google/cloud/support/v2/internal/comment_auth_decorator.cc index 8ae5509ec8cb2..9f083d00300dc 100644 --- a/google/cloud/support/v2/internal/comment_auth_decorator.cc +++ b/google/cloud/support/v2/internal/comment_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/support/v2/comment_service.proto #include "google/cloud/support/v2/internal/comment_auth_decorator.h" -#include +#include "google/cloud/support/v2/comment_service.grpc.pb.h" #include #include diff --git a/google/cloud/support/v2/internal/comment_logging_decorator.cc b/google/cloud/support/v2/internal/comment_logging_decorator.cc index 57b7ac066ba6e..bcf5e3c55616a 100644 --- a/google/cloud/support/v2/internal/comment_logging_decorator.cc +++ b/google/cloud/support/v2/internal/comment_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/support/v2/comment_service.proto #include "google/cloud/support/v2/internal/comment_logging_decorator.h" +#include "google/cloud/support/v2/comment_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/support/v2/internal/comment_metadata_decorator.cc b/google/cloud/support/v2/internal/comment_metadata_decorator.cc index 9cee31eb86362..1116358b1cd53 100644 --- a/google/cloud/support/v2/internal/comment_metadata_decorator.cc +++ b/google/cloud/support/v2/internal/comment_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/support/v2/comment_service.proto #include "google/cloud/support/v2/internal/comment_metadata_decorator.h" +#include "google/cloud/support/v2/comment_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 #include #include #include diff --git a/google/cloud/support/v2/internal/comment_stub.cc b/google/cloud/support/v2/internal/comment_stub.cc index c77ef6c4b7a14..94fa85f09d238 100644 --- a/google/cloud/support/v2/internal/comment_stub.cc +++ b/google/cloud/support/v2/internal/comment_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/support/v2/comment_service.proto #include "google/cloud/support/v2/internal/comment_stub.h" +#include "google/cloud/support/v2/comment_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/comment_stub.h b/google/cloud/support/v2/internal/comment_stub.h index 74944963c8c20..040e4188cf8b0 100644 --- a/google/cloud/support/v2/internal/comment_stub.h +++ b/google/cloud/support/v2/internal/comment_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_INTERNAL_COMMENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SUPPORT_V2_INTERNAL_COMMENT_STUB_H +#include "google/cloud/support/v2/comment_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/comment_stub_factory.cc b/google/cloud/support/v2/internal/comment_stub_factory.cc index 75e3245d8e938..de7fe8f44a6fc 100644 --- a/google/cloud/support/v2/internal/comment_stub_factory.cc +++ b/google/cloud/support/v2/internal/comment_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/support/v2/comment_service.proto #include "google/cloud/support/v2/internal/comment_stub_factory.h" +#include "google/cloud/support/v2/comment_service.grpc.pb.h" #include "google/cloud/support/v2/internal/comment_auth_decorator.h" #include "google/cloud/support/v2/internal/comment_logging_decorator.h" #include "google/cloud/support/v2/internal/comment_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/support/v2/internal/comment_tracing_connection.cc b/google/cloud/support/v2/internal/comment_tracing_connection.cc index 4c84fc8734fae..573b55c56fe4e 100644 --- a/google/cloud/support/v2/internal/comment_tracing_connection.cc +++ b/google/cloud/support/v2/internal/comment_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CommentServiceTracingConnection::CommentServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -53,16 +51,12 @@ CommentServiceTracingConnection::CreateComment( return internal::EndSpan(*span, child_->CreateComment(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCommentServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/support/v2/internal/comment_tracing_connection.h b/google/cloud/support/v2/internal/comment_tracing_connection.h index ad13c56aee711..90ac323493bc6 100644 --- a/google/cloud/support/v2/internal/comment_tracing_connection.h +++ b/google/cloud/support/v2/internal/comment_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CommentServiceTracingConnection : public support_v2::CommentServiceConnection { public: @@ -50,8 +48,6 @@ class CommentServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/support/v2/internal/comment_tracing_stub.cc b/google/cloud/support/v2/internal/comment_tracing_stub.cc index 21200130f5bf9..12120b300751e 100644 --- a/google/cloud/support/v2/internal/comment_tracing_stub.cc +++ b/google/cloud/support/v2/internal/comment_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CommentServiceTracingStub::CommentServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -56,15 +54,9 @@ CommentServiceTracingStub::CreateComment( child_->CreateComment(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCommentServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/support/v2/internal/comment_tracing_stub.h b/google/cloud/support/v2/internal/comment_tracing_stub.h index 7aa0806799502..497ef7cfe73fe 100644 --- a/google/cloud/support/v2/internal/comment_tracing_stub.h +++ b/google/cloud/support/v2/internal/comment_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace support_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CommentServiceTracingStub : public CommentServiceStub { public: ~CommentServiceTracingStub() override = default; @@ -52,8 +50,6 @@ class CommentServiceTracingStub : public CommentServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/talent/BUILD.bazel b/google/cloud/talent/BUILD.bazel index 926814bd78583..77b2f6a35f81f 100644 --- a/google/cloud/talent/BUILD.bazel +++ b/google/cloud/talent/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/talent/v4:talent_cc_grpc", + "@googleapis//google/cloud/talent/v4:talent_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/talent/quickstart/.bazelrc b/google/cloud/talent/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/talent/quickstart/.bazelrc +++ b/google/cloud/talent/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/talent/v4/company_connection.h b/google/cloud/talent/v4/company_connection.h index 326e5a5b31bba..dcdd5f9637d6e 100644 --- a/google/cloud/talent/v4/company_connection.h +++ b/google/cloud/talent/v4/company_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_COMPANY_CONNECTION_H #include "google/cloud/talent/v4/company_connection_idempotency_policy.h" +#include "google/cloud/talent/v4/company_service.pb.h" #include "google/cloud/talent/v4/internal/company_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/talent/v4/company_connection_idempotency_policy.h b/google/cloud/talent/v4/company_connection_idempotency_policy.h index 3217d473b0618..3aea3bf5532dc 100644 --- a/google/cloud/talent/v4/company_connection_idempotency_policy.h +++ b/google/cloud/talent/v4/company_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_COMPANY_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_COMPANY_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/talent/v4/company_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/talent/v4/completion_connection.h b/google/cloud/talent/v4/completion_connection.h index 0bf758dbf936d..a3ed7eee34890 100644 --- a/google/cloud/talent/v4/completion_connection.h +++ b/google/cloud/talent/v4/completion_connection.h @@ -20,13 +20,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_COMPLETION_CONNECTION_H #include "google/cloud/talent/v4/completion_connection_idempotency_policy.h" +#include "google/cloud/talent/v4/completion_service.pb.h" #include "google/cloud/talent/v4/internal/completion_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/talent/v4/completion_connection_idempotency_policy.h b/google/cloud/talent/v4/completion_connection_idempotency_policy.h index e5b5e9ffe0054..fcd45741957e2 100644 --- a/google/cloud/talent/v4/completion_connection_idempotency_policy.h +++ b/google/cloud/talent/v4/completion_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/talent/v4/completion_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/talent/v4/event_connection.h b/google/cloud/talent/v4/event_connection.h index 934da4f37ca64..5ef06242f6fe0 100644 --- a/google/cloud/talent/v4/event_connection.h +++ b/google/cloud/talent/v4/event_connection.h @@ -20,13 +20,13 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_EVENT_CONNECTION_H #include "google/cloud/talent/v4/event_connection_idempotency_policy.h" +#include "google/cloud/talent/v4/event_service.pb.h" #include "google/cloud/talent/v4/internal/event_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/talent/v4/event_connection_idempotency_policy.h b/google/cloud/talent/v4/event_connection_idempotency_policy.h index 72e1210d03591..dd33fc78967a9 100644 --- a/google/cloud/talent/v4/event_connection_idempotency_policy.h +++ b/google/cloud/talent/v4/event_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/talent/v4/event_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/talent/v4/internal/company_auth_decorator.cc b/google/cloud/talent/v4/internal/company_auth_decorator.cc index d69fb0b517c63..2e7e0c2660703 100644 --- a/google/cloud/talent/v4/internal/company_auth_decorator.cc +++ b/google/cloud/talent/v4/internal/company_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/talent/v4/company_service.proto #include "google/cloud/talent/v4/internal/company_auth_decorator.h" -#include +#include "google/cloud/talent/v4/company_service.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/company_logging_decorator.cc b/google/cloud/talent/v4/internal/company_logging_decorator.cc index ad8e0c83a1854..1ddd019c1004b 100644 --- a/google/cloud/talent/v4/internal/company_logging_decorator.cc +++ b/google/cloud/talent/v4/internal/company_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/company_service.proto #include "google/cloud/talent/v4/internal/company_logging_decorator.h" +#include "google/cloud/talent/v4/company_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/talent/v4/internal/company_metadata_decorator.cc b/google/cloud/talent/v4/internal/company_metadata_decorator.cc index 16e73d3e9e241..cecd4a47a941d 100644 --- a/google/cloud/talent/v4/internal/company_metadata_decorator.cc +++ b/google/cloud/talent/v4/internal/company_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/talent/v4/company_service.proto #include "google/cloud/talent/v4/internal/company_metadata_decorator.h" +#include "google/cloud/talent/v4/company_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 #include #include #include diff --git a/google/cloud/talent/v4/internal/company_stub.cc b/google/cloud/talent/v4/internal/company_stub.cc index 6554d558b48ea..839264380b857 100644 --- a/google/cloud/talent/v4/internal/company_stub.cc +++ b/google/cloud/talent/v4/internal/company_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/company_service.proto #include "google/cloud/talent/v4/internal/company_stub.h" +#include "google/cloud/talent/v4/company_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/talent/v4/internal/company_stub.h b/google/cloud/talent/v4/internal/company_stub.h index 4b8f909978a87..999db89dfd4d1 100644 --- a/google/cloud/talent/v4/internal/company_stub.h +++ b/google/cloud/talent/v4/internal/company_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_COMPANY_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_COMPANY_STUB_H +#include "google/cloud/talent/v4/company_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/company_stub_factory.cc b/google/cloud/talent/v4/internal/company_stub_factory.cc index e68f2c8d0d6dd..b42a56fac728d 100644 --- a/google/cloud/talent/v4/internal/company_stub_factory.cc +++ b/google/cloud/talent/v4/internal/company_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/talent/v4/company_service.proto #include "google/cloud/talent/v4/internal/company_stub_factory.h" +#include "google/cloud/talent/v4/company_service.grpc.pb.h" #include "google/cloud/talent/v4/internal/company_auth_decorator.h" #include "google/cloud/talent/v4/internal/company_logging_decorator.h" #include "google/cloud/talent/v4/internal/company_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/company_tracing_connection.cc b/google/cloud/talent/v4/internal/company_tracing_connection.cc index 7e1906e83ec85..75a5ce7cb5510 100644 --- a/google/cloud/talent/v4/internal/company_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/company_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompanyServiceTracingConnection::CompanyServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -88,16 +86,12 @@ CompanyServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompanyServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/talent/v4/internal/company_tracing_connection.h b/google/cloud/talent/v4/internal/company_tracing_connection.h index 63f3776f02ae3..de6c1f39a8aac 100644 --- a/google/cloud/talent/v4/internal/company_tracing_connection.h +++ b/google/cloud/talent/v4/internal/company_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompanyServiceTracingConnection : public talent_v4::CompanyServiceConnection { public: @@ -62,8 +60,6 @@ class CompanyServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/talent/v4/internal/company_tracing_stub.cc b/google/cloud/talent/v4/internal/company_tracing_stub.cc index c45671a015d1f..fb7103e7e2939 100644 --- a/google/cloud/talent/v4/internal/company_tracing_stub.cc +++ b/google/cloud/talent/v4/internal/company_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompanyServiceTracingStub::CompanyServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -103,15 +101,9 @@ CompanyServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompanyServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/talent/v4/internal/company_tracing_stub.h b/google/cloud/talent/v4/internal/company_tracing_stub.h index 4c272fcea5e7e..8f3b8c1e38aec 100644 --- a/google/cloud/talent/v4/internal/company_tracing_stub.h +++ b/google/cloud/talent/v4/internal/company_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompanyServiceTracingStub : public CompanyServiceStub { public: ~CompanyServiceTracingStub() override = default; @@ -68,8 +66,6 @@ class CompanyServiceTracingStub : public CompanyServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/talent/v4/internal/completion_auth_decorator.cc b/google/cloud/talent/v4/internal/completion_auth_decorator.cc index b53ab9651272a..b515bd158ac91 100644 --- a/google/cloud/talent/v4/internal/completion_auth_decorator.cc +++ b/google/cloud/talent/v4/internal/completion_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/talent/v4/completion_service.proto #include "google/cloud/talent/v4/internal/completion_auth_decorator.h" -#include +#include "google/cloud/talent/v4/completion_service.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/completion_logging_decorator.cc b/google/cloud/talent/v4/internal/completion_logging_decorator.cc index f9ea46b49d42c..14b70226ba787 100644 --- a/google/cloud/talent/v4/internal/completion_logging_decorator.cc +++ b/google/cloud/talent/v4/internal/completion_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/completion_service.proto #include "google/cloud/talent/v4/internal/completion_logging_decorator.h" +#include "google/cloud/talent/v4/completion_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/talent/v4/internal/completion_metadata_decorator.cc b/google/cloud/talent/v4/internal/completion_metadata_decorator.cc index 901b314f30d73..56606ead3da16 100644 --- a/google/cloud/talent/v4/internal/completion_metadata_decorator.cc +++ b/google/cloud/talent/v4/internal/completion_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/talent/v4/completion_service.proto #include "google/cloud/talent/v4/internal/completion_metadata_decorator.h" +#include "google/cloud/talent/v4/completion_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 #include #include #include diff --git a/google/cloud/talent/v4/internal/completion_stub.cc b/google/cloud/talent/v4/internal/completion_stub.cc index c065b83bec82a..8289d1cb0f0b2 100644 --- a/google/cloud/talent/v4/internal/completion_stub.cc +++ b/google/cloud/talent/v4/internal/completion_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/completion_service.proto #include "google/cloud/talent/v4/internal/completion_stub.h" +#include "google/cloud/talent/v4/completion_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/talent/v4/internal/completion_stub.h b/google/cloud/talent/v4/internal/completion_stub.h index 518fecf31f2c0..a9a35985dfc2e 100644 --- a/google/cloud/talent/v4/internal/completion_stub.h +++ b/google/cloud/talent/v4/internal/completion_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_COMPLETION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_COMPLETION_STUB_H +#include "google/cloud/talent/v4/completion_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/completion_stub_factory.cc b/google/cloud/talent/v4/internal/completion_stub_factory.cc index 828dce1b79fc3..0864d024e8446 100644 --- a/google/cloud/talent/v4/internal/completion_stub_factory.cc +++ b/google/cloud/talent/v4/internal/completion_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/talent/v4/completion_service.proto #include "google/cloud/talent/v4/internal/completion_stub_factory.h" +#include "google/cloud/talent/v4/completion_service.grpc.pb.h" #include "google/cloud/talent/v4/internal/completion_auth_decorator.h" #include "google/cloud/talent/v4/internal/completion_logging_decorator.h" #include "google/cloud/talent/v4/internal/completion_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/completion_tracing_connection.cc b/google/cloud/talent/v4/internal/completion_tracing_connection.cc index 851a30e6d18fa..9718f8bcaee73 100644 --- a/google/cloud/talent/v4/internal/completion_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/completion_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompletionTracingConnection::CompletionTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -50,16 +48,12 @@ CompletionTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompletionTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/talent/v4/internal/completion_tracing_connection.h b/google/cloud/talent/v4/internal/completion_tracing_connection.h index 9aeca23c96644..c46d2c1632a39 100644 --- a/google/cloud/talent/v4/internal/completion_tracing_connection.h +++ b/google/cloud/talent/v4/internal/completion_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompletionTracingConnection : public talent_v4::CompletionConnection { public: ~CompletionTracingConnection() override = default; @@ -49,8 +47,6 @@ class CompletionTracingConnection : public talent_v4::CompletionConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/talent/v4/internal/completion_tracing_stub.cc b/google/cloud/talent/v4/internal/completion_tracing_stub.cc index c642881a0e2d2..76122e8ec6b38 100644 --- a/google/cloud/talent/v4/internal/completion_tracing_stub.cc +++ b/google/cloud/talent/v4/internal/completion_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CompletionTracingStub::CompletionTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -55,15 +53,9 @@ StatusOr CompletionTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCompletionTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/talent/v4/internal/completion_tracing_stub.h b/google/cloud/talent/v4/internal/completion_tracing_stub.h index 04d87fde0f925..c902370b88433 100644 --- a/google/cloud/talent/v4/internal/completion_tracing_stub.h +++ b/google/cloud/talent/v4/internal/completion_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CompletionTracingStub : public CompletionStub { public: ~CompletionTracingStub() override = default; @@ -52,8 +50,6 @@ class CompletionTracingStub : public CompletionStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/talent/v4/internal/event_auth_decorator.cc b/google/cloud/talent/v4/internal/event_auth_decorator.cc index 43c16287f515f..d4e2cbd102e36 100644 --- a/google/cloud/talent/v4/internal/event_auth_decorator.cc +++ b/google/cloud/talent/v4/internal/event_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/talent/v4/event_service.proto #include "google/cloud/talent/v4/internal/event_auth_decorator.h" -#include +#include "google/cloud/talent/v4/event_service.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/event_logging_decorator.cc b/google/cloud/talent/v4/internal/event_logging_decorator.cc index e0b06943bd7bb..a9aa86ff8040d 100644 --- a/google/cloud/talent/v4/internal/event_logging_decorator.cc +++ b/google/cloud/talent/v4/internal/event_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/event_service.proto #include "google/cloud/talent/v4/internal/event_logging_decorator.h" +#include "google/cloud/talent/v4/event_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/talent/v4/internal/event_metadata_decorator.cc b/google/cloud/talent/v4/internal/event_metadata_decorator.cc index 9aad598193003..006d4505b1cb6 100644 --- a/google/cloud/talent/v4/internal/event_metadata_decorator.cc +++ b/google/cloud/talent/v4/internal/event_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/talent/v4/event_service.proto #include "google/cloud/talent/v4/internal/event_metadata_decorator.h" +#include "google/cloud/talent/v4/event_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 #include #include #include diff --git a/google/cloud/talent/v4/internal/event_stub.cc b/google/cloud/talent/v4/internal/event_stub.cc index 43954946e5ecc..c6648c7075f0b 100644 --- a/google/cloud/talent/v4/internal/event_stub.cc +++ b/google/cloud/talent/v4/internal/event_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/event_service.proto #include "google/cloud/talent/v4/internal/event_stub.h" +#include "google/cloud/talent/v4/event_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/talent/v4/internal/event_stub.h b/google/cloud/talent/v4/internal/event_stub.h index 7ca65480661f9..8fda8beeafe27 100644 --- a/google/cloud/talent/v4/internal/event_stub.h +++ b/google/cloud/talent/v4/internal/event_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_EVENT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_EVENT_STUB_H +#include "google/cloud/talent/v4/event_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/event_stub_factory.cc b/google/cloud/talent/v4/internal/event_stub_factory.cc index a20eeedb68e17..e06eb2c907f6e 100644 --- a/google/cloud/talent/v4/internal/event_stub_factory.cc +++ b/google/cloud/talent/v4/internal/event_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/talent/v4/event_service.proto #include "google/cloud/talent/v4/internal/event_stub_factory.h" +#include "google/cloud/talent/v4/event_service.grpc.pb.h" #include "google/cloud/talent/v4/internal/event_auth_decorator.h" #include "google/cloud/talent/v4/internal/event_logging_decorator.h" #include "google/cloud/talent/v4/internal/event_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/event_tracing_connection.cc b/google/cloud/talent/v4/internal/event_tracing_connection.cc index 864acea8d2c4c..3e8cae600e80d 100644 --- a/google/cloud/talent/v4/internal/event_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/event_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EventServiceTracingConnection::EventServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -50,16 +48,12 @@ EventServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEventServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/talent/v4/internal/event_tracing_connection.h b/google/cloud/talent/v4/internal/event_tracing_connection.h index 2f3f420b83c0c..17a20fea81fc9 100644 --- a/google/cloud/talent/v4/internal/event_tracing_connection.h +++ b/google/cloud/talent/v4/internal/event_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EventServiceTracingConnection : public talent_v4::EventServiceConnection { public: ~EventServiceTracingConnection() override = default; @@ -50,8 +48,6 @@ class EventServiceTracingConnection : public talent_v4::EventServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/talent/v4/internal/event_tracing_stub.cc b/google/cloud/talent/v4/internal/event_tracing_stub.cc index 6a15ffdb2b88f..ce534958e0908 100644 --- a/google/cloud/talent/v4/internal/event_tracing_stub.cc +++ b/google/cloud/talent/v4/internal/event_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - EventServiceTracingStub::EventServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -55,15 +53,9 @@ StatusOr EventServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeEventServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/talent/v4/internal/event_tracing_stub.h b/google/cloud/talent/v4/internal/event_tracing_stub.h index 5acbdf9c69bb5..eb403480c0b39 100644 --- a/google/cloud/talent/v4/internal/event_tracing_stub.h +++ b/google/cloud/talent/v4/internal/event_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class EventServiceTracingStub : public EventServiceStub { public: ~EventServiceTracingStub() override = default; @@ -53,8 +51,6 @@ class EventServiceTracingStub : public EventServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/talent/v4/internal/job_auth_decorator.cc b/google/cloud/talent/v4/internal/job_auth_decorator.cc index fc45e1a6cebb3..bcfaaee317561 100644 --- a/google/cloud/talent/v4/internal/job_auth_decorator.cc +++ b/google/cloud/talent/v4/internal/job_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/talent/v4/job_service.proto #include "google/cloud/talent/v4/internal/job_auth_decorator.h" -#include +#include "google/cloud/talent/v4/job_service.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/job_auth_decorator.h b/google/cloud/talent/v4/internal/job_auth_decorator.h index e8286beaea661..ff43cdd4f2569 100644 --- a/google/cloud/talent/v4/internal/job_auth_decorator.h +++ b/google/cloud/talent/v4/internal/job_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/talent/v4/internal/job_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/talent/v4/internal/job_connection_impl.h b/google/cloud/talent/v4/internal/job_connection_impl.h index 55de5cf56ee85..ead1f4cb82fe8 100644 --- a/google/cloud/talent/v4/internal/job_connection_impl.h +++ b/google/cloud/talent/v4/internal/job_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/talent/v4/internal/job_logging_decorator.cc b/google/cloud/talent/v4/internal/job_logging_decorator.cc index 8e2579ac8f998..2ae5ece696bf5 100644 --- a/google/cloud/talent/v4/internal/job_logging_decorator.cc +++ b/google/cloud/talent/v4/internal/job_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/job_service.proto #include "google/cloud/talent/v4/internal/job_logging_decorator.h" +#include "google/cloud/talent/v4/job_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/talent/v4/internal/job_logging_decorator.h b/google/cloud/talent/v4/internal/job_logging_decorator.h index 0094ef4c5f488..ebd25b2f5f189 100644 --- a/google/cloud/talent/v4/internal/job_logging_decorator.h +++ b/google/cloud/talent/v4/internal/job_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/talent/v4/internal/job_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/talent/v4/internal/job_metadata_decorator.cc b/google/cloud/talent/v4/internal/job_metadata_decorator.cc index 54f9f5a2a8a63..68f9830cfdfaf 100644 --- a/google/cloud/talent/v4/internal/job_metadata_decorator.cc +++ b/google/cloud/talent/v4/internal/job_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/talent/v4/job_service.proto #include "google/cloud/talent/v4/internal/job_metadata_decorator.h" +#include "google/cloud/talent/v4/job_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 #include #include #include diff --git a/google/cloud/talent/v4/internal/job_metadata_decorator.h b/google/cloud/talent/v4/internal/job_metadata_decorator.h index 2e39a03d6a0bb..44ff7def21eb6 100644 --- a/google/cloud/talent/v4/internal/job_metadata_decorator.h +++ b/google/cloud/talent/v4/internal/job_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/talent/v4/internal/job_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/talent/v4/internal/job_stub.cc b/google/cloud/talent/v4/internal/job_stub.cc index db2a59614d6d6..da669bbc0a503 100644 --- a/google/cloud/talent/v4/internal/job_stub.cc +++ b/google/cloud/talent/v4/internal/job_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/talent/v4/job_service.proto #include "google/cloud/talent/v4/internal/job_stub.h" +#include "google/cloud/talent/v4/job_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/job_stub.h b/google/cloud/talent/v4/internal/job_stub.h index 9dec0dcff0010..538e84fc47cd3 100644 --- a/google/cloud/talent/v4/internal/job_stub.h +++ b/google/cloud/talent/v4/internal/job_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_JOB_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_JOB_STUB_H +#include "google/cloud/talent/v4/job_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/job_stub_factory.cc b/google/cloud/talent/v4/internal/job_stub_factory.cc index 63820f2e284a9..9249ed8fffc2a 100644 --- a/google/cloud/talent/v4/internal/job_stub_factory.cc +++ b/google/cloud/talent/v4/internal/job_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/talent/v4/internal/job_metadata_decorator.h" #include "google/cloud/talent/v4/internal/job_stub.h" #include "google/cloud/talent/v4/internal/job_tracing_stub.h" +#include "google/cloud/talent/v4/job_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/job_tracing_connection.cc b/google/cloud/talent/v4/internal/job_tracing_connection.cc index aa68e00edf4eb..6125ca1d9b851 100644 --- a/google/cloud/talent/v4/internal/job_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/job_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobServiceTracingConnection::JobServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -184,16 +182,12 @@ JobServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/talent/v4/internal/job_tracing_connection.h b/google/cloud/talent/v4/internal/job_tracing_connection.h index 520394d0137a1..f348ef5c58e91 100644 --- a/google/cloud/talent/v4/internal/job_tracing_connection.h +++ b/google/cloud/talent/v4/internal/job_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobServiceTracingConnection : public talent_v4::JobServiceConnection { public: ~JobServiceTracingConnection() override = default; @@ -103,8 +101,6 @@ class JobServiceTracingConnection : public talent_v4::JobServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/talent/v4/internal/job_tracing_stub.cc b/google/cloud/talent/v4/internal/job_tracing_stub.cc index c9d5cef94253d..fa1a44ebb377a 100644 --- a/google/cloud/talent/v4/internal/job_tracing_stub.cc +++ b/google/cloud/talent/v4/internal/job_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - JobServiceTracingStub::JobServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -229,15 +227,9 @@ future JobServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeJobServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/talent/v4/internal/job_tracing_stub.h b/google/cloud/talent/v4/internal/job_tracing_stub.h index b98605f59fcfc..4a905f9f76d7e 100644 --- a/google/cloud/talent/v4/internal/job_tracing_stub.h +++ b/google/cloud/talent/v4/internal/job_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class JobServiceTracingStub : public JobServiceStub { public: ~JobServiceTracingStub() override = default; @@ -124,8 +122,6 @@ class JobServiceTracingStub : public JobServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/talent/v4/internal/tenant_auth_decorator.cc b/google/cloud/talent/v4/internal/tenant_auth_decorator.cc index f7e85a83ff224..e0e1cfcac9efe 100644 --- a/google/cloud/talent/v4/internal/tenant_auth_decorator.cc +++ b/google/cloud/talent/v4/internal/tenant_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/talent/v4/tenant_service.proto #include "google/cloud/talent/v4/internal/tenant_auth_decorator.h" -#include +#include "google/cloud/talent/v4/tenant_service.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/tenant_logging_decorator.cc b/google/cloud/talent/v4/internal/tenant_logging_decorator.cc index 7113836e2836e..2263b9711522a 100644 --- a/google/cloud/talent/v4/internal/tenant_logging_decorator.cc +++ b/google/cloud/talent/v4/internal/tenant_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/tenant_service.proto #include "google/cloud/talent/v4/internal/tenant_logging_decorator.h" +#include "google/cloud/talent/v4/tenant_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/talent/v4/internal/tenant_metadata_decorator.cc b/google/cloud/talent/v4/internal/tenant_metadata_decorator.cc index 04337cc4922d0..49e904159d771 100644 --- a/google/cloud/talent/v4/internal/tenant_metadata_decorator.cc +++ b/google/cloud/talent/v4/internal/tenant_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/talent/v4/tenant_service.proto #include "google/cloud/talent/v4/internal/tenant_metadata_decorator.h" +#include "google/cloud/talent/v4/tenant_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 #include #include #include diff --git a/google/cloud/talent/v4/internal/tenant_stub.cc b/google/cloud/talent/v4/internal/tenant_stub.cc index bb392ddeaee15..c9705edf04465 100644 --- a/google/cloud/talent/v4/internal/tenant_stub.cc +++ b/google/cloud/talent/v4/internal/tenant_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/talent/v4/tenant_service.proto #include "google/cloud/talent/v4/internal/tenant_stub.h" +#include "google/cloud/talent/v4/tenant_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/talent/v4/internal/tenant_stub.h b/google/cloud/talent/v4/internal/tenant_stub.h index 90c187f796217..524fe469be952 100644 --- a/google/cloud/talent/v4/internal/tenant_stub.h +++ b/google/cloud/talent/v4/internal/tenant_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_TENANT_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_INTERNAL_TENANT_STUB_H +#include "google/cloud/talent/v4/tenant_service.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/tenant_stub_factory.cc b/google/cloud/talent/v4/internal/tenant_stub_factory.cc index 94edb8bcb0ebf..28831b30e3f0f 100644 --- a/google/cloud/talent/v4/internal/tenant_stub_factory.cc +++ b/google/cloud/talent/v4/internal/tenant_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/talent/v4/internal/tenant_metadata_decorator.h" #include "google/cloud/talent/v4/internal/tenant_stub.h" #include "google/cloud/talent/v4/internal/tenant_tracing_stub.h" +#include "google/cloud/talent/v4/tenant_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/talent/v4/internal/tenant_tracing_connection.cc b/google/cloud/talent/v4/internal/tenant_tracing_connection.cc index de0a53aa88e86..cb775e29aa5c1 100644 --- a/google/cloud/talent/v4/internal/tenant_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/tenant_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TenantServiceTracingConnection::TenantServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -88,16 +86,12 @@ TenantServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTenantServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/talent/v4/internal/tenant_tracing_connection.h b/google/cloud/talent/v4/internal/tenant_tracing_connection.h index 4000309233b53..933dc3b122529 100644 --- a/google/cloud/talent/v4/internal/tenant_tracing_connection.h +++ b/google/cloud/talent/v4/internal/tenant_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TenantServiceTracingConnection : public talent_v4::TenantServiceConnection { public: @@ -62,8 +60,6 @@ class TenantServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/talent/v4/internal/tenant_tracing_stub.cc b/google/cloud/talent/v4/internal/tenant_tracing_stub.cc index 45c91e61c5536..c2b63b0f1f8c6 100644 --- a/google/cloud/talent/v4/internal/tenant_tracing_stub.cc +++ b/google/cloud/talent/v4/internal/tenant_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TenantServiceTracingStub::TenantServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -101,15 +99,9 @@ StatusOr TenantServiceTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTenantServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/talent/v4/internal/tenant_tracing_stub.h b/google/cloud/talent/v4/internal/tenant_tracing_stub.h index a70d4cc8f36f1..d785a7bf57f0b 100644 --- a/google/cloud/talent/v4/internal/tenant_tracing_stub.h +++ b/google/cloud/talent/v4/internal/tenant_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace talent_v4_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TenantServiceTracingStub : public TenantServiceStub { public: ~TenantServiceTracingStub() override = default; @@ -68,8 +66,6 @@ class TenantServiceTracingStub : public TenantServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/talent/v4/job_client.h b/google/cloud/talent/v4/job_client.h index 7c1e051fed6f7..a7ec48dd23521 100644 --- a/google/cloud/talent/v4/job_client.h +++ b/google/cloud/talent/v4/job_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/talent/v4/job_connection.h b/google/cloud/talent/v4/job_connection.h index 54ad54d7c1bec..f15daa4ac9175 100644 --- a/google/cloud/talent/v4/job_connection.h +++ b/google/cloud/talent/v4/job_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/talent/v4/internal/job_retry_traits.h" #include "google/cloud/talent/v4/job_connection_idempotency_policy.h" +#include "google/cloud/talent/v4/job_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/talent/v4/job_connection_idempotency_policy.h b/google/cloud/talent/v4/job_connection_idempotency_policy.h index 2498f8ee006f8..c928a31637707 100644 --- a/google/cloud/talent/v4/job_connection_idempotency_policy.h +++ b/google/cloud/talent/v4/job_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_JOB_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_JOB_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/talent/v4/job_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/talent/v4/tenant_connection.h b/google/cloud/talent/v4/tenant_connection.h index 2c9a01c787db5..a6f2e4ba51eda 100644 --- a/google/cloud/talent/v4/tenant_connection.h +++ b/google/cloud/talent/v4/tenant_connection.h @@ -21,13 +21,13 @@ #include "google/cloud/talent/v4/internal/tenant_retry_traits.h" #include "google/cloud/talent/v4/tenant_connection_idempotency_policy.h" +#include "google/cloud/talent/v4/tenant_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/talent/v4/tenant_connection_idempotency_policy.h b/google/cloud/talent/v4/tenant_connection_idempotency_policy.h index 2b319ab3c0a2e..66784a7dc0222 100644 --- a/google/cloud/talent/v4/tenant_connection_idempotency_policy.h +++ b/google/cloud/talent/v4/tenant_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_TENANT_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_V4_TENANT_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/talent/v4/tenant_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/tasks/BUILD.bazel b/google/cloud/tasks/BUILD.bazel index 2d17e94b56491..592637c931833 100644 --- a/google/cloud/tasks/BUILD.bazel +++ b/google/cloud/tasks/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/tasks/v2:tasks_cc_grpc", + "@googleapis//google/cloud/tasks/v2:tasks_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/tasks/quickstart/.bazelrc b/google/cloud/tasks/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/tasks/quickstart/.bazelrc +++ b/google/cloud/tasks/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/tasks/v2/cloud_tasks_connection.h b/google/cloud/tasks/v2/cloud_tasks_connection.h index 60b797d977751..ccc2ad9ebf11d 100644 --- a/google/cloud/tasks/v2/cloud_tasks_connection.h +++ b/google/cloud/tasks/v2/cloud_tasks_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_V2_CLOUD_TASKS_CONNECTION_H #include "google/cloud/tasks/v2/cloud_tasks_connection_idempotency_policy.h" +#include "google/cloud/tasks/v2/cloudtasks.pb.h" #include "google/cloud/tasks/v2/internal/cloud_tasks_retry_traits.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/tasks/v2/cloud_tasks_connection_idempotency_policy.h b/google/cloud/tasks/v2/cloud_tasks_connection_idempotency_policy.h index 4ce4d88c19b6a..80b498c80c75b 100644 --- a/google/cloud/tasks/v2/cloud_tasks_connection_idempotency_policy.h +++ b/google/cloud/tasks/v2/cloud_tasks_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_V2_CLOUD_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_V2_CLOUD_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tasks/v2/cloudtasks.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include #include namespace google { diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_auth_decorator.cc b/google/cloud/tasks/v2/internal/cloud_tasks_auth_decorator.cc index 77f731171dd11..d53191447b9b0 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_auth_decorator.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/tasks/v2/cloudtasks.proto #include "google/cloud/tasks/v2/internal/cloud_tasks_auth_decorator.h" -#include +#include "google/cloud/tasks/v2/cloudtasks.grpc.pb.h" #include #include diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_logging_decorator.cc b/google/cloud/tasks/v2/internal/cloud_tasks_logging_decorator.cc index a55ee017dc797..051415c3183d0 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_logging_decorator.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/tasks/v2/cloudtasks.proto #include "google/cloud/tasks/v2/internal/cloud_tasks_logging_decorator.h" +#include "google/cloud/tasks/v2/cloudtasks.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_metadata_decorator.cc b/google/cloud/tasks/v2/internal/cloud_tasks_metadata_decorator.cc index 1a3cfdd3397cd..73434207ceac9 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_metadata_decorator.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/tasks/v2/cloudtasks.proto #include "google/cloud/tasks/v2/internal/cloud_tasks_metadata_decorator.h" +#include "google/cloud/tasks/v2/cloudtasks.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 #include #include #include diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_stub.cc b/google/cloud/tasks/v2/internal/cloud_tasks_stub.cc index c7a73208b91c4..eaeed24848118 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_stub.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/tasks/v2/cloudtasks.proto #include "google/cloud/tasks/v2/internal/cloud_tasks_stub.h" +#include "google/cloud/tasks/v2/cloudtasks.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_stub.h b/google/cloud/tasks/v2/internal/cloud_tasks_stub.h index d7e1e127ad115..e139fabd6864b 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_stub.h +++ b/google/cloud/tasks/v2/internal/cloud_tasks_stub.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_V2_INTERNAL_CLOUD_TASKS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_V2_INTERNAL_CLOUD_TASKS_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tasks/v2/cloudtasks.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include #include #include diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_stub_factory.cc b/google/cloud/tasks/v2/internal/cloud_tasks_stub_factory.cc index dbbd6afdf312a..bbbc42d95d2ff 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_stub_factory.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/tasks/v2/cloudtasks.proto #include "google/cloud/tasks/v2/internal/cloud_tasks_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tasks/v2/cloudtasks.grpc.pb.h" #include "google/cloud/tasks/v2/internal/cloud_tasks_auth_decorator.h" #include "google/cloud/tasks/v2/internal/cloud_tasks_logging_decorator.h" #include "google/cloud/tasks/v2/internal/cloud_tasks_metadata_decorator.h" @@ -28,8 +30,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include #include #include diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc index b6883c748253e..579d01272fe95 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace tasks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudTasksTracingConnection::CloudTasksTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -180,15 +178,11 @@ CloudTasksTracingConnection::GetLocation( return internal::EndSpan(*span, child_->GetLocation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudTasksTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.h b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.h index 2fa5dd5501dee..a15e9424d61ba 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.h +++ b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace tasks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudTasksTracingConnection : public tasks_v2::CloudTasksConnection { public: ~CloudTasksTracingConnection() override = default; @@ -97,8 +95,6 @@ class CloudTasksTracingConnection : public tasks_v2::CloudTasksConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.cc b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.cc index 89dd0cab8d078..5feded07db6f4 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace tasks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - CloudTasksTracingStub::CloudTasksTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -234,15 +232,9 @@ StatusOr CloudTasksTracingStub::GetLocation( child_->GetLocation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeCloudTasksTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.h b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.h index a66d4c13de48a..a7051c7519e52 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.h +++ b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace tasks_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class CloudTasksTracingStub : public CloudTasksStub { public: ~CloudTasksTracingStub() override = default; @@ -116,8 +114,6 @@ class CloudTasksTracingStub : public CloudTasksStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/telcoautomation/BUILD.bazel b/google/cloud/telcoautomation/BUILD.bazel index 4cdc3d8937fb6..bf9d33b2305f1 100644 --- a/google/cloud/telcoautomation/BUILD.bazel +++ b/google/cloud/telcoautomation/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/telcoautomation/v1:telcoautomation_cc_grpc", + "@googleapis//google/cloud/telcoautomation/v1:telcoautomation_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/telcoautomation/quickstart/.bazelrc b/google/cloud/telcoautomation/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/telcoautomation/quickstart/.bazelrc +++ b/google/cloud/telcoautomation/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.cc index bd1e54a18243d..b292b5baeca28 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/telcoautomation/v1/telcoautomation.proto #include "google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.h" -#include +#include "google/cloud/telcoautomation/v1/telcoautomation.grpc.pb.h" #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.h b/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.h index 460628f125fb3..59f4b9f320e74 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/telcoautomation/v1/internal/telco_automation_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_connection_impl.h b/google/cloud/telcoautomation/v1/internal/telco_automation_connection_impl.h index aa1d2809d2774..8f83c7bff1391 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_connection_impl.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.cc index d1cbf6290a4ea..b55c54626bb9d 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/telcoautomation/v1/telcoautomation.proto #include "google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.h b/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.h index 0892b0f4adb30..8c99fcdede5c5 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/telcoautomation/v1/internal/telco_automation_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.cc index 353454701f5f8..6fd1e8bdd0077 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/telcoautomation/v1/telcoautomation.proto #include "google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.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 #include #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.h b/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.h index f7bd774a06192..da126b5a827cf 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/telcoautomation/v1/internal/telco_automation_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc index 82497e9d4c9a9..ba3458b48ee2d 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/telcoautomation/v1/telcoautomation.proto #include "google/cloud/telcoautomation/v1/internal/telco_automation_stub.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h index 6c64e010d42e4..b9d9f4ecc7476 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TELCOAUTOMATION_V1_INTERNAL_TELCO_AUTOMATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TELCOAUTOMATION_V1_INTERNAL_TELCO_AUTOMATION_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc index 4a4d3f044b29a..4b1d31a38ae1d 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/telcoautomation/v1/telcoautomation.proto #include "google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/telcoautomation/v1/internal/telco_automation_auth_decorator.h" #include "google/cloud/telcoautomation/v1/internal/telco_automation_logging_decorator.h" #include "google/cloud/telcoautomation/v1/internal/telco_automation_metadata_decorator.h" #include "google/cloud/telcoautomation/v1/internal/telco_automation_stub.h" #include "google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.cc index e24692f02b9c7..7bcde18a0528e 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace telcoautomation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TelcoAutomationTracingConnection::TelcoAutomationTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -557,16 +555,12 @@ Status TelcoAutomationTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTelcoAutomationTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.h b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.h index 21247b09f36bc..f854a89f21abb 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace telcoautomation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TelcoAutomationTracingConnection : public telcoautomation_v1::TelcoAutomationConnection { public: @@ -256,8 +254,6 @@ class TelcoAutomationTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.cc index dc70da756a8d2..1aeab521f50d4 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace telcoautomation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TelcoAutomationTracingStub::TelcoAutomationTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -675,15 +673,9 @@ future TelcoAutomationTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTelcoAutomationTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.h b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.h index 3c61f49821850..7f937df75ba95 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace telcoautomation_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TelcoAutomationTracingStub : public TelcoAutomationStub { public: ~TelcoAutomationTracingStub() override = default; @@ -310,8 +308,6 @@ class TelcoAutomationTracingStub : public TelcoAutomationStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/telcoautomation/v1/telco_automation_client.h b/google/cloud/telcoautomation/v1/telco_automation_client.h index 89558d25a5931..25ef61dcc34fe 100644 --- a/google/cloud/telcoautomation/v1/telco_automation_client.h +++ b/google/cloud/telcoautomation/v1/telco_automation_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/telcoautomation/v1/telco_automation_connection.h b/google/cloud/telcoautomation/v1/telco_automation_connection.h index 5760f41a94e74..ba4b84d74e49a 100644 --- a/google/cloud/telcoautomation/v1/telco_automation_connection.h +++ b/google/cloud/telcoautomation/v1/telco_automation_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/telcoautomation/v1/internal/telco_automation_retry_traits.h" #include "google/cloud/telcoautomation/v1/telco_automation_connection_idempotency_policy.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/telcoautomation/v1/telco_automation_connection_idempotency_policy.h b/google/cloud/telcoautomation/v1/telco_automation_connection_idempotency_policy.h index 712c176f3915d..05c0d7f629d93 100644 --- a/google/cloud/telcoautomation/v1/telco_automation_connection_idempotency_policy.h +++ b/google/cloud/telcoautomation/v1/telco_automation_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TELCOAUTOMATION_V1_TELCO_AUTOMATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TELCOAUTOMATION_V1_TELCO_AUTOMATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/telcoautomation/v1/telcoautomation.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/testing_util/BUILD.bazel b/google/cloud/testing_util/BUILD.bazel index 5178fec5676e4..50fdd24d53e79 100644 --- a/google/cloud/testing_util/BUILD.bazel +++ b/google/cloud/testing_util/BUILD.bazel @@ -41,16 +41,12 @@ cc_library( }), deps = [ "//:common", - "@com_google_absl//absl/debugging:failure_signal_handler", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_googletest//:gtest_main", - ] + select({ - "//google/cloud:enable_opentelemetry": [ - "@io_opentelemetry_cpp//exporters/memory:in_memory_span_exporter", - "@io_opentelemetry_cpp//sdk/src/trace", - ], - "//conditions:default": [], - }), + "@abseil-cpp//absl/debugging:failure_signal_handler", + "@abseil-cpp//absl/debugging:symbolize", + "@googletest//:gtest_main", + "@opentelemetry-cpp//exporters/memory:in_memory_span_exporter", + "@opentelemetry-cpp//sdk/src/trace", + ], ) cc_library( @@ -71,7 +67,7 @@ cc_library( deps = [ ":google_cloud_cpp_testing", "//:common", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_testing_unit_tests] @@ -83,11 +79,11 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_github_grpc_grpc//:grpc++", - "@com_google_googleapis//:googleapis_system_includes", - "@com_google_googleapis//google/api:annotations_cc_proto", - "@com_google_googleapis//google/api:routing_cc_proto", - "@com_google_googletest//:gtest_main", + "@grpc//:grpc++", + # "@googleapis//:googleapis_system_includes", + "@googleapis//google/api:annotations_cc_proto", + "@googleapis//google/api:routing_cc_proto", + "@googletest//:gtest_main", "@com_google_protobuf//:protobuf", ], ) @@ -110,8 +106,8 @@ cc_library( deps = [ ":google_cloud_cpp_testing_grpc", "//:common", - "@com_google_googletest//:gtest_main", "@com_google_protobuf//:protobuf", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_testing_grpc_unit_tests] @@ -122,7 +118,7 @@ cc_library( hdrs = google_cloud_cpp_testing_rest_hdrs, deps = [ "//google/cloud:google_cloud_cpp_rest_internal", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/testing_util/CMakeLists.txt b/google/cloud/testing_util/CMakeLists.txt index 79f02b6249e55..8028f70d70284 100644 --- a/google/cloud/testing_util/CMakeLists.txt +++ b/google/cloud/testing_util/CMakeLists.txt @@ -57,14 +57,10 @@ add_library( timer.h) target_link_libraries( google_cloud_cpp_testing - PUBLIC absl::symbolize absl::failure_signal_handler - google-cloud-cpp::common GTest::gmock) -if (opentelemetry-cpp_FOUND) - target_link_libraries( - google_cloud_cpp_testing - PRIVATE opentelemetry-cpp::in_memory_span_exporter - opentelemetry-cpp::trace) -endif () + PUBLIC absl::symbolize absl::failure_signal_handler google-cloud-cpp::common + GTest::gmock + PRIVATE opentelemetry-cpp::in_memory_span_exporter opentelemetry-cpp::trace) + google_cloud_cpp_add_common_options(google_cloud_cpp_testing) include(CheckCXXSymbolExists) diff --git a/google/cloud/testing_util/is_proto_equal_test.cc b/google/cloud/testing_util/is_proto_equal_test.cc index b13524b65589b..05f78ad4f9f2a 100644 --- a/google/cloud/testing_util/is_proto_equal_test.cc +++ b/google/cloud/testing_util/is_proto_equal_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "google/cloud/testing_util/is_proto_equal.h" -#include +#include "google/protobuf/wrappers.pb.h" #include namespace google { diff --git a/google/cloud/testing_util/opentelemetry_matchers.cc b/google/cloud/testing_util/opentelemetry_matchers.cc index 86bcdaa2afa82..2dbc5c0f1139a 100644 --- a/google/cloud/testing_util/opentelemetry_matchers.cc +++ b/google/cloud/testing_util/opentelemetry_matchers.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/internal/absl_str_join_quiet.h" #include "google/cloud/internal/opentelemetry.h" @@ -23,6 +22,7 @@ #include #include #include +#include namespace { @@ -38,7 +38,6 @@ void AttributeFormatter( *out += "bool:"; *out += v ? "true" : "false"; } - void operator()(double v) const { *out += "double:" + std::to_string(v); } void operator()(std::int32_t v) const { *out += "std::int32_t:" + std::to_string(v); } @@ -48,9 +47,7 @@ void AttributeFormatter( void operator()(std::int64_t v) const { *out += "std::int64_t:" + std::to_string(v); } - void operator()(std::uint64_t v) const { - *out += "std::uint64_t:" + std::to_string(v); - } + void operator()(double v) const { *out += "double:" + std::to_string(v); } void operator()(std::string const& v) const { *out += "std::string:" + v; } void operator()(std::vector const& v) const { auto format = [](std::string* out, bool b) { @@ -58,16 +55,6 @@ void AttributeFormatter( }; *out += "std::vector:[" + absl::StrJoin(v, ", ", format) + "]"; } - void operator()(std::vector const& v) const { - *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; - } - void operator()(std::vector const& v) const { - *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; - } - void operator()(std::vector const& v) const { - *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; - ; - } void operator()(std::vector const& v) const { *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; } @@ -77,11 +64,23 @@ void AttributeFormatter( void operator()(std::vector const& v) const { *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; } + void operator()(std::vector const& v) const { + *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; + } + void operator()(std::vector const& v) const { + *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; + } + void operator()(std::uint64_t v) const { + *out += "std::uint64_t:" + std::to_string(v); + } void operator()(std::vector const& v) const { *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; } + void operator()(std::vector const& v) const { + *out += "std::vector:[" + absl::StrJoin(v, ", ") + "]"; + } }; - absl::visit(Visitor{out}, kv.second); + std::visit(Visitor{out}, kv.second); } } // namespace @@ -223,4 +222,3 @@ Options DisableTracing(Options options) { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY diff --git a/google/cloud/testing_util/opentelemetry_matchers.h b/google/cloud/testing_util/opentelemetry_matchers.h index 95fe7aeba92b3..885eb5fdcafa7 100644 --- a/google/cloud/testing_util/opentelemetry_matchers.h +++ b/google/cloud/testing_util/opentelemetry_matchers.h @@ -15,7 +15,6 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TESTING_UTIL_OPENTELEMETRY_MATCHERS_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TESTING_UTIL_OPENTELEMETRY_MATCHERS_H -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/future.h" #include "google/cloud/internal/opentelemetry_context.h" #include "google/cloud/options.h" @@ -403,6 +402,5 @@ class PromiseWithOTelContext { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TESTING_UTIL_OPENTELEMETRY_MATCHERS_H diff --git a/google/cloud/testing_util/validate_metadata.cc b/google/cloud/testing_util/validate_metadata.cc index 2744da532f331..05c7a5e9eccfc 100644 --- a/google/cloud/testing_util/validate_metadata.cc +++ b/google/cloud/testing_util/validate_metadata.cc @@ -20,8 +20,8 @@ #include "google/cloud/status_or.h" #include "absl/meta/type_traits.h" #include "absl/strings/str_split.h" -#include -#include +#include "google/api/annotations.pb.h" +#include "google/api/routing.pb.h" #include #include #include diff --git a/google/cloud/texttospeech/BUILD.bazel b/google/cloud/texttospeech/BUILD.bazel index 912007a22e151..304eb52f91f61 100644 --- a/google/cloud/texttospeech/BUILD.bazel +++ b/google/cloud/texttospeech/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/texttospeech/v1:texttospeech_cc_grpc", + "@googleapis//google/cloud/texttospeech/v1:texttospeech_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/texttospeech/quickstart/.bazelrc b/google/cloud/texttospeech/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/texttospeech/quickstart/.bazelrc +++ b/google/cloud/texttospeech/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_auth_decorator.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_auth_decorator.cc index c2b88730af878..0578f016167df 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_auth_decorator.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_auth_decorator.cc @@ -17,8 +17,8 @@ // source: google/cloud/texttospeech/v1/cloud_tts.proto #include "google/cloud/texttospeech/v1/internal/text_to_speech_auth_decorator.h" +#include "google/cloud/texttospeech/v1/cloud_tts.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_auth.h" -#include #include #include diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_logging_decorator.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_logging_decorator.cc index 589b6f78db9c5..bba5faa0abb02 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_logging_decorator.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_logging_decorator.cc @@ -17,10 +17,10 @@ // source: google/cloud/texttospeech/v1/cloud_tts.proto #include "google/cloud/texttospeech/v1/internal/text_to_speech_logging_decorator.h" +#include "google/cloud/texttospeech/v1/cloud_tts.grpc.pb.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_metadata_decorator.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_metadata_decorator.cc index 6207b7735cd2b..e1ea8876638e4 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_metadata_decorator.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/texttospeech/v1/cloud_tts.proto #include "google/cloud/texttospeech/v1/internal/text_to_speech_metadata_decorator.h" +#include "google/cloud/texttospeech/v1/cloud_tts.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 #include #include #include diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_stub.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_stub.cc index 3cb7412ef4be2..338a3c1a3e6a2 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_stub.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/texttospeech/v1/cloud_tts.proto #include "google/cloud/texttospeech/v1/internal/text_to_speech_stub.h" +#include "google/cloud/texttospeech/v1/cloud_tts.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_stub.h b/google/cloud/texttospeech/v1/internal/text_to_speech_stub.h index d18599cfc12a9..69668b37dbc79 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_stub.h +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_V1_INTERNAL_TEXT_TO_SPEECH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_V1_INTERNAL_TEXT_TO_SPEECH_STUB_H +#include "google/cloud/texttospeech/v1/cloud_tts.grpc.pb.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_stub_factory.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_stub_factory.cc index 3317a73025a3f..edbb8337c5448 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_stub_factory.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/texttospeech/v1/cloud_tts.proto #include "google/cloud/texttospeech/v1/internal/text_to_speech_stub_factory.h" +#include "google/cloud/texttospeech/v1/cloud_tts.grpc.pb.h" #include "google/cloud/texttospeech/v1/internal/text_to_speech_auth_decorator.h" #include "google/cloud/texttospeech/v1/internal/text_to_speech_logging_decorator.h" #include "google/cloud/texttospeech/v1/internal/text_to_speech_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.cc index a56f96b2c7a09..f3a6db8f32503 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace texttospeech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TextToSpeechTracingConnection::TextToSpeechTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -78,16 +76,12 @@ TextToSpeechTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTextToSpeechTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.h b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.h index 4ce81470d193d..14faf220546ad 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.h +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace texttospeech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TextToSpeechTracingConnection : public texttospeech_v1::TextToSpeechConnection { public: @@ -64,8 +62,6 @@ class TextToSpeechTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.cc b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.cc index 7eb555f5f322f..21048bd6e2757 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.cc +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.cc @@ -27,8 +27,6 @@ namespace cloud { namespace texttospeech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TextToSpeechTracingStub::TextToSpeechTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -98,15 +96,9 @@ StatusOr TextToSpeechTracingStub::GetOperation( child_->GetOperation(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTextToSpeechTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.h b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.h index 9990f8fd8e390..e963dcdfce14a 100644 --- a/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.h +++ b/google/cloud/texttospeech/v1/internal/text_to_speech_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace texttospeech_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TextToSpeechTracingStub : public TextToSpeechStub { public: ~TextToSpeechTracingStub() override = default; @@ -71,8 +69,6 @@ class TextToSpeechTracingStub : public TextToSpeechStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/texttospeech/v1/text_to_speech_connection.h b/google/cloud/texttospeech/v1/text_to_speech_connection.h index f99e459840639..a6f5e14218de8 100644 --- a/google/cloud/texttospeech/v1/text_to_speech_connection.h +++ b/google/cloud/texttospeech/v1/text_to_speech_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_V1_TEXT_TO_SPEECH_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_V1_TEXT_TO_SPEECH_CONNECTION_H +#include "google/cloud/texttospeech/v1/cloud_tts.pb.h" #include "google/cloud/texttospeech/v1/internal/text_to_speech_retry_traits.h" #include "google/cloud/texttospeech/v1/text_to_speech_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -28,7 +29,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/texttospeech/v1/text_to_speech_connection_idempotency_policy.h b/google/cloud/texttospeech/v1/text_to_speech_connection_idempotency_policy.h index f644468547c1d..415882d4d0968 100644 --- a/google/cloud/texttospeech/v1/text_to_speech_connection_idempotency_policy.h +++ b/google/cloud/texttospeech/v1/text_to_speech_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_V1_TEXT_TO_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_V1_TEXT_TO_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/texttospeech/v1/cloud_tts.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/timeseriesinsights/BUILD.bazel b/google/cloud/timeseriesinsights/BUILD.bazel index dc294a941059d..bc0dfb0561e09 100644 --- a/google/cloud/timeseriesinsights/BUILD.bazel +++ b/google/cloud/timeseriesinsights/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/timeseriesinsights/v1:timeseriesinsights_cc_grpc", + "@googleapis//google/cloud/timeseriesinsights/v1:timeseriesinsights_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/timeseriesinsights/quickstart/.bazelrc b/google/cloud/timeseriesinsights/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/timeseriesinsights/quickstart/.bazelrc +++ b/google/cloud/timeseriesinsights/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_auth_decorator.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_auth_decorator.cc index ff70ac4de70be..b4c92808988d4 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_auth_decorator.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/timeseriesinsights/v1/timeseries_insights.proto #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_auth_decorator.h" -#include +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.grpc.pb.h" #include #include diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_logging_decorator.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_logging_decorator.cc index d87ea7a2b7fed..1876358ca3a77 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_logging_decorator.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/timeseriesinsights/v1/timeseries_insights.proto #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_logging_decorator.h" +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_metadata_decorator.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_metadata_decorator.cc index dbd6e867da7d1..969ede4e556a2 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_metadata_decorator.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/timeseriesinsights/v1/timeseries_insights.proto #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_metadata_decorator.h" +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.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 #include #include #include diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.cc index f7086f5820e93..c73aecc69c3a2 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/timeseriesinsights/v1/timeseries_insights.proto #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.h" +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.h b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.h index 888df3a1ee540..1350916396192 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.h +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TIMESERIESINSIGHTS_V1_INTERNAL_TIMESERIES_INSIGHTS_CONTROLLER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TIMESERIESINSIGHTS_V1_INTERNAL_TIMESERIES_INSIGHTS_CONTROLLER_STUB_H +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub_factory.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub_factory.cc index 2305b3e61e340..25e24c32ae2ff 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub_factory.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_metadata_decorator.h" #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_stub.h" #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.h" +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.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 #include #include diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc index e873f7d0b5d38..4b7471916883e 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace timeseriesinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TimeseriesInsightsControllerTracingConnection:: TimeseriesInsightsControllerTracingConnection( std::shared_ptr< @@ -112,19 +110,15 @@ TimeseriesInsightsControllerTracingConnection::EvaluateTimeseries( return internal::EndSpan(*span, child_->EvaluateTimeseries(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTimeseriesInsightsControllerTracingConnection( std::shared_ptr< timeseriesinsights_v1::TimeseriesInsightsControllerConnection> conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.h b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.h index f0637f15e1967..0d767760e3c42 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.h +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace timeseriesinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TimeseriesInsightsControllerTracingConnection : public timeseriesinsights_v1::TimeseriesInsightsControllerConnection { public: @@ -76,8 +74,6 @@ class TimeseriesInsightsControllerTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.cc index c610487c4cfdd..d892934bccd2f 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace timeseriesinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TimeseriesInsightsControllerTracingStub:: TimeseriesInsightsControllerTracingStub( std::shared_ptr child) @@ -127,17 +125,11 @@ TimeseriesInsightsControllerTracingStub::EvaluateTimeseries( context, *span, child_->EvaluateTimeseries(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTimeseriesInsightsControllerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared( std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.h b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.h index e2fb882ed1e8d..554538138408b 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.h +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace timeseriesinsights_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TimeseriesInsightsControllerTracingStub : public TimeseriesInsightsControllerStub { public: @@ -82,8 +80,6 @@ class TimeseriesInsightsControllerTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection.h b/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection.h index 69fd5b335f1b0..2db73e03c4c6a 100644 --- a/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection.h +++ b/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TIMESERIESINSIGHTS_V1_TIMESERIES_INSIGHTS_CONTROLLER_CONNECTION_H #include "google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_retry_traits.h" +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.pb.h" #include "google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection_idempotency_policy.h b/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection_idempotency_policy.h index 7ae9671c09848..72dff89bd7666 100644 --- a/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection_idempotency_policy.h +++ b/google/cloud/timeseriesinsights/v1/timeseries_insights_controller_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TIMESERIESINSIGHTS_V1_TIMESERIES_INSIGHTS_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TIMESERIESINSIGHTS_V1_TIMESERIES_INSIGHTS_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/timeseriesinsights/v1/timeseries_insights.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/tpu/BUILD.bazel b/google/cloud/tpu/BUILD.bazel index 2c84443519e07..e56bf62d7d163 100644 --- a/google/cloud/tpu/BUILD.bazel +++ b/google/cloud/tpu/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/tpu/v1:tpu_cc_grpc", - "@com_google_googleapis//google/cloud/tpu/v2:tpu_cc_grpc", + "@googleapis//google/cloud/tpu/v1:tpu_cc_grpc", + "@googleapis//google/cloud/tpu/v2:tpu_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/tpu/quickstart/.bazelrc b/google/cloud/tpu/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/tpu/quickstart/.bazelrc +++ b/google/cloud/tpu/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/tpu/v1/internal/tpu_auth_decorator.cc b/google/cloud/tpu/v1/internal/tpu_auth_decorator.cc index 050a10b55c232..a473e8ce920af 100644 --- a/google/cloud/tpu/v1/internal/tpu_auth_decorator.cc +++ b/google/cloud/tpu/v1/internal/tpu_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/tpu/v1/cloud_tpu.proto #include "google/cloud/tpu/v1/internal/tpu_auth_decorator.h" -#include +#include "google/cloud/tpu/v1/cloud_tpu.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_auth_decorator.h b/google/cloud/tpu/v1/internal/tpu_auth_decorator.h index 0ea687762ea28..8017e3d32893a 100644 --- a/google/cloud/tpu/v1/internal/tpu_auth_decorator.h +++ b/google/cloud/tpu/v1/internal/tpu_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/tpu/v1/internal/tpu_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_connection_impl.h b/google/cloud/tpu/v1/internal/tpu_connection_impl.h index 55e228bdbf300..5da01cfedda88 100644 --- a/google/cloud/tpu/v1/internal/tpu_connection_impl.h +++ b/google/cloud/tpu/v1/internal/tpu_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/tpu/v1/internal/tpu_logging_decorator.cc b/google/cloud/tpu/v1/internal/tpu_logging_decorator.cc index aa0db4525fec9..b477ae8a2ff36 100644 --- a/google/cloud/tpu/v1/internal/tpu_logging_decorator.cc +++ b/google/cloud/tpu/v1/internal/tpu_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/tpu/v1/cloud_tpu.proto #include "google/cloud/tpu/v1/internal/tpu_logging_decorator.h" +#include "google/cloud/tpu/v1/cloud_tpu.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_logging_decorator.h b/google/cloud/tpu/v1/internal/tpu_logging_decorator.h index 63423196a070f..6318bc6bf2491 100644 --- a/google/cloud/tpu/v1/internal/tpu_logging_decorator.h +++ b/google/cloud/tpu/v1/internal/tpu_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/tpu/v1/internal/tpu_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_metadata_decorator.cc b/google/cloud/tpu/v1/internal/tpu_metadata_decorator.cc index 766b049e865ae..579f58981d085 100644 --- a/google/cloud/tpu/v1/internal/tpu_metadata_decorator.cc +++ b/google/cloud/tpu/v1/internal/tpu_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/tpu/v1/cloud_tpu.proto #include "google/cloud/tpu/v1/internal/tpu_metadata_decorator.h" +#include "google/cloud/tpu/v1/cloud_tpu.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 #include #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_metadata_decorator.h b/google/cloud/tpu/v1/internal/tpu_metadata_decorator.h index d965b3af2d954..46ec1bd8701c2 100644 --- a/google/cloud/tpu/v1/internal/tpu_metadata_decorator.h +++ b/google/cloud/tpu/v1/internal/tpu_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/tpu/v1/internal/tpu_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_stub.cc b/google/cloud/tpu/v1/internal/tpu_stub.cc index cb240fab5a686..f2de3691ef373 100644 --- a/google/cloud/tpu/v1/internal/tpu_stub.cc +++ b/google/cloud/tpu/v1/internal/tpu_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/tpu/v1/cloud_tpu.proto #include "google/cloud/tpu/v1/internal/tpu_stub.h" +#include "google/cloud/tpu/v1/cloud_tpu.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_stub.h b/google/cloud/tpu/v1/internal/tpu_stub.h index 82d3fd23bc2dc..8e2a27b55deed 100644 --- a/google/cloud/tpu/v1/internal/tpu_stub.h +++ b/google/cloud/tpu/v1/internal/tpu_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V1_INTERNAL_TPU_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V1_INTERNAL_TPU_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tpu/v1/cloud_tpu.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_stub_factory.cc b/google/cloud/tpu/v1/internal/tpu_stub_factory.cc index e4138c3cf40bc..799d817f8f62b 100644 --- a/google/cloud/tpu/v1/internal/tpu_stub_factory.cc +++ b/google/cloud/tpu/v1/internal/tpu_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/tpu/v1/cloud_tpu.proto #include "google/cloud/tpu/v1/internal/tpu_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tpu/v1/cloud_tpu.grpc.pb.h" #include "google/cloud/tpu/v1/internal/tpu_auth_decorator.h" #include "google/cloud/tpu/v1/internal/tpu_logging_decorator.h" #include "google/cloud/tpu/v1/internal/tpu_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc b/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc index 2f1e3b7018090..f2863b16557fc 100644 --- a/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc +++ b/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace tpu_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TpuTracingConnection::TpuTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -242,15 +240,11 @@ Status TpuTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTpuTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/tpu/v1/internal/tpu_tracing_connection.h b/google/cloud/tpu/v1/internal/tpu_tracing_connection.h index 050f0e07af44a..e0a1c94eae4b2 100644 --- a/google/cloud/tpu/v1/internal/tpu_tracing_connection.h +++ b/google/cloud/tpu/v1/internal/tpu_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace tpu_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TpuTracingConnection : public tpu_v1::TpuConnection { public: ~TpuTracingConnection() override = default; @@ -130,8 +128,6 @@ class TpuTracingConnection : public tpu_v1::TpuConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc b/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc index 87ee004d132b9..50cfa9476e143 100644 --- a/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc +++ b/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace tpu_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TpuTracingStub::TpuTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -307,14 +305,8 @@ future TpuTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTpuTracingStub(std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/tpu/v1/internal/tpu_tracing_stub.h b/google/cloud/tpu/v1/internal/tpu_tracing_stub.h index a5d4978e1ccd2..ea64c363b0769 100644 --- a/google/cloud/tpu/v1/internal/tpu_tracing_stub.h +++ b/google/cloud/tpu/v1/internal/tpu_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace tpu_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TpuTracingStub : public TpuStub { public: ~TpuTracingStub() override = default; @@ -160,8 +158,6 @@ class TpuTracingStub : public TpuStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/tpu/v1/tpu_client.h b/google/cloud/tpu/v1/tpu_client.h index 9a762e7be5dc5..54793b5c94794 100644 --- a/google/cloud/tpu/v1/tpu_client.h +++ b/google/cloud/tpu/v1/tpu_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v1/tpu_connection.h b/google/cloud/tpu/v1/tpu_connection.h index d5ba39ae90bf1..384a9b19bbf19 100644 --- a/google/cloud/tpu/v1/tpu_connection.h +++ b/google/cloud/tpu/v1/tpu_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V1_TPU_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V1_TPU_CONNECTION_H +#include "google/cloud/tpu/v1/cloud_tpu.pb.h" #include "google/cloud/tpu/v1/internal/tpu_retry_traits.h" #include "google/cloud/tpu/v1/tpu_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/tpu/v1/tpu_connection_idempotency_policy.h b/google/cloud/tpu/v1/tpu_connection_idempotency_policy.h index ca1c169c0c5f3..d006294357bf7 100644 --- a/google/cloud/tpu/v1/tpu_connection_idempotency_policy.h +++ b/google/cloud/tpu/v1/tpu_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V1_TPU_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V1_TPU_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tpu/v1/cloud_tpu.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/tpu/v2/internal/tpu_auth_decorator.cc b/google/cloud/tpu/v2/internal/tpu_auth_decorator.cc index 39acfc56e44e9..55e8ffe0ae176 100644 --- a/google/cloud/tpu/v2/internal/tpu_auth_decorator.cc +++ b/google/cloud/tpu/v2/internal/tpu_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/tpu/v2/cloud_tpu.proto #include "google/cloud/tpu/v2/internal/tpu_auth_decorator.h" -#include +#include "google/cloud/tpu/v2/cloud_tpu.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_auth_decorator.h b/google/cloud/tpu/v2/internal/tpu_auth_decorator.h index c98b7250bf07c..7796cf2517a10 100644 --- a/google/cloud/tpu/v2/internal/tpu_auth_decorator.h +++ b/google/cloud/tpu/v2/internal/tpu_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/tpu/v2/internal/tpu_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_connection_impl.h b/google/cloud/tpu/v2/internal/tpu_connection_impl.h index 38868d09191d1..a149b84677f94 100644 --- a/google/cloud/tpu/v2/internal/tpu_connection_impl.h +++ b/google/cloud/tpu/v2/internal/tpu_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/tpu/v2/internal/tpu_logging_decorator.cc b/google/cloud/tpu/v2/internal/tpu_logging_decorator.cc index dc58b27d62eb0..086c605fc3c40 100644 --- a/google/cloud/tpu/v2/internal/tpu_logging_decorator.cc +++ b/google/cloud/tpu/v2/internal/tpu_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/tpu/v2/cloud_tpu.proto #include "google/cloud/tpu/v2/internal/tpu_logging_decorator.h" +#include "google/cloud/tpu/v2/cloud_tpu.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_logging_decorator.h b/google/cloud/tpu/v2/internal/tpu_logging_decorator.h index d27bfedf51d4c..dfcae3f851fe2 100644 --- a/google/cloud/tpu/v2/internal/tpu_logging_decorator.h +++ b/google/cloud/tpu/v2/internal/tpu_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/tpu/v2/internal/tpu_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_metadata_decorator.cc b/google/cloud/tpu/v2/internal/tpu_metadata_decorator.cc index 40b3482954298..209b9d2444c6e 100644 --- a/google/cloud/tpu/v2/internal/tpu_metadata_decorator.cc +++ b/google/cloud/tpu/v2/internal/tpu_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/tpu/v2/cloud_tpu.proto #include "google/cloud/tpu/v2/internal/tpu_metadata_decorator.h" +#include "google/cloud/tpu/v2/cloud_tpu.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 #include #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_metadata_decorator.h b/google/cloud/tpu/v2/internal/tpu_metadata_decorator.h index 39daaac944955..5fecd7bc1d246 100644 --- a/google/cloud/tpu/v2/internal/tpu_metadata_decorator.h +++ b/google/cloud/tpu/v2/internal/tpu_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/tpu/v2/internal/tpu_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_stub.cc b/google/cloud/tpu/v2/internal/tpu_stub.cc index 2e996ca628fbb..fda54ffb30d2a 100644 --- a/google/cloud/tpu/v2/internal/tpu_stub.cc +++ b/google/cloud/tpu/v2/internal/tpu_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/tpu/v2/cloud_tpu.proto #include "google/cloud/tpu/v2/internal/tpu_stub.h" +#include "google/cloud/tpu/v2/cloud_tpu.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_stub.h b/google/cloud/tpu/v2/internal/tpu_stub.h index 945714b91138b..dd3e8e16ad58b 100644 --- a/google/cloud/tpu/v2/internal/tpu_stub.h +++ b/google/cloud/tpu/v2/internal/tpu_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V2_INTERNAL_TPU_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V2_INTERNAL_TPU_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tpu/v2/cloud_tpu.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_stub_factory.cc b/google/cloud/tpu/v2/internal/tpu_stub_factory.cc index aab369ea8f042..cb2c6574082ff 100644 --- a/google/cloud/tpu/v2/internal/tpu_stub_factory.cc +++ b/google/cloud/tpu/v2/internal/tpu_stub_factory.cc @@ -17,6 +17,8 @@ // source: google/cloud/tpu/v2/cloud_tpu.proto #include "google/cloud/tpu/v2/internal/tpu_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tpu/v2/cloud_tpu.grpc.pb.h" #include "google/cloud/tpu/v2/internal/tpu_auth_decorator.h" #include "google/cloud/tpu/v2/internal/tpu_logging_decorator.h" #include "google/cloud/tpu/v2/internal/tpu_metadata_decorator.h" @@ -28,9 +30,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc b/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc index d7e6d573600a7..73a89d19e7ad9 100644 --- a/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc +++ b/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace tpu_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TpuTracingConnection::TpuTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -359,15 +357,11 @@ Status TpuTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTpuTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/tpu/v2/internal/tpu_tracing_connection.h b/google/cloud/tpu/v2/internal/tpu_tracing_connection.h index 9fa4799a8d2d4..7cf41ebe8ac09 100644 --- a/google/cloud/tpu/v2/internal/tpu_tracing_connection.h +++ b/google/cloud/tpu/v2/internal/tpu_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace tpu_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TpuTracingConnection : public tpu_v2::TpuConnection { public: ~TpuTracingConnection() override = default; @@ -182,8 +180,6 @@ class TpuTracingConnection : public tpu_v2::TpuConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc b/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc index 591cd56baee98..f55331376e34a 100644 --- a/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc +++ b/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace tpu_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TpuTracingStub::TpuTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -433,14 +431,8 @@ future TpuTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTpuTracingStub(std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/tpu/v2/internal/tpu_tracing_stub.h b/google/cloud/tpu/v2/internal/tpu_tracing_stub.h index 5cb73f9e6d0c3..d5c0a501c6cfc 100644 --- a/google/cloud/tpu/v2/internal/tpu_tracing_stub.h +++ b/google/cloud/tpu/v2/internal/tpu_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace tpu_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TpuTracingStub : public TpuStub { public: ~TpuTracingStub() override = default; @@ -214,8 +212,6 @@ class TpuTracingStub : public TpuStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/tpu/v2/tpu_client.h b/google/cloud/tpu/v2/tpu_client.h index b58d40e75e301..0dbbb4ac68a5a 100644 --- a/google/cloud/tpu/v2/tpu_client.h +++ b/google/cloud/tpu/v2/tpu_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/tpu/v2/tpu_connection.h b/google/cloud/tpu/v2/tpu_connection.h index 0ff19e205da23..53b799b554ae4 100644 --- a/google/cloud/tpu/v2/tpu_connection.h +++ b/google/cloud/tpu/v2/tpu_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V2_TPU_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V2_TPU_CONNECTION_H +#include "google/cloud/tpu/v2/cloud_tpu.pb.h" #include "google/cloud/tpu/v2/internal/tpu_retry_traits.h" #include "google/cloud/tpu/v2/tpu_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/tpu/v2/tpu_connection_idempotency_policy.h b/google/cloud/tpu/v2/tpu_connection_idempotency_policy.h index 1db7778fb6374..5c5fb739af1c3 100644 --- a/google/cloud/tpu/v2/tpu_connection_idempotency_policy.h +++ b/google/cloud/tpu/v2/tpu_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V2_TPU_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_V2_TPU_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/tpu/v2/cloud_tpu.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/trace/BUILD.bazel b/google/cloud/trace/BUILD.bazel index 71c11f17a601e..82421d887a104 100644 --- a/google/cloud/trace/BUILD.bazel +++ b/google/cloud/trace/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/cloudtrace/v1:cloudtrace_cc_grpc", - "@com_google_googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc", + "@googleapis//google/devtools/cloudtrace/v1:cloudtrace_cc_grpc", + "@googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/trace/quickstart/.bazelrc b/google/cloud/trace/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/trace/quickstart/.bazelrc +++ b/google/cloud/trace/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/trace/v1/internal/trace_auth_decorator.cc b/google/cloud/trace/v1/internal/trace_auth_decorator.cc index c0b2ad7aad41e..41331d8dfe839 100644 --- a/google/cloud/trace/v1/internal/trace_auth_decorator.cc +++ b/google/cloud/trace/v1/internal/trace_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/cloudtrace/v1/trace.proto #include "google/cloud/trace/v1/internal/trace_auth_decorator.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v1/internal/trace_logging_decorator.cc b/google/cloud/trace/v1/internal/trace_logging_decorator.cc index 52ff1821f2e63..4523a01e04aae 100644 --- a/google/cloud/trace/v1/internal/trace_logging_decorator.cc +++ b/google/cloud/trace/v1/internal/trace_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/trace/v1/internal/trace_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include #include #include diff --git a/google/cloud/trace/v1/internal/trace_metadata_decorator.cc b/google/cloud/trace/v1/internal/trace_metadata_decorator.cc index d56f80292115a..14ce8962ad462 100644 --- a/google/cloud/trace/v1/internal/trace_metadata_decorator.cc +++ b/google/cloud/trace/v1/internal/trace_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include #include #include diff --git a/google/cloud/trace/v1/internal/trace_stub.cc b/google/cloud/trace/v1/internal/trace_stub.cc index 34815d6559c79..91f91dc722d76 100644 --- a/google/cloud/trace/v1/internal/trace_stub.cc +++ b/google/cloud/trace/v1/internal/trace_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/trace/v1/internal/trace_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v1/internal/trace_stub.h b/google/cloud/trace/v1/internal/trace_stub.h index 085ba3aea7c46..7cb549a51dba3 100644 --- a/google/cloud/trace/v1/internal/trace_stub.h +++ b/google/cloud/trace/v1/internal/trace_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v1/internal/trace_stub_factory.cc b/google/cloud/trace/v1/internal/trace_stub_factory.cc index 3b088e79e93e9..f12d7732f3fa2 100644 --- a/google/cloud/trace/v1/internal/trace_stub_factory.cc +++ b/google/cloud/trace/v1/internal/trace_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v1/internal/trace_tracing_connection.cc b/google/cloud/trace/v1/internal/trace_tracing_connection.cc index 59edf46864267..64d74f703dd89 100644 --- a/google/cloud/trace/v1/internal/trace_tracing_connection.cc +++ b/google/cloud/trace/v1/internal/trace_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace trace_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TraceServiceTracingConnection::TraceServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -60,16 +58,12 @@ Status TraceServiceTracingConnection::PatchTraces( return internal::EndSpan(*span, child_->PatchTraces(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTraceServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/trace/v1/internal/trace_tracing_connection.h b/google/cloud/trace/v1/internal/trace_tracing_connection.h index f479484bc1b46..c969efb07e7a7 100644 --- a/google/cloud/trace/v1/internal/trace_tracing_connection.h +++ b/google/cloud/trace/v1/internal/trace_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace trace_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TraceServiceTracingConnection : public trace_v1::TraceServiceConnection { public: ~TraceServiceTracingConnection() override = default; @@ -53,8 +51,6 @@ class TraceServiceTracingConnection : public trace_v1::TraceServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/trace/v1/internal/trace_tracing_stub.cc b/google/cloud/trace/v1/internal/trace_tracing_stub.cc index 3272c510c8436..b7d953161afe2 100644 --- a/google/cloud/trace/v1/internal/trace_tracing_stub.cc +++ b/google/cloud/trace/v1/internal/trace_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace trace_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TraceServiceTracingStub::TraceServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -67,15 +65,9 @@ Status TraceServiceTracingStub::PatchTraces( child_->PatchTraces(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTraceServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/trace/v1/internal/trace_tracing_stub.h b/google/cloud/trace/v1/internal/trace_tracing_stub.h index 34bb2f65bad4b..7dbe4ca1127ff 100644 --- a/google/cloud/trace/v1/internal/trace_tracing_stub.h +++ b/google/cloud/trace/v1/internal/trace_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace trace_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TraceServiceTracingStub : public TraceServiceStub { public: ~TraceServiceTracingStub() override = default; @@ -58,8 +56,6 @@ class TraceServiceTracingStub : public TraceServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/trace/v1/trace_connection.h b/google/cloud/trace/v1/trace_connection.h index e46e6f34a9f06..babf575740f9e 100644 --- a/google/cloud/trace/v1/trace_connection.h +++ b/google/cloud/trace/v1/trace_connection.h @@ -27,7 +27,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudtrace/v1/trace.pb.h" #include namespace google { diff --git a/google/cloud/trace/v1/trace_connection_idempotency_policy.h b/google/cloud/trace/v1/trace_connection_idempotency_policy.h index 0a66ada7a1108..e356d6475057b 100644 --- a/google/cloud/trace/v1/trace_connection_idempotency_policy.h +++ b/google/cloud/trace/v1/trace_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudtrace/v1/trace.grpc.pb.h" #include namespace google { diff --git a/google/cloud/trace/v2/internal/trace_auth_decorator.cc b/google/cloud/trace/v2/internal/trace_auth_decorator.cc index 1b7a104f984b7..b9d04e13b4a56 100644 --- a/google/cloud/trace/v2/internal/trace_auth_decorator.cc +++ b/google/cloud/trace/v2/internal/trace_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/devtools/cloudtrace/v2/tracing.proto #include "google/cloud/trace/v2/internal/trace_auth_decorator.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v2/internal/trace_logging_decorator.cc b/google/cloud/trace/v2/internal/trace_logging_decorator.cc index 68566bea1fa6a..9c702b120082d 100644 --- a/google/cloud/trace/v2/internal/trace_logging_decorator.cc +++ b/google/cloud/trace/v2/internal/trace_logging_decorator.cc @@ -19,7 +19,7 @@ #include "google/cloud/trace/v2/internal/trace_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include #include #include diff --git a/google/cloud/trace/v2/internal/trace_metadata_decorator.cc b/google/cloud/trace/v2/internal/trace_metadata_decorator.cc index 76102c0ab2a16..2cb14cf1a648b 100644 --- a/google/cloud/trace/v2/internal/trace_metadata_decorator.cc +++ b/google/cloud/trace/v2/internal/trace_metadata_decorator.cc @@ -22,7 +22,7 @@ #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/url_encode.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include #include #include diff --git a/google/cloud/trace/v2/internal/trace_stub.cc b/google/cloud/trace/v2/internal/trace_stub.cc index 250abbf296bfe..71c3dc5e45391 100644 --- a/google/cloud/trace/v2/internal/trace_stub.cc +++ b/google/cloud/trace/v2/internal/trace_stub.cc @@ -19,7 +19,7 @@ #include "google/cloud/trace/v2/internal/trace_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v2/internal/trace_stub.h b/google/cloud/trace/v2/internal/trace_stub.h index fb8a91bd8f261..f6b480c8388d0 100644 --- a/google/cloud/trace/v2/internal/trace_stub.h +++ b/google/cloud/trace/v2/internal/trace_stub.h @@ -22,7 +22,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v2/internal/trace_stub_factory.cc b/google/cloud/trace/v2/internal/trace_stub_factory.cc index 08d2af62e6166..cd345a37eb4c0 100644 --- a/google/cloud/trace/v2/internal/trace_stub_factory.cc +++ b/google/cloud/trace/v2/internal/trace_stub_factory.cc @@ -28,7 +28,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include #include diff --git a/google/cloud/trace/v2/internal/trace_tracing_connection.cc b/google/cloud/trace/v2/internal/trace_tracing_connection.cc index 2a2dc9a4d7534..78caf5c32e7f2 100644 --- a/google/cloud/trace/v2/internal/trace_tracing_connection.cc +++ b/google/cloud/trace/v2/internal/trace_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace trace_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TraceServiceTracingConnection::TraceServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -49,16 +47,12 @@ TraceServiceTracingConnection::CreateSpan( return internal::EndSpan(*span, child_->CreateSpan(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTraceServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/trace/v2/internal/trace_tracing_connection.h b/google/cloud/trace/v2/internal/trace_tracing_connection.h index 4fd336fd36ec2..994aeec34f253 100644 --- a/google/cloud/trace/v2/internal/trace_tracing_connection.h +++ b/google/cloud/trace/v2/internal/trace_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace trace_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TraceServiceTracingConnection : public trace_v2::TraceServiceConnection { public: ~TraceServiceTracingConnection() override = default; @@ -50,8 +48,6 @@ class TraceServiceTracingConnection : public trace_v2::TraceServiceConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/trace/v2/internal/trace_tracing_stub.cc b/google/cloud/trace/v2/internal/trace_tracing_stub.cc index 78a3e41f3ac8b..ad56ac7a92f78 100644 --- a/google/cloud/trace/v2/internal/trace_tracing_stub.cc +++ b/google/cloud/trace/v2/internal/trace_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace trace_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TraceServiceTracingStub::TraceServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -55,15 +53,9 @@ TraceServiceTracingStub::CreateSpan( child_->CreateSpan(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTraceServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/trace/v2/internal/trace_tracing_stub.h b/google/cloud/trace/v2/internal/trace_tracing_stub.h index 1313e93d6aaa7..dcd85f90dd50f 100644 --- a/google/cloud/trace/v2/internal/trace_tracing_stub.h +++ b/google/cloud/trace/v2/internal/trace_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace trace_v2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TraceServiceTracingStub : public TraceServiceStub { public: ~TraceServiceTracingStub() override = default; @@ -53,8 +51,6 @@ class TraceServiceTracingStub : public TraceServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/trace/v2/trace_connection.h b/google/cloud/trace/v2/trace_connection.h index cdf9dbad28684..db91d718417a3 100644 --- a/google/cloud/trace/v2/trace_connection.h +++ b/google/cloud/trace/v2/trace_connection.h @@ -26,7 +26,7 @@ #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.pb.h" #include namespace google { diff --git a/google/cloud/trace/v2/trace_connection_idempotency_policy.h b/google/cloud/trace/v2/trace_connection_idempotency_policy.h index e48cbb1f7498b..2fb81f611cf57 100644 --- a/google/cloud/trace/v2/trace_connection_idempotency_policy.h +++ b/google/cloud/trace/v2/trace_connection_idempotency_policy.h @@ -21,7 +21,7 @@ #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include +#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" #include namespace google { diff --git a/google/cloud/translate/BUILD.bazel b/google/cloud/translate/BUILD.bazel index 26658ea670c41..0bf766a185558 100644 --- a/google/cloud/translate/BUILD.bazel +++ b/google/cloud/translate/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/translate/v3:translation_cc_grpc", + "@googleapis//google/cloud/translate/v3:translation_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/translate/quickstart/.bazelrc b/google/cloud/translate/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/translate/quickstart/.bazelrc +++ b/google/cloud/translate/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/translate/v3/internal/translation_auth_decorator.cc b/google/cloud/translate/v3/internal/translation_auth_decorator.cc index df2ac7447f32e..e1395644da8b2 100644 --- a/google/cloud/translate/v3/internal/translation_auth_decorator.cc +++ b/google/cloud/translate/v3/internal/translation_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/translate/v3/translation_service.proto #include "google/cloud/translate/v3/internal/translation_auth_decorator.h" -#include +#include "google/cloud/translate/v3/translation_service.grpc.pb.h" #include #include diff --git a/google/cloud/translate/v3/internal/translation_auth_decorator.h b/google/cloud/translate/v3/internal/translation_auth_decorator.h index 9504511aa2aab..cbfcc4d654259 100644 --- a/google/cloud/translate/v3/internal/translation_auth_decorator.h +++ b/google/cloud/translate/v3/internal/translation_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/translate/v3/internal/translation_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/translate/v3/internal/translation_connection_impl.h b/google/cloud/translate/v3/internal/translation_connection_impl.h index b359ee0d56d5d..7c175d7926c67 100644 --- a/google/cloud/translate/v3/internal/translation_connection_impl.h +++ b/google/cloud/translate/v3/internal/translation_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/translate/v3/internal/translation_logging_decorator.cc b/google/cloud/translate/v3/internal/translation_logging_decorator.cc index 06145cc6a7394..336cc5450a204 100644 --- a/google/cloud/translate/v3/internal/translation_logging_decorator.cc +++ b/google/cloud/translate/v3/internal/translation_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/translate/v3/translation_service.proto #include "google/cloud/translate/v3/internal/translation_logging_decorator.h" +#include "google/cloud/translate/v3/translation_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/translate/v3/internal/translation_logging_decorator.h b/google/cloud/translate/v3/internal/translation_logging_decorator.h index af943aea25d7d..e4ee7cfde53af 100644 --- a/google/cloud/translate/v3/internal/translation_logging_decorator.h +++ b/google/cloud/translate/v3/internal/translation_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/translate/v3/internal/translation_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/translate/v3/internal/translation_metadata_decorator.cc b/google/cloud/translate/v3/internal/translation_metadata_decorator.cc index 6c63c29b22e32..1656ca6d29b5b 100644 --- a/google/cloud/translate/v3/internal/translation_metadata_decorator.cc +++ b/google/cloud/translate/v3/internal/translation_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/translate/v3/translation_service.proto #include "google/cloud/translate/v3/internal/translation_metadata_decorator.h" +#include "google/cloud/translate/v3/translation_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 #include #include #include diff --git a/google/cloud/translate/v3/internal/translation_metadata_decorator.h b/google/cloud/translate/v3/internal/translation_metadata_decorator.h index bb6765e84e444..4ab063a072a6a 100644 --- a/google/cloud/translate/v3/internal/translation_metadata_decorator.h +++ b/google/cloud/translate/v3/internal/translation_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/translate/v3/internal/translation_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/translate/v3/internal/translation_stub.cc b/google/cloud/translate/v3/internal/translation_stub.cc index aed06074902e4..264f9cc1e9f55 100644 --- a/google/cloud/translate/v3/internal/translation_stub.cc +++ b/google/cloud/translate/v3/internal/translation_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/translate/v3/translation_service.proto #include "google/cloud/translate/v3/internal/translation_stub.h" +#include "google/cloud/translate/v3/translation_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/translate/v3/internal/translation_stub.h b/google/cloud/translate/v3/internal/translation_stub.h index 31c1f3307eeb1..7df4912cccf7a 100644 --- a/google/cloud/translate/v3/internal/translation_stub.h +++ b/google/cloud/translate/v3/internal/translation_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_V3_INTERNAL_TRANSLATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_V3_INTERNAL_TRANSLATION_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/translate/v3/translation_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/translate/v3/internal/translation_stub_factory.cc b/google/cloud/translate/v3/internal/translation_stub_factory.cc index a714758e81371..ac1a035f8ceae 100644 --- a/google/cloud/translate/v3/internal/translation_stub_factory.cc +++ b/google/cloud/translate/v3/internal/translation_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/translate/v3/translation_service.proto #include "google/cloud/translate/v3/internal/translation_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/translate/v3/internal/translation_auth_decorator.h" #include "google/cloud/translate/v3/internal/translation_logging_decorator.h" #include "google/cloud/translate/v3/internal/translation_metadata_decorator.h" #include "google/cloud/translate/v3/internal/translation_stub.h" #include "google/cloud/translate/v3/internal/translation_tracing_stub.h" +#include "google/cloud/translate/v3/translation_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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/translate/v3/internal/translation_tracing_connection.cc b/google/cloud/translate/v3/internal/translation_tracing_connection.cc index 60b2bc026667c..c6406c2d12f86 100644 --- a/google/cloud/translate/v3/internal/translation_tracing_connection.cc +++ b/google/cloud/translate/v3/internal/translation_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace translate_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TranslationServiceTracingConnection::TranslationServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -683,17 +681,13 @@ TranslationServiceTracingConnection::WaitOperation( return internal::EndSpan(*span, child_->WaitOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTranslationServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/translate/v3/internal/translation_tracing_connection.h b/google/cloud/translate/v3/internal/translation_tracing_connection.h index dd0d1fff38fa0..45a656593961e 100644 --- a/google/cloud/translate/v3/internal/translation_tracing_connection.h +++ b/google/cloud/translate/v3/internal/translation_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace translate_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TranslationServiceTracingConnection : public translate_v3::TranslationServiceConnection { public: @@ -313,8 +311,6 @@ class TranslationServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/translate/v3/internal/translation_tracing_stub.cc b/google/cloud/translate/v3/internal/translation_tracing_stub.cc index 15a512b2d569d..74434eac4bff0 100644 --- a/google/cloud/translate/v3/internal/translation_tracing_stub.cc +++ b/google/cloud/translate/v3/internal/translation_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace translate_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TranslationServiceTracingStub::TranslationServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -776,15 +774,9 @@ future TranslationServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTranslationServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/translate/v3/internal/translation_tracing_stub.h b/google/cloud/translate/v3/internal/translation_tracing_stub.h index 0d42aa22cb63e..0f29d19306edd 100644 --- a/google/cloud/translate/v3/internal/translation_tracing_stub.h +++ b/google/cloud/translate/v3/internal/translation_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace translate_v3_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TranslationServiceTracingStub : public TranslationServiceStub { public: ~TranslationServiceTracingStub() override = default; @@ -361,8 +359,6 @@ class TranslationServiceTracingStub : public TranslationServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/translate/v3/translation_client.h b/google/cloud/translate/v3/translation_client.h index 4749c8726b551..d210d93696be1 100644 --- a/google/cloud/translate/v3/translation_client.h +++ b/google/cloud/translate/v3/translation_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/translate/v3/translation_connection.h b/google/cloud/translate/v3/translation_connection.h index c5f5552c29c61..b6bc8efa3ddfb 100644 --- a/google/cloud/translate/v3/translation_connection.h +++ b/google/cloud/translate/v3/translation_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/translate/v3/internal/translation_retry_traits.h" #include "google/cloud/translate/v3/translation_connection_idempotency_policy.h" +#include "google/cloud/translate/v3/translation_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/translate/v3/translation_connection_idempotency_policy.h b/google/cloud/translate/v3/translation_connection_idempotency_policy.h index 0b0c3d499fe1d..6d534dfb12915 100644 --- a/google/cloud/translate/v3/translation_connection_idempotency_policy.h +++ b/google/cloud/translate/v3/translation_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_V3_TRANSLATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_V3_TRANSLATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/translate/v3/translation_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/universe_domain/integration_tests/BUILD.bazel b/google/cloud/universe_domain/integration_tests/BUILD.bazel index d566417998d08..91466c1b3169a 100644 --- a/google/cloud/universe_domain/integration_tests/BUILD.bazel +++ b/google/cloud/universe_domain/integration_tests/BUILD.bazel @@ -30,8 +30,8 @@ cc_test( "//:common", "//:universe_domain", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", "@google_cloud_cpp//:compute", "@google_cloud_cpp//:kms", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/video/BUILD.bazel b/google/cloud/video/BUILD.bazel index 0645dff9ae20b..de59b60b1aba5 100644 --- a/google/cloud/video/BUILD.bazel +++ b/google/cloud/video/BUILD.bazel @@ -26,9 +26,9 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/video/livestream/v1:livestream_cc_grpc", - "@com_google_googleapis//google/cloud/video/stitcher/v1:stitcher_cc_grpc", - "@com_google_googleapis//google/cloud/video/transcoder/v1:transcoder_cc_grpc", + "@googleapis//google/cloud/video/livestream/v1:livestream_cc_grpc", + "@googleapis//google/cloud/video/stitcher/v1:stitcher_cc_grpc", + "@googleapis//google/cloud/video/transcoder/v1:transcoder_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.cc b/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.cc index 99b31020a71ac..23e1433ea504c 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/video/livestream/v1/service.proto #include "google/cloud/video/livestream/v1/internal/livestream_auth_decorator.h" -#include +#include "google/cloud/video/livestream/v1/service.grpc.pb.h" #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.h b/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.h index 31c73b783ffc1..398b161db2a40 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.h +++ b/google/cloud/video/livestream/v1/internal/livestream_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/video/livestream/v1/internal/livestream_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_connection_impl.h b/google/cloud/video/livestream/v1/internal/livestream_connection_impl.h index 219b038ce8499..2feafc3bb1d35 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_connection_impl.h +++ b/google/cloud/video/livestream/v1/internal/livestream_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.cc b/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.cc index c75665e1c2ac6..124a94a3954f0 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/video/livestream/v1/service.proto #include "google/cloud/video/livestream/v1/internal/livestream_logging_decorator.h" +#include "google/cloud/video/livestream/v1/service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.h b/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.h index 3513c6ce0901d..c8bcf18afb0a6 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.h +++ b/google/cloud/video/livestream/v1/internal/livestream_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/video/livestream/v1/internal/livestream_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.cc b/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.cc index ee103d3434eeb..37227544d2bb4 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/video/livestream/v1/service.proto #include "google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.h" +#include "google/cloud/video/livestream/v1/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 #include #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.h b/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.h index 5368cc30590b3..f448537af3c68 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.h +++ b/google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/video/livestream/v1/internal/livestream_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_stub.cc b/google/cloud/video/livestream/v1/internal/livestream_stub.cc index cd4636a760dda..d2b6dba7bece3 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_stub.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/video/livestream/v1/service.proto #include "google/cloud/video/livestream/v1/internal/livestream_stub.h" +#include "google/cloud/video/livestream/v1/service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_stub.h b/google/cloud/video/livestream/v1/internal/livestream_stub.h index 3de9dddf1ba30..db688430bff0a 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_stub.h +++ b/google/cloud/video/livestream/v1/internal/livestream_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_V1_INTERNAL_LIVESTREAM_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_V1_INTERNAL_LIVESTREAM_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/video/livestream/v1/service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc b/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc index d26b5c68daf9d..7f555fcf4db15 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/video/livestream/v1/service.proto #include "google/cloud/video/livestream/v1/internal/livestream_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/video/livestream/v1/internal/livestream_auth_decorator.h" #include "google/cloud/video/livestream/v1/internal/livestream_logging_decorator.h" #include "google/cloud/video/livestream/v1/internal/livestream_metadata_decorator.h" #include "google/cloud/video/livestream/v1/internal/livestream_stub.h" #include "google/cloud/video/livestream/v1/internal/livestream_tracing_stub.h" +#include "google/cloud/video/livestream/v1/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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc b/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc index dd220ca4e5464..27297cf88a5f5 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace video_livestream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LivestreamServiceTracingConnection::LivestreamServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -774,17 +772,13 @@ Status LivestreamServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLivestreamServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.h b/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.h index 93cb208ecbe05..850315a6dc2dd 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.h +++ b/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace video_livestream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LivestreamServiceTracingConnection : public video_livestream_v1::LivestreamServiceConnection { public: @@ -352,8 +350,6 @@ class LivestreamServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc b/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc index f793776ad0bc7..a03821ca41237 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace video_livestream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - LivestreamServiceTracingStub::LivestreamServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -807,15 +805,9 @@ future LivestreamServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeLivestreamServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.h b/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.h index 5d039688baefe..7d0e8ef5fda6c 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.h +++ b/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace video_livestream_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class LivestreamServiceTracingStub : public LivestreamServiceStub { public: ~LivestreamServiceTracingStub() override = default; @@ -378,8 +376,6 @@ class LivestreamServiceTracingStub : public LivestreamServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/video/livestream/v1/livestream_client.h b/google/cloud/video/livestream/v1/livestream_client.h index ecd259feade87..734068a383b42 100644 --- a/google/cloud/video/livestream/v1/livestream_client.h +++ b/google/cloud/video/livestream/v1/livestream_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/livestream/v1/livestream_connection.h b/google/cloud/video/livestream/v1/livestream_connection.h index a683cc15903ff..8bd63ac7c412f 100644 --- a/google/cloud/video/livestream/v1/livestream_connection.h +++ b/google/cloud/video/livestream/v1/livestream_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/video/livestream/v1/internal/livestream_retry_traits.h" #include "google/cloud/video/livestream/v1/livestream_connection_idempotency_policy.h" +#include "google/cloud/video/livestream/v1/service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/video/livestream/v1/livestream_connection_idempotency_policy.h b/google/cloud/video/livestream/v1/livestream_connection_idempotency_policy.h index ffb13a32e5ddb..f4518c052d3ff 100644 --- a/google/cloud/video/livestream/v1/livestream_connection_idempotency_policy.h +++ b/google/cloud/video/livestream/v1/livestream_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_V1_LIVESTREAM_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_V1_LIVESTREAM_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/video/livestream/v1/service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/video/quickstart/.bazelrc b/google/cloud/video/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/video/quickstart/.bazelrc +++ b/google/cloud/video/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.cc index 5cc315f8e23f6..7d538a20f8049 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/video/stitcher/v1/video_stitcher_service.proto #include "google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.h" -#include +#include "google/cloud/video/stitcher/v1/video_stitcher_service.grpc.pb.h" #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.h index 563f464d358a2..b430cdfc7100d 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_connection_impl.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_connection_impl.h index 3523612f19fe4..b472b8fbd174f 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_connection_impl.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.cc index 11f059eee2f68..2b968cfd8dc49 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/video/stitcher/v1/video_stitcher_service.proto #include "google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.h" +#include "google/cloud/video/stitcher/v1/video_stitcher_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.h index c632efaaca40d..31d17c55f014f 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.cc index 37a7ef5e45bc4..9d59a5f75827d 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/video/stitcher/v1/video_stitcher_service.proto #include "google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.h" +#include "google/cloud/video/stitcher/v1/video_stitcher_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 #include #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.h index 80834c1bc2074..d8014313616b6 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc index ff6895c41746d..b6f37da2a2df9 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/video/stitcher/v1/video_stitcher_service.proto #include "google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h" +#include "google/cloud/video/stitcher/v1/video_stitcher_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h index a51a4f06b96d8..6872729fa2c09 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_STITCHER_V1_INTERNAL_VIDEO_STITCHER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_STITCHER_V1_INTERNAL_VIDEO_STITCHER_STUB_H +#include "google/cloud/video/stitcher/v1/video_stitcher_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc index f465cb88f44ba..b36733a80af7c 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/video/stitcher/v1/internal/video_stitcher_metadata_decorator.h" #include "google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h" #include "google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.h" +#include "google/cloud/video/stitcher/v1/video_stitcher_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc index 1a75d9648dd1d..8673801e2456a 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace video_stitcher_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VideoStitcherServiceTracingConnection::VideoStitcherServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -610,17 +608,13 @@ Status VideoStitcherServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVideoStitcherServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.h index b6bafe487ed7d..c248ae784c991 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace video_stitcher_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VideoStitcherServiceTracingConnection : public video_stitcher_v1::VideoStitcherServiceConnection { public: @@ -282,8 +280,6 @@ class VideoStitcherServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc index e11682c414695..bf709c286e8c2 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace video_stitcher_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VideoStitcherServiceTracingStub::VideoStitcherServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -668,15 +666,9 @@ future VideoStitcherServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVideoStitcherServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.h index 72173df39ce7c..d46863e27c028 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace video_stitcher_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VideoStitcherServiceTracingStub : public VideoStitcherServiceStub { public: ~VideoStitcherServiceTracingStub() override = default; @@ -315,8 +313,6 @@ class VideoStitcherServiceTracingStub : public VideoStitcherServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/video/stitcher/v1/video_stitcher_client.h b/google/cloud/video/stitcher/v1/video_stitcher_client.h index 9ad7b1c43e54c..2169c23fe71e6 100644 --- a/google/cloud/video/stitcher/v1/video_stitcher_client.h +++ b/google/cloud/video/stitcher/v1/video_stitcher_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/video/stitcher/v1/video_stitcher_connection.h b/google/cloud/video/stitcher/v1/video_stitcher_connection.h index def48d7fce5f9..946a3d9b7ce7b 100644 --- a/google/cloud/video/stitcher/v1/video_stitcher_connection.h +++ b/google/cloud/video/stitcher/v1/video_stitcher_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/video/stitcher/v1/internal/video_stitcher_retry_traits.h" #include "google/cloud/video/stitcher/v1/video_stitcher_connection_idempotency_policy.h" +#include "google/cloud/video/stitcher/v1/video_stitcher_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/video/stitcher/v1/video_stitcher_connection_idempotency_policy.h b/google/cloud/video/stitcher/v1/video_stitcher_connection_idempotency_policy.h index 65211da76256a..2f2342f9e98ed 100644 --- a/google/cloud/video/stitcher/v1/video_stitcher_connection_idempotency_policy.h +++ b/google/cloud/video/stitcher/v1/video_stitcher_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_STITCHER_V1_VIDEO_STITCHER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_STITCHER_V1_VIDEO_STITCHER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/video/stitcher/v1/video_stitcher_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_auth_decorator.cc b/google/cloud/video/transcoder/v1/internal/transcoder_auth_decorator.cc index bf6646a11f16d..cf57bf30b70ef 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_auth_decorator.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/video/transcoder/v1/services.proto #include "google/cloud/video/transcoder/v1/internal/transcoder_auth_decorator.h" -#include +#include "google/cloud/video/transcoder/v1/services.grpc.pb.h" #include #include diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_logging_decorator.cc b/google/cloud/video/transcoder/v1/internal/transcoder_logging_decorator.cc index dc35330916f64..7149056d4e9da 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_logging_decorator.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/video/transcoder/v1/services.proto #include "google/cloud/video/transcoder/v1/internal/transcoder_logging_decorator.h" +#include "google/cloud/video/transcoder/v1/services.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_metadata_decorator.cc b/google/cloud/video/transcoder/v1/internal/transcoder_metadata_decorator.cc index b8f417b7c23fb..6a7a63cb95ecc 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_metadata_decorator.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/video/transcoder/v1/services.proto #include "google/cloud/video/transcoder/v1/internal/transcoder_metadata_decorator.h" +#include "google/cloud/video/transcoder/v1/services.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 #include #include #include diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_stub.cc b/google/cloud/video/transcoder/v1/internal/transcoder_stub.cc index e2358f9d0d25f..32593bf0add7a 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_stub.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/video/transcoder/v1/services.proto #include "google/cloud/video/transcoder/v1/internal/transcoder_stub.h" +#include "google/cloud/video/transcoder/v1/services.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_stub.h b/google/cloud/video/transcoder/v1/internal/transcoder_stub.h index a98fc22290da1..25c70b02efa36 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_stub.h +++ b/google/cloud/video/transcoder/v1/internal/transcoder_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_V1_INTERNAL_TRANSCODER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_V1_INTERNAL_TRANSCODER_STUB_H +#include "google/cloud/video/transcoder/v1/services.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_stub_factory.cc b/google/cloud/video/transcoder/v1/internal/transcoder_stub_factory.cc index 419f4e1c2e967..ac779e6886b2b 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_stub_factory.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/video/transcoder/v1/internal/transcoder_metadata_decorator.h" #include "google/cloud/video/transcoder/v1/internal/transcoder_stub.h" #include "google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.h" +#include "google/cloud/video/transcoder/v1/services.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 #include #include diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc index 7a6a467f0dcd3..7bf10a3d50718 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace video_transcoder_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TranscoderServiceTracingConnection::TranscoderServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -112,17 +110,13 @@ Status TranscoderServiceTracingConnection::DeleteJobTemplate( return internal::EndSpan(*span, child_->DeleteJobTemplate(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTranscoderServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.h b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.h index f8b8dcf80591d..51cd6a30f27c9 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.h +++ b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace video_transcoder_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TranscoderServiceTracingConnection : public video_transcoder_v1::TranscoderServiceConnection { public: @@ -74,8 +72,6 @@ class TranscoderServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.cc b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.cc index 645ebcc29d2d6..c9b1bb3e22fc2 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace video_transcoder_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - TranscoderServiceTracingStub::TranscoderServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -132,15 +130,9 @@ Status TranscoderServiceTracingStub::DeleteJobTemplate( context, *span, child_->DeleteJobTemplate(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeTranscoderServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.h b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.h index ac475ea2c60ff..1f51f5e8fb15d 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.h +++ b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace video_transcoder_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class TranscoderServiceTracingStub : public TranscoderServiceStub { public: ~TranscoderServiceTracingStub() override = default; @@ -85,8 +83,6 @@ class TranscoderServiceTracingStub : public TranscoderServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/video/transcoder/v1/transcoder_connection.h b/google/cloud/video/transcoder/v1/transcoder_connection.h index ba26962f261d0..c059eebaea2d5 100644 --- a/google/cloud/video/transcoder/v1/transcoder_connection.h +++ b/google/cloud/video/transcoder/v1/transcoder_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_V1_TRANSCODER_CONNECTION_H #include "google/cloud/video/transcoder/v1/internal/transcoder_retry_traits.h" +#include "google/cloud/video/transcoder/v1/services.pb.h" #include "google/cloud/video/transcoder/v1/transcoder_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/video/transcoder/v1/transcoder_connection_idempotency_policy.h b/google/cloud/video/transcoder/v1/transcoder_connection_idempotency_policy.h index c5bfcacf14e75..8d888abe32ff5 100644 --- a/google/cloud/video/transcoder/v1/transcoder_connection_idempotency_policy.h +++ b/google/cloud/video/transcoder/v1/transcoder_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_V1_TRANSCODER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_V1_TRANSCODER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/video/transcoder/v1/services.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/videointelligence/BUILD.bazel b/google/cloud/videointelligence/BUILD.bazel index 9bb8d201de31e..0899dcaedd51e 100644 --- a/google/cloud/videointelligence/BUILD.bazel +++ b/google/cloud/videointelligence/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/videointelligence/v1:videointelligence_cc_grpc", + "@googleapis//google/cloud/videointelligence/v1:videointelligence_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/videointelligence/quickstart/.bazelrc b/google/cloud/videointelligence/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/videointelligence/quickstart/.bazelrc +++ b/google/cloud/videointelligence/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.cc index a9c74676ecc98..52cf20022e972 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/videointelligence/v1/video_intelligence.proto #include "google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.h" -#include +#include "google/cloud/videointelligence/v1/video_intelligence.grpc.pb.h" #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.h b/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.h index 883050768733c..2e73e932211d5 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/videointelligence/v1/internal/video_intelligence_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_connection_impl.h b/google/cloud/videointelligence/v1/internal/video_intelligence_connection_impl.h index 5f14e13459663..ad42f7b778d06 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_connection_impl.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.cc index 733a631dde268..c1d0b96bd18b8 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/videointelligence/v1/video_intelligence.proto #include "google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.h" +#include "google/cloud/videointelligence/v1/video_intelligence.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.h b/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.h index 2283912e9888b..53b16e882eb16 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/videointelligence/v1/internal/video_intelligence_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.cc index f8cef953e940e..84bcd8f4ce9de 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/videointelligence/v1/video_intelligence.proto #include "google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.h" +#include "google/cloud/videointelligence/v1/video_intelligence.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 #include #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.h b/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.h index f809250c095ee..e4ab4cdf1452d 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/videointelligence/v1/internal/video_intelligence_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc index 56bf7124c77ea..377d20f65ba90 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/videointelligence/v1/video_intelligence.proto #include "google/cloud/videointelligence/v1/internal/video_intelligence_stub.h" +#include "google/cloud/videointelligence/v1/video_intelligence.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h index 06ba3bd07bae1..b3b4e23a6e05c 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_V1_INTERNAL_VIDEO_INTELLIGENCE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_V1_INTERNAL_VIDEO_INTELLIGENCE_STUB_H +#include "google/cloud/videointelligence/v1/video_intelligence.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_stub_factory.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_stub_factory.cc index 3e6e76b339ce5..7357d9d41b41b 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_stub_factory.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/videointelligence/v1/internal/video_intelligence_metadata_decorator.h" #include "google/cloud/videointelligence/v1/internal/video_intelligence_stub.h" #include "google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.h" +#include "google/cloud/videointelligence/v1/video_intelligence.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 #include #include diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc index cba4c192b43cb..aa0fe0a9aef0c 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace videointelligence_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VideoIntelligenceServiceTracingConnection:: VideoIntelligenceServiceTracingConnection( std::shared_ptr< @@ -66,18 +64,14 @@ VideoIntelligenceServiceTracingConnection::AnnotateVideo( return internal::EndSpan(std::move(span), child_->AnnotateVideo(operation)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVideoIntelligenceServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared( std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.h b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.h index a92ac5a2d9c5b..190c52c189d2c 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace videointelligence_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VideoIntelligenceServiceTracingConnection : public videointelligence_v1::VideoIntelligenceServiceConnection { public: @@ -59,8 +57,6 @@ class VideoIntelligenceServiceTracingConnection child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc index fc3414910785e..bfd24e156752f 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace videointelligence_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VideoIntelligenceServiceTracingStub::VideoIntelligenceServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -88,16 +86,10 @@ future VideoIntelligenceServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVideoIntelligenceServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.h b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.h index 267255854bf01..a18030b2291c7 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace videointelligence_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VideoIntelligenceServiceTracingStub : public VideoIntelligenceServiceStub { public: @@ -70,8 +68,6 @@ class VideoIntelligenceServiceTracingStub propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/videointelligence/v1/video_intelligence_client.h b/google/cloud/videointelligence/v1/video_intelligence_client.h index 6bef98cbf7120..f299e55ba7e4f 100644 --- a/google/cloud/videointelligence/v1/video_intelligence_client.h +++ b/google/cloud/videointelligence/v1/video_intelligence_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/videointelligence/v1/video_intelligence_connection.h b/google/cloud/videointelligence/v1/video_intelligence_connection.h index 792e3dec94a51..fd087e791b1e3 100644 --- a/google/cloud/videointelligence/v1/video_intelligence_connection.h +++ b/google/cloud/videointelligence/v1/video_intelligence_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_V1_VIDEO_INTELLIGENCE_CONNECTION_H #include "google/cloud/videointelligence/v1/internal/video_intelligence_retry_traits.h" +#include "google/cloud/videointelligence/v1/video_intelligence.pb.h" #include "google/cloud/videointelligence/v1/video_intelligence_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -29,8 +30,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/videointelligence/v1/video_intelligence_connection_idempotency_policy.h b/google/cloud/videointelligence/v1/video_intelligence_connection_idempotency_policy.h index e3ae79f75c687..2f0fadb12f2b8 100644 --- a/google/cloud/videointelligence/v1/video_intelligence_connection_idempotency_policy.h +++ b/google/cloud/videointelligence/v1/video_intelligence_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_V1_VIDEO_INTELLIGENCE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_V1_VIDEO_INTELLIGENCE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/videointelligence/v1/video_intelligence.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/vision/BUILD.bazel b/google/cloud/vision/BUILD.bazel index fcd3c20a2f22d..234f788a2d292 100644 --- a/google/cloud/vision/BUILD.bazel +++ b/google/cloud/vision/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/vision/v1:vision_cc_grpc", + "@googleapis//google/cloud/vision/v1:vision_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/vision/quickstart/.bazelrc b/google/cloud/vision/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/vision/quickstart/.bazelrc +++ b/google/cloud/vision/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/vision/v1/image_annotator_client.h b/google/cloud/vision/v1/image_annotator_client.h index be7279ae998b9..71dc19ada0f05 100644 --- a/google/cloud/vision/v1/image_annotator_client.h +++ b/google/cloud/vision/v1/image_annotator_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/image_annotator_connection.h b/google/cloud/vision/v1/image_annotator_connection.h index f0609a64ae56e..5cddd72a13844 100644 --- a/google/cloud/vision/v1/image_annotator_connection.h +++ b/google/cloud/vision/v1/image_annotator_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_IMAGE_ANNOTATOR_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_IMAGE_ANNOTATOR_CONNECTION_H +#include "google/cloud/vision/v1/image_annotator.pb.h" #include "google/cloud/vision/v1/image_annotator_connection_idempotency_policy.h" #include "google/cloud/vision/v1/internal/image_annotator_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -29,8 +30,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vision/v1/image_annotator_connection_idempotency_policy.h b/google/cloud/vision/v1/image_annotator_connection_idempotency_policy.h index 2b7be1118f605..659d9f0fb0fd1 100644 --- a/google/cloud/vision/v1/image_annotator_connection_idempotency_policy.h +++ b/google/cloud/vision/v1/image_annotator_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_IMAGE_ANNOTATOR_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_IMAGE_ANNOTATOR_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/vision/v1/image_annotator.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vision/v1/internal/image_annotator_auth_decorator.cc b/google/cloud/vision/v1/internal/image_annotator_auth_decorator.cc index 8ed299230a91f..85dbd99358a65 100644 --- a/google/cloud/vision/v1/internal/image_annotator_auth_decorator.cc +++ b/google/cloud/vision/v1/internal/image_annotator_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/vision/v1/image_annotator.proto #include "google/cloud/vision/v1/internal/image_annotator_auth_decorator.h" -#include +#include "google/cloud/vision/v1/image_annotator.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_auth_decorator.h b/google/cloud/vision/v1/internal/image_annotator_auth_decorator.h index 3f62ed6da4643..77dc93b546000 100644 --- a/google/cloud/vision/v1/internal/image_annotator_auth_decorator.h +++ b/google/cloud/vision/v1/internal/image_annotator_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vision/v1/internal/image_annotator_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_connection_impl.h b/google/cloud/vision/v1/internal/image_annotator_connection_impl.h index be26c56021a96..e6a940d5c86e5 100644 --- a/google/cloud/vision/v1/internal/image_annotator_connection_impl.h +++ b/google/cloud/vision/v1/internal/image_annotator_connection_impl.h @@ -31,7 +31,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vision/v1/internal/image_annotator_logging_decorator.cc b/google/cloud/vision/v1/internal/image_annotator_logging_decorator.cc index b3ae2a4f84ff2..cd149d826dbe1 100644 --- a/google/cloud/vision/v1/internal/image_annotator_logging_decorator.cc +++ b/google/cloud/vision/v1/internal/image_annotator_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/vision/v1/image_annotator.proto #include "google/cloud/vision/v1/internal/image_annotator_logging_decorator.h" +#include "google/cloud/vision/v1/image_annotator.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_logging_decorator.h b/google/cloud/vision/v1/internal/image_annotator_logging_decorator.h index aaea856d8ed7c..4db2fe9b6f16d 100644 --- a/google/cloud/vision/v1/internal/image_annotator_logging_decorator.h +++ b/google/cloud/vision/v1/internal/image_annotator_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vision/v1/internal/image_annotator_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.cc b/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.cc index 6bab26c074210..fb2e6a1f2edb7 100644 --- a/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.cc +++ b/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/vision/v1/image_annotator.proto #include "google/cloud/vision/v1/internal/image_annotator_metadata_decorator.h" +#include "google/cloud/vision/v1/image_annotator.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 #include #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.h b/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.h index ede69394b2e08..0f73fd97d4373 100644 --- a/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.h +++ b/google/cloud/vision/v1/internal/image_annotator_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vision/v1/internal/image_annotator_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_stub.cc b/google/cloud/vision/v1/internal/image_annotator_stub.cc index f4525e14b5789..ea0a61a234d8e 100644 --- a/google/cloud/vision/v1/internal/image_annotator_stub.cc +++ b/google/cloud/vision/v1/internal/image_annotator_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/vision/v1/image_annotator.proto #include "google/cloud/vision/v1/internal/image_annotator_stub.h" +#include "google/cloud/vision/v1/image_annotator.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_stub.h b/google/cloud/vision/v1/internal/image_annotator_stub.h index 17660ea21af4f..9c544ad43da23 100644 --- a/google/cloud/vision/v1/internal/image_annotator_stub.h +++ b/google/cloud/vision/v1/internal/image_annotator_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_INTERNAL_IMAGE_ANNOTATOR_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_INTERNAL_IMAGE_ANNOTATOR_STUB_H +#include "google/cloud/vision/v1/image_annotator.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc b/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc index eb09e92277032..3c9c6c9fe020e 100644 --- a/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc +++ b/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/vision/v1/image_annotator.proto #include "google/cloud/vision/v1/internal/image_annotator_stub_factory.h" +#include "google/cloud/vision/v1/image_annotator.grpc.pb.h" #include "google/cloud/vision/v1/internal/image_annotator_auth_decorator.h" #include "google/cloud/vision/v1/internal/image_annotator_logging_decorator.h" #include "google/cloud/vision/v1/internal/image_annotator_metadata_decorator.h" @@ -28,8 +29,7 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc b/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc index d3f9a586c1eed..cdff7f11eb2d1 100644 --- a/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc +++ b/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc @@ -26,8 +26,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ImageAnnotatorTracingConnection::ImageAnnotatorTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -121,16 +119,12 @@ ImageAnnotatorTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeImageAnnotatorTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/vision/v1/internal/image_annotator_tracing_connection.h b/google/cloud/vision/v1/internal/image_annotator_tracing_connection.h index f6909c98911e7..ad23b784bd53e 100644 --- a/google/cloud/vision/v1/internal/image_annotator_tracing_connection.h +++ b/google/cloud/vision/v1/internal/image_annotator_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ImageAnnotatorTracingConnection : public vision_v1::ImageAnnotatorConnection { public: @@ -84,8 +82,6 @@ class ImageAnnotatorTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc b/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc index cefdb9eff1555..d52923898000d 100644 --- a/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc +++ b/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ImageAnnotatorTracingStub::ImageAnnotatorTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -152,15 +150,9 @@ future ImageAnnotatorTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeImageAnnotatorTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vision/v1/internal/image_annotator_tracing_stub.h b/google/cloud/vision/v1/internal/image_annotator_tracing_stub.h index f3d469ae3b9aa..de6c898bfbd3c 100644 --- a/google/cloud/vision/v1/internal/image_annotator_tracing_stub.h +++ b/google/cloud/vision/v1/internal/image_annotator_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ImageAnnotatorTracingStub : public ImageAnnotatorStub { public: ~ImageAnnotatorTracingStub() override = default; @@ -96,8 +94,6 @@ class ImageAnnotatorTracingStub : public ImageAnnotatorStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/vision/v1/internal/product_search_auth_decorator.cc b/google/cloud/vision/v1/internal/product_search_auth_decorator.cc index f791395f3068d..9fc9775bc16b5 100644 --- a/google/cloud/vision/v1/internal/product_search_auth_decorator.cc +++ b/google/cloud/vision/v1/internal/product_search_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/vision/v1/product_search_service.proto #include "google/cloud/vision/v1/internal/product_search_auth_decorator.h" -#include +#include "google/cloud/vision/v1/product_search_service.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/product_search_auth_decorator.h b/google/cloud/vision/v1/internal/product_search_auth_decorator.h index f6d889454d4bd..9f8e8a7647c1b 100644 --- a/google/cloud/vision/v1/internal/product_search_auth_decorator.h +++ b/google/cloud/vision/v1/internal/product_search_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vision/v1/internal/product_search_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/internal/product_search_connection_impl.h b/google/cloud/vision/v1/internal/product_search_connection_impl.h index d524a138d580f..42e3d79ab2598 100644 --- a/google/cloud/vision/v1/internal/product_search_connection_impl.h +++ b/google/cloud/vision/v1/internal/product_search_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vision/v1/internal/product_search_logging_decorator.cc b/google/cloud/vision/v1/internal/product_search_logging_decorator.cc index 538196e0d2dd6..88b936738047f 100644 --- a/google/cloud/vision/v1/internal/product_search_logging_decorator.cc +++ b/google/cloud/vision/v1/internal/product_search_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/vision/v1/product_search_service.proto #include "google/cloud/vision/v1/internal/product_search_logging_decorator.h" +#include "google/cloud/vision/v1/product_search_service.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/vision/v1/internal/product_search_logging_decorator.h b/google/cloud/vision/v1/internal/product_search_logging_decorator.h index 0769e972b87f2..4a521cb095899 100644 --- a/google/cloud/vision/v1/internal/product_search_logging_decorator.h +++ b/google/cloud/vision/v1/internal/product_search_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vision/v1/internal/product_search_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/internal/product_search_metadata_decorator.cc b/google/cloud/vision/v1/internal/product_search_metadata_decorator.cc index 49775ca14c4c7..140ddb8523315 100644 --- a/google/cloud/vision/v1/internal/product_search_metadata_decorator.cc +++ b/google/cloud/vision/v1/internal/product_search_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/vision/v1/product_search_service.proto #include "google/cloud/vision/v1/internal/product_search_metadata_decorator.h" +#include "google/cloud/vision/v1/product_search_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 #include #include #include diff --git a/google/cloud/vision/v1/internal/product_search_metadata_decorator.h b/google/cloud/vision/v1/internal/product_search_metadata_decorator.h index 3ec33019079d5..4f78048d32c5f 100644 --- a/google/cloud/vision/v1/internal/product_search_metadata_decorator.h +++ b/google/cloud/vision/v1/internal/product_search_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vision/v1/internal/product_search_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vision/v1/internal/product_search_stub.cc b/google/cloud/vision/v1/internal/product_search_stub.cc index f316ab7c9bcac..dc311cc0027dc 100644 --- a/google/cloud/vision/v1/internal/product_search_stub.cc +++ b/google/cloud/vision/v1/internal/product_search_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/vision/v1/product_search_service.proto #include "google/cloud/vision/v1/internal/product_search_stub.h" +#include "google/cloud/vision/v1/product_search_service.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/product_search_stub.h b/google/cloud/vision/v1/internal/product_search_stub.h index 9c8ca490ef6bf..01c6e4745fabb 100644 --- a/google/cloud/vision/v1/internal/product_search_stub.h +++ b/google/cloud/vision/v1/internal/product_search_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_INTERNAL_PRODUCT_SEARCH_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_INTERNAL_PRODUCT_SEARCH_STUB_H +#include "google/cloud/vision/v1/product_search_service.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/product_search_stub_factory.cc b/google/cloud/vision/v1/internal/product_search_stub_factory.cc index 6694d6918548f..4fd2ce090df12 100644 --- a/google/cloud/vision/v1/internal/product_search_stub_factory.cc +++ b/google/cloud/vision/v1/internal/product_search_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/vision/v1/internal/product_search_metadata_decorator.h" #include "google/cloud/vision/v1/internal/product_search_stub.h" #include "google/cloud/vision/v1/internal/product_search_tracing_stub.h" +#include "google/cloud/vision/v1/product_search_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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/internal/product_search_tracing_connection.cc b/google/cloud/vision/v1/internal/product_search_tracing_connection.cc index cc9bc0c7bf52f..a6aa6117847fa 100644 --- a/google/cloud/vision/v1/internal/product_search_tracing_connection.cc +++ b/google/cloud/vision/v1/internal/product_search_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProductSearchTracingConnection::ProductSearchTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -258,16 +256,12 @@ ProductSearchTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProductSearchTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/vision/v1/internal/product_search_tracing_connection.h b/google/cloud/vision/v1/internal/product_search_tracing_connection.h index 4e085a40c25f2..1903a85c9214c 100644 --- a/google/cloud/vision/v1/internal/product_search_tracing_connection.h +++ b/google/cloud/vision/v1/internal/product_search_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProductSearchTracingConnection : public vision_v1::ProductSearchConnection { public: @@ -130,8 +128,6 @@ class ProductSearchTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/vision/v1/internal/product_search_tracing_stub.cc b/google/cloud/vision/v1/internal/product_search_tracing_stub.cc index 13de798f13617..4e23ada130d01 100644 --- a/google/cloud/vision/v1/internal/product_search_tracing_stub.cc +++ b/google/cloud/vision/v1/internal/product_search_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ProductSearchTracingStub::ProductSearchTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -327,15 +325,9 @@ future ProductSearchTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeProductSearchTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vision/v1/internal/product_search_tracing_stub.h b/google/cloud/vision/v1/internal/product_search_tracing_stub.h index eb17784b4cecd..94d19162e0558 100644 --- a/google/cloud/vision/v1/internal/product_search_tracing_stub.h +++ b/google/cloud/vision/v1/internal/product_search_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace vision_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ProductSearchTracingStub : public ProductSearchStub { public: ~ProductSearchTracingStub() override = default; @@ -163,8 +161,6 @@ class ProductSearchTracingStub : public ProductSearchStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/vision/v1/product_search_client.h b/google/cloud/vision/v1/product_search_client.h index f77cfe1e14c42..cecefd20ef321 100644 --- a/google/cloud/vision/v1/product_search_client.h +++ b/google/cloud/vision/v1/product_search_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vision/v1/product_search_connection.h b/google/cloud/vision/v1/product_search_connection.h index 5560cfd38983a..74d0a98975ada 100644 --- a/google/cloud/vision/v1/product_search_connection.h +++ b/google/cloud/vision/v1/product_search_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/vision/v1/internal/product_search_retry_traits.h" #include "google/cloud/vision/v1/product_search_connection_idempotency_policy.h" +#include "google/cloud/vision/v1/product_search_service.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vision/v1/product_search_connection_idempotency_policy.h b/google/cloud/vision/v1/product_search_connection_idempotency_policy.h index 332faacd18c66..ec8919300a0cc 100644 --- a/google/cloud/vision/v1/product_search_connection_idempotency_policy.h +++ b/google/cloud/vision/v1/product_search_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_PRODUCT_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_V1_PRODUCT_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/vision/v1/product_search_service.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vmmigration/BUILD.bazel b/google/cloud/vmmigration/BUILD.bazel index 1ab07a796fff6..1a054def4f03a 100644 --- a/google/cloud/vmmigration/BUILD.bazel +++ b/google/cloud/vmmigration/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/vmmigration/v1:vmmigration_cc_grpc", + "@googleapis//google/cloud/vmmigration/v1:vmmigration_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/vmmigration/quickstart/.bazelrc b/google/cloud/vmmigration/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/vmmigration/quickstart/.bazelrc +++ b/google/cloud/vmmigration/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.cc b/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.cc index 4ac661e114f13..370c1bda463cc 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/vmmigration/v1/vmmigration.proto #include "google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.h" -#include +#include "google/cloud/vmmigration/v1/vmmigration.grpc.pb.h" #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.h b/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.h index b3eec715d8141..288448a6c4198 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vmmigration/v1/internal/vm_migration_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_connection_impl.h b/google/cloud/vmmigration/v1/internal/vm_migration_connection_impl.h index 14b1484eefc82..fd1ff0736187e 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_connection_impl.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.cc b/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.cc index d7e52f8858bd1..ad31f5535f6c6 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/vmmigration/v1/vmmigration.proto #include "google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.h" +#include "google/cloud/vmmigration/v1/vmmigration.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.h b/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.h index 0b6925251b926..dbb1609abd339 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vmmigration/v1/internal/vm_migration_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.cc b/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.cc index 929672335e4e5..be3863a2b91fb 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/vmmigration/v1/vmmigration.proto #include "google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.h" +#include "google/cloud/vmmigration/v1/vmmigration.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 #include #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.h b/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.h index 0665707bf79f3..ec199dc18817c 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vmmigration/v1/internal/vm_migration_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc b/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc index ce4e3dcded3fe..0d941608a3343 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/vmmigration/v1/vmmigration.proto #include "google/cloud/vmmigration/v1/internal/vm_migration_stub.h" +#include "google/cloud/vmmigration/v1/vmmigration.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_stub.h b/google/cloud/vmmigration/v1/internal/vm_migration_stub.h index b0604125d58cc..6fdfb92f662dd 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_stub.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_V1_INTERNAL_VM_MIGRATION_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_V1_INTERNAL_VM_MIGRATION_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/vmmigration/v1/vmmigration.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc b/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc index 3e11e0d9eb3fc..ca10b82813583 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/vmmigration/v1/vmmigration.proto #include "google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/vmmigration/v1/internal/vm_migration_auth_decorator.h" #include "google/cloud/vmmigration/v1/internal/vm_migration_logging_decorator.h" #include "google/cloud/vmmigration/v1/internal/vm_migration_metadata_decorator.h" #include "google/cloud/vmmigration/v1/internal/vm_migration_stub.h" #include "google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.h" +#include "google/cloud/vmmigration/v1/vmmigration.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc index 976a40b058070..170738e80de9d 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace vmmigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VmMigrationTracingConnection::VmMigrationTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1457,16 +1455,12 @@ Status VmMigrationTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVmMigrationTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.h b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.h index e9d76afbc1398..e5bfe71df16b6 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace vmmigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VmMigrationTracingConnection : public vmmigration_v1::VmMigrationConnection { public: @@ -634,8 +632,6 @@ class VmMigrationTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc index 188f23c766bf8..b8ae8d2a0b388 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace vmmigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VmMigrationTracingStub::VmMigrationTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1434,15 +1432,9 @@ future VmMigrationTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVmMigrationTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.h b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.h index 6245c5d7e0d51..a17022d1df131 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace vmmigration_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VmMigrationTracingStub : public VmMigrationStub { public: ~VmMigrationTracingStub() override = default; @@ -655,8 +653,6 @@ class VmMigrationTracingStub : public VmMigrationStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/vmmigration/v1/vm_migration_client.h b/google/cloud/vmmigration/v1/vm_migration_client.h index 6de755e2e32a8..6c8b161584af4 100644 --- a/google/cloud/vmmigration/v1/vm_migration_client.h +++ b/google/cloud/vmmigration/v1/vm_migration_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmmigration/v1/vm_migration_connection.h b/google/cloud/vmmigration/v1/vm_migration_connection.h index 833b1b78c296c..bdc7f4360ac55 100644 --- a/google/cloud/vmmigration/v1/vm_migration_connection.h +++ b/google/cloud/vmmigration/v1/vm_migration_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/vmmigration/v1/internal/vm_migration_retry_traits.h" #include "google/cloud/vmmigration/v1/vm_migration_connection_idempotency_policy.h" +#include "google/cloud/vmmigration/v1/vmmigration.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vmmigration/v1/vm_migration_connection_idempotency_policy.h b/google/cloud/vmmigration/v1/vm_migration_connection_idempotency_policy.h index 96731d249b257..55c032a1eb807 100644 --- a/google/cloud/vmmigration/v1/vm_migration_connection_idempotency_policy.h +++ b/google/cloud/vmmigration/v1/vm_migration_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_V1_VM_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_V1_VM_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/vmmigration/v1/vmmigration.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vmwareengine/BUILD.bazel b/google/cloud/vmwareengine/BUILD.bazel index afeffa991623b..c04055c1a23f4 100644 --- a/google/cloud/vmwareengine/BUILD.bazel +++ b/google/cloud/vmwareengine/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/vmwareengine/v1:vmwareengine_cc_grpc", + "@googleapis//google/cloud/vmwareengine/v1:vmwareengine_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/vmwareengine/quickstart/.bazelrc b/google/cloud/vmwareengine/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/vmwareengine/quickstart/.bazelrc +++ b/google/cloud/vmwareengine/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.cc index b4bf3f5e4f434..409b230746b52 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/vmwareengine/v1/vmwareengine.proto #include "google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.h" -#include +#include "google/cloud/vmwareengine/v1/vmwareengine.grpc.pb.h" #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.h index a24eeed8567ca..141fe66c57b2a 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_connection_impl.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_connection_impl.h index e9ac82bb16df4..39b54e8c60b66 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_connection_impl.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.cc index aca7cfcb95fde..bbbc48f04f824 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/vmwareengine/v1/vmwareengine.proto #include "google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.h index bdf169955bcd3..4dae0561bdeff 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.cc index 4ab5aabe0576b..c1446d90c5679 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/vmwareengine/v1/vmwareengine.proto #include "google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.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 #include #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.h index 0b37015f6ac95..9e9eb1a108e89 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc index 136a97b13a8c4..db2d63195a077 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/vmwareengine/v1/vmwareengine.proto #include "google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h index a801623cc8905..94b3aa6d7f222 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h @@ -19,15 +19,15 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMWAREENGINE_V1_INTERNAL_VMWARE_ENGINE_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMWAREENGINE_V1_INTERNAL_VMWARE_ENGINE_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc index 9637bff0e0ad1..8102fae2c9876 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc @@ -17,21 +17,21 @@ // source: google/cloud/vmwareengine/v1/vmwareengine.proto #include "google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/vmwareengine/v1/internal/vmware_engine_auth_decorator.h" #include "google/cloud/vmwareengine/v1/internal/vmware_engine_logging_decorator.h" #include "google/cloud/vmwareengine/v1/internal/vmware_engine_metadata_decorator.h" #include "google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h" #include "google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.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 -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc index be0860616dbcb..f9e6fa602d493 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace vmwareengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VmwareEngineTracingConnection::VmwareEngineTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -1750,16 +1748,12 @@ Status VmwareEngineTracingConnection::DeleteOperation( return internal::EndSpan(*span, child_->DeleteOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVmwareEngineTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.h index c46ca23a1a96e..0a3256348e7be 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace vmwareengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VmwareEngineTracingConnection : public vmwareengine_v1::VmwareEngineConnection { public: @@ -746,8 +744,6 @@ class VmwareEngineTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc index f767e2079290e..fae443d27e057 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace vmwareengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VmwareEngineTracingStub::VmwareEngineTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -1738,15 +1736,9 @@ future VmwareEngineTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVmwareEngineTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.h index f6c3474e30e73..5dcb6f8930cf7 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace vmwareengine_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VmwareEngineTracingStub : public VmwareEngineStub { public: ~VmwareEngineTracingStub() override = default; @@ -762,8 +760,6 @@ class VmwareEngineTracingStub : public VmwareEngineStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/vmwareengine/v1/vmware_engine_client.h b/google/cloud/vmwareengine/v1/vmware_engine_client.h index a5259be6ba63e..c5273d7c77b46 100644 --- a/google/cloud/vmwareengine/v1/vmware_engine_client.h +++ b/google/cloud/vmwareengine/v1/vmware_engine_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vmwareengine/v1/vmware_engine_connection.h b/google/cloud/vmwareengine/v1/vmware_engine_connection.h index e17a41d5faf18..119a2fdbb7101 100644 --- a/google/cloud/vmwareengine/v1/vmware_engine_connection.h +++ b/google/cloud/vmwareengine/v1/vmware_engine_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/vmwareengine/v1/internal/vmware_engine_retry_traits.h" #include "google/cloud/vmwareengine/v1/vmware_engine_connection_idempotency_policy.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vmwareengine/v1/vmware_engine_connection_idempotency_policy.h b/google/cloud/vmwareengine/v1/vmware_engine_connection_idempotency_policy.h index e213aeceab6f2..58186f6ff4da7 100644 --- a/google/cloud/vmwareengine/v1/vmware_engine_connection_idempotency_policy.h +++ b/google/cloud/vmwareengine/v1/vmware_engine_connection_idempotency_policy.h @@ -19,12 +19,12 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMWAREENGINE_V1_VMWARE_ENGINE_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMWAREENGINE_V1_VMWARE_ENGINE_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/vmwareengine/v1/vmwareengine.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vpcaccess/BUILD.bazel b/google/cloud/vpcaccess/BUILD.bazel index 9cd861c7e9d8e..8de07eb488011 100644 --- a/google/cloud/vpcaccess/BUILD.bazel +++ b/google/cloud/vpcaccess/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/vpcaccess/v1:vpcaccess_cc_grpc", + "@googleapis//google/cloud/vpcaccess/v1:vpcaccess_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/vpcaccess/quickstart/.bazelrc b/google/cloud/vpcaccess/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/vpcaccess/quickstart/.bazelrc +++ b/google/cloud/vpcaccess/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.cc index 878ec816ef207..ea748482edf9b 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/vpcaccess/v1/vpc_access.proto #include "google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.h" -#include +#include "google/cloud/vpcaccess/v1/vpc_access.grpc.pb.h" #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.h b/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.h index 0b5d993bf960f..9a8a17ab8245d 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vpcaccess/v1/internal/vpc_access_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_connection_impl.h b/google/cloud/vpcaccess/v1/internal/vpc_access_connection_impl.h index 7e109814590b2..f62944dbfaa4a 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_connection_impl.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.cc index 29ff75e9351ff..ab682c536aa29 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/vpcaccess/v1/vpc_access.proto #include "google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.h" +#include "google/cloud/vpcaccess/v1/vpc_access.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.h b/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.h index a1d083eac1cb7..edd36a04e56ad 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vpcaccess/v1/internal/vpc_access_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.cc index 624e7468b77e7..88d84ae3b8958 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/vpcaccess/v1/vpc_access.proto #include "google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.h" +#include "google/cloud/vpcaccess/v1/vpc_access.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 #include #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.h b/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.h index 5366cff472cfc..e94645ef53225 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/vpcaccess/v1/internal/vpc_access_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc index 9e4b31f91edbc..26efbd4980370 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/vpcaccess/v1/vpc_access.proto #include "google/cloud/vpcaccess/v1/internal/vpc_access_stub.h" +#include "google/cloud/vpcaccess/v1/vpc_access.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h index fde54cbd23b14..1afd9ceebf72b 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_V1_INTERNAL_VPC_ACCESS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_V1_INTERNAL_VPC_ACCESS_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/vpcaccess/v1/vpc_access.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc index 0e960ed240076..9464f73db6abc 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/vpcaccess/v1/vpc_access.proto #include "google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/vpcaccess/v1/internal/vpc_access_auth_decorator.h" #include "google/cloud/vpcaccess/v1/internal/vpc_access_logging_decorator.h" #include "google/cloud/vpcaccess/v1/internal/vpc_access_metadata_decorator.h" #include "google/cloud/vpcaccess/v1/internal/vpc_access_stub.h" #include "google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.h" +#include "google/cloud/vpcaccess/v1/vpc_access.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc index 356e2bd0d7fa7..e79979a7da7d9 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace vpcaccess_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VpcAccessServiceTracingConnection::VpcAccessServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -142,16 +140,12 @@ VpcAccessServiceTracingConnection::GetOperation( return internal::EndSpan(*span, child_->GetOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVpcAccessServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.h b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.h index 26252d14071df..45d8b68439877 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace vpcaccess_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VpcAccessServiceTracingConnection : public vpcaccess_v1::VpcAccessServiceConnection { public: @@ -84,8 +82,6 @@ class VpcAccessServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc index cc8fffc1da06a..da3992e84a2a3 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace vpcaccess_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - VpcAccessServiceTracingStub::VpcAccessServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -174,15 +172,9 @@ future VpcAccessServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeVpcAccessServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.h b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.h index 55d2e07d1aa01..1b9785b46dea9 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace vpcaccess_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class VpcAccessServiceTracingStub : public VpcAccessServiceStub { public: ~VpcAccessServiceTracingStub() override = default; @@ -103,8 +101,6 @@ class VpcAccessServiceTracingStub : public VpcAccessServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/vpcaccess/v1/vpc_access_client.h b/google/cloud/vpcaccess/v1/vpc_access_client.h index 57a9e89442281..b4ddfa6d67e18 100644 --- a/google/cloud/vpcaccess/v1/vpc_access_client.h +++ b/google/cloud/vpcaccess/v1/vpc_access_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/vpcaccess/v1/vpc_access_connection.h b/google/cloud/vpcaccess/v1/vpc_access_connection.h index 712c44eb09054..28f0019d475d4 100644 --- a/google/cloud/vpcaccess/v1/vpc_access_connection.h +++ b/google/cloud/vpcaccess/v1/vpc_access_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_V1_VPC_ACCESS_CONNECTION_H #include "google/cloud/vpcaccess/v1/internal/vpc_access_retry_traits.h" +#include "google/cloud/vpcaccess/v1/vpc_access.pb.h" #include "google/cloud/vpcaccess/v1/vpc_access_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/vpcaccess/v1/vpc_access_connection_idempotency_policy.h b/google/cloud/vpcaccess/v1/vpc_access_connection_idempotency_policy.h index ea579985b8d5a..8c2685cd48c8d 100644 --- a/google/cloud/vpcaccess/v1/vpc_access_connection_idempotency_policy.h +++ b/google/cloud/vpcaccess/v1/vpc_access_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_V1_VPC_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_V1_VPC_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/vpcaccess/v1/vpc_access.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/webrisk/BUILD.bazel b/google/cloud/webrisk/BUILD.bazel index 282bf5a26d552..78bb9a3164fd3 100644 --- a/google/cloud/webrisk/BUILD.bazel +++ b/google/cloud/webrisk/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/webrisk/v1:webrisk_cc_grpc", + "@googleapis//google/cloud/webrisk/v1:webrisk_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/webrisk/quickstart/.bazelrc b/google/cloud/webrisk/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/webrisk/quickstart/.bazelrc +++ b/google/cloud/webrisk/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.cc b/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.cc index eeb716159222c..fe02528c43d83 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/webrisk/v1/webrisk.proto #include "google/cloud/webrisk/v1/internal/web_risk_auth_decorator.h" -#include +#include "google/cloud/webrisk/v1/webrisk.grpc.pb.h" #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.h b/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.h index ab80057426186..74f304f40428d 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.h +++ b/google/cloud/webrisk/v1/internal/web_risk_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/webrisk/v1/internal/web_risk_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_connection_impl.h b/google/cloud/webrisk/v1/internal/web_risk_connection_impl.h index 3c74b3104d50e..7307e2d17d2d4 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_connection_impl.h +++ b/google/cloud/webrisk/v1/internal/web_risk_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.cc b/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.cc index 5c1696053de22..64e1e7f45b523 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/webrisk/v1/webrisk.proto #include "google/cloud/webrisk/v1/internal/web_risk_logging_decorator.h" +#include "google/cloud/webrisk/v1/webrisk.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.h b/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.h index 44c11d4d79f1f..909b39c7d6d36 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.h +++ b/google/cloud/webrisk/v1/internal/web_risk_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/webrisk/v1/internal/web_risk_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.cc b/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.cc index ccb2bb0076888..565aa7ae947fd 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/webrisk/v1/webrisk.proto #include "google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.h" +#include "google/cloud/webrisk/v1/webrisk.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 #include #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.h b/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.h index b30df10fe4740..518c86ae5a59e 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.h +++ b/google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/webrisk/v1/internal/web_risk_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_stub.cc b/google/cloud/webrisk/v1/internal/web_risk_stub.cc index 42fb29e7e62da..ca222fe47dd49 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_stub.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/webrisk/v1/webrisk.proto #include "google/cloud/webrisk/v1/internal/web_risk_stub.h" +#include "google/cloud/webrisk/v1/webrisk.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_stub.h b/google/cloud/webrisk/v1/internal/web_risk_stub.h index 85719feb2d220..29a549cfb0be4 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_stub.h +++ b/google/cloud/webrisk/v1/internal/web_risk_stub.h @@ -19,13 +19,13 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_V1_INTERNAL_WEB_RISK_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_V1_INTERNAL_WEB_RISK_STUB_H +#include "google/cloud/webrisk/v1/webrisk.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc b/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc index 4bfcc94696a70..df2736c9b70f3 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc @@ -22,14 +22,14 @@ #include "google/cloud/webrisk/v1/internal/web_risk_metadata_decorator.h" #include "google/cloud/webrisk/v1/internal/web_risk_stub.h" #include "google/cloud/webrisk/v1/internal/web_risk_tracing_stub.h" +#include "google/cloud/webrisk/v1/webrisk.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 -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc b/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc index f2ad07212958c..c49bd84040fba 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace webrisk_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WebRiskServiceTracingConnection::WebRiskServiceTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -132,16 +130,12 @@ Status WebRiskServiceTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWebRiskServiceTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.h b/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.h index 301a747f933ce..b3863818639bc 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.h +++ b/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace webrisk_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WebRiskServiceTracingConnection : public webrisk_v1::WebRiskServiceConnection { public: @@ -81,8 +79,6 @@ class WebRiskServiceTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc b/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc index d42d4be687407..078685bb4b422 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace webrisk_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WebRiskServiceTracingStub::WebRiskServiceTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -179,15 +177,9 @@ future WebRiskServiceTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWebRiskServiceTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.h b/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.h index 8b127a6d10738..58adc8d41d804 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.h +++ b/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace webrisk_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WebRiskServiceTracingStub : public WebRiskServiceStub { public: ~WebRiskServiceTracingStub() override = default; @@ -101,8 +99,6 @@ class WebRiskServiceTracingStub : public WebRiskServiceStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/webrisk/v1/web_risk_client.h b/google/cloud/webrisk/v1/web_risk_client.h index 1787ec92c0d41..f88bbc9d5ded4 100644 --- a/google/cloud/webrisk/v1/web_risk_client.h +++ b/google/cloud/webrisk/v1/web_risk_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/webrisk/v1/web_risk_connection.h b/google/cloud/webrisk/v1/web_risk_connection.h index 9ae99d9803249..b02c17a97e6a9 100644 --- a/google/cloud/webrisk/v1/web_risk_connection.h +++ b/google/cloud/webrisk/v1/web_risk_connection.h @@ -21,6 +21,7 @@ #include "google/cloud/webrisk/v1/internal/web_risk_retry_traits.h" #include "google/cloud/webrisk/v1/web_risk_connection_idempotency_policy.h" +#include "google/cloud/webrisk/v1/webrisk.pb.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/webrisk/v1/web_risk_connection_idempotency_policy.h b/google/cloud/webrisk/v1/web_risk_connection_idempotency_policy.h index b203b4cb5ee50..ffbdeec0a4622 100644 --- a/google/cloud/webrisk/v1/web_risk_connection_idempotency_policy.h +++ b/google/cloud/webrisk/v1/web_risk_connection_idempotency_policy.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_V1_WEB_RISK_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_V1_WEB_RISK_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/webrisk/v1/webrisk.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/websecurityscanner/BUILD.bazel b/google/cloud/websecurityscanner/BUILD.bazel index c71b33972c793..6574a2f9db903 100644 --- a/google/cloud/websecurityscanner/BUILD.bazel +++ b/google/cloud/websecurityscanner/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/websecurityscanner/v1:websecurityscanner_cc_grpc", + "@googleapis//google/cloud/websecurityscanner/v1:websecurityscanner_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/websecurityscanner/quickstart/.bazelrc b/google/cloud/websecurityscanner/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/websecurityscanner/quickstart/.bazelrc +++ b/google/cloud/websecurityscanner/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_auth_decorator.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_auth_decorator.cc index 36056c3d7c73b..6e33d084a51b9 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_auth_decorator.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/websecurityscanner/v1/web_security_scanner.proto #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_auth_decorator.h" -#include +#include "google/cloud/websecurityscanner/v1/web_security_scanner.grpc.pb.h" #include #include diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_logging_decorator.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_logging_decorator.cc index 904fc52f0940d..a4a88d95327af 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_logging_decorator.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/websecurityscanner/v1/web_security_scanner.proto #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_logging_decorator.h" +#include "google/cloud/websecurityscanner/v1/web_security_scanner.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_metadata_decorator.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_metadata_decorator.cc index 0d6cdca147499..894963c9cae1e 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_metadata_decorator.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/websecurityscanner/v1/web_security_scanner.proto #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_metadata_decorator.h" +#include "google/cloud/websecurityscanner/v1/web_security_scanner.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 #include #include #include diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.cc index ef1dfffa2eddd..9e55f9b5b213e 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/websecurityscanner/v1/web_security_scanner.proto #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.h" +#include "google/cloud/websecurityscanner/v1/web_security_scanner.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.h b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.h index 427c0c7bd7563..058ba3001de9d 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.h +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_V1_INTERNAL_WEB_SECURITY_SCANNER_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_V1_INTERNAL_WEB_SECURITY_SCANNER_STUB_H +#include "google/cloud/websecurityscanner/v1/web_security_scanner.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub_factory.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub_factory.cc index 7d0775ff04f1b..8431dd15900c3 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub_factory.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub_factory.cc @@ -22,13 +22,13 @@ #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_metadata_decorator.h" #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_stub.h" #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.h" +#include "google/cloud/websecurityscanner/v1/web_security_scanner.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 #include #include diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc index f6082eb475ecf..0585bf550ec49 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace websecurityscanner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WebSecurityScannerTracingConnection::WebSecurityScannerTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -167,17 +165,13 @@ WebSecurityScannerTracingConnection::ListFindingTypeStats( return internal::EndSpan(*span, child_->ListFindingTypeStats(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWebSecurityScannerTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.h b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.h index f830a2e6f5f7b..a82070b20c67a 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.h +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace websecurityscanner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WebSecurityScannerTracingConnection : public websecurityscanner_v1::WebSecurityScannerConnection { public: @@ -98,8 +96,6 @@ class WebSecurityScannerTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.cc index 7b44eac2aabc2..81a4321f84426 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace websecurityscanner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WebSecurityScannerTracingStub::WebSecurityScannerTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -200,15 +198,9 @@ WebSecurityScannerTracingStub::ListFindingTypeStats( context, *span, child_->ListFindingTypeStats(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWebSecurityScannerTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.h b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.h index 56535b7ebd94d..42c3ab39aa63e 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.h +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace websecurityscanner_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WebSecurityScannerTracingStub : public WebSecurityScannerStub { public: ~WebSecurityScannerTracingStub() override = default; @@ -113,8 +111,6 @@ class WebSecurityScannerTracingStub : public WebSecurityScannerStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/websecurityscanner/v1/web_security_scanner_connection.h b/google/cloud/websecurityscanner/v1/web_security_scanner_connection.h index 0dbd6ae93ae6e..a5f260cba938d 100644 --- a/google/cloud/websecurityscanner/v1/web_security_scanner_connection.h +++ b/google/cloud/websecurityscanner/v1/web_security_scanner_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_V1_WEB_SECURITY_SCANNER_CONNECTION_H #include "google/cloud/websecurityscanner/v1/internal/web_security_scanner_retry_traits.h" +#include "google/cloud/websecurityscanner/v1/web_security_scanner.pb.h" #include "google/cloud/websecurityscanner/v1/web_security_scanner_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/retry_policy_impl.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/websecurityscanner/v1/web_security_scanner_connection_idempotency_policy.h b/google/cloud/websecurityscanner/v1/web_security_scanner_connection_idempotency_policy.h index 97f1630b5e93f..660a9e029b203 100644 --- a/google/cloud/websecurityscanner/v1/web_security_scanner_connection_idempotency_policy.h +++ b/google/cloud/websecurityscanner/v1/web_security_scanner_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_V1_WEB_SECURITY_SCANNER_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_V1_WEB_SECURITY_SCANNER_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/websecurityscanner/v1/web_security_scanner.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/workflows/BUILD.bazel b/google/cloud/workflows/BUILD.bazel index 86dd942860f47..fa5eeb41e48cd 100644 --- a/google/cloud/workflows/BUILD.bazel +++ b/google/cloud/workflows/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/workflows/executions/v1:executions_cc_grpc", - "@com_google_googleapis//google/cloud/workflows/v1:workflows_cc_grpc", + "@googleapis//google/cloud/workflows/executions/v1:executions_cc_grpc", + "@googleapis//google/cloud/workflows/v1:workflows_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/workflows/executions/v1/executions_connection.h b/google/cloud/workflows/executions/v1/executions_connection.h index 634a37b6d14a8..50e78b1c2678e 100644 --- a/google/cloud/workflows/executions/v1/executions_connection.h +++ b/google/cloud/workflows/executions/v1/executions_connection.h @@ -19,6 +19,7 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_V1_EXECUTIONS_CONNECTION_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_V1_EXECUTIONS_CONNECTION_H +#include "google/cloud/workflows/executions/v1/executions.pb.h" #include "google/cloud/workflows/executions/v1/executions_connection_idempotency_policy.h" #include "google/cloud/workflows/executions/v1/internal/executions_retry_traits.h" #include "google/cloud/backoff_policy.h" @@ -27,7 +28,6 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/workflows/executions/v1/executions_connection_idempotency_policy.h b/google/cloud/workflows/executions/v1/executions_connection_idempotency_policy.h index f7f186bd91a3e..43c76edc46a0a 100644 --- a/google/cloud/workflows/executions/v1/executions_connection_idempotency_policy.h +++ b/google/cloud/workflows/executions/v1/executions_connection_idempotency_policy.h @@ -19,9 +19,9 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_V1_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_V1_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/workflows/executions/v1/executions.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include #include namespace google { diff --git a/google/cloud/workflows/executions/v1/internal/executions_auth_decorator.cc b/google/cloud/workflows/executions/v1/internal/executions_auth_decorator.cc index 6c181364cf4ed..8e8193f841578 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_auth_decorator.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/workflows/executions/v1/executions.proto #include "google/cloud/workflows/executions/v1/internal/executions_auth_decorator.h" -#include +#include "google/cloud/workflows/executions/v1/executions.grpc.pb.h" #include #include diff --git a/google/cloud/workflows/executions/v1/internal/executions_logging_decorator.cc b/google/cloud/workflows/executions/v1/internal/executions_logging_decorator.cc index e4a031d4e58f2..dd9bc794f8a77 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_logging_decorator.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/workflows/executions/v1/executions.proto #include "google/cloud/workflows/executions/v1/internal/executions_logging_decorator.h" +#include "google/cloud/workflows/executions/v1/executions.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/workflows/executions/v1/internal/executions_metadata_decorator.cc b/google/cloud/workflows/executions/v1/internal/executions_metadata_decorator.cc index 1cef5fb085891..800d93808d6e9 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_metadata_decorator.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/workflows/executions/v1/executions.proto #include "google/cloud/workflows/executions/v1/internal/executions_metadata_decorator.h" +#include "google/cloud/workflows/executions/v1/executions.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 #include #include #include diff --git a/google/cloud/workflows/executions/v1/internal/executions_stub.cc b/google/cloud/workflows/executions/v1/internal/executions_stub.cc index 791abcbf9150f..bc5e4ae87d6f9 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_stub.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_stub.cc @@ -17,9 +17,9 @@ // source: google/cloud/workflows/executions/v1/executions.proto #include "google/cloud/workflows/executions/v1/internal/executions_stub.h" +#include "google/cloud/workflows/executions/v1/executions.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include #include #include diff --git a/google/cloud/workflows/executions/v1/internal/executions_stub.h b/google/cloud/workflows/executions/v1/internal/executions_stub.h index 7db183607a67a..16b5b3d027f08 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_stub.h +++ b/google/cloud/workflows/executions/v1/internal/executions_stub.h @@ -19,10 +19,10 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_V1_INTERNAL_EXECUTIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_V1_INTERNAL_EXECUTIONS_STUB_H +#include "google/cloud/workflows/executions/v1/executions.grpc.pb.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include #include #include diff --git a/google/cloud/workflows/executions/v1/internal/executions_stub_factory.cc b/google/cloud/workflows/executions/v1/internal/executions_stub_factory.cc index 23fc0052b9b75..d3e9019026ed3 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_stub_factory.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_stub_factory.cc @@ -17,6 +17,7 @@ // source: google/cloud/workflows/executions/v1/executions.proto #include "google/cloud/workflows/executions/v1/internal/executions_stub_factory.h" +#include "google/cloud/workflows/executions/v1/executions.grpc.pb.h" #include "google/cloud/workflows/executions/v1/internal/executions_auth_decorator.h" #include "google/cloud/workflows/executions/v1/internal/executions_logging_decorator.h" #include "google/cloud/workflows/executions/v1/internal/executions_metadata_decorator.h" @@ -28,7 +29,6 @@ #include "google/cloud/internal/opentelemetry.h" #include "google/cloud/log.h" #include "google/cloud/options.h" -#include #include #include diff --git a/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc b/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc index cb4d2d10d4ded..bb2353e448c32 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace workflows_executions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExecutionsTracingConnection::ExecutionsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -75,16 +73,12 @@ ExecutionsTracingConnection::CancelExecution( return internal::EndSpan(*span, child_->CancelExecution(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExecutionsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.h b/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.h index a83504308034c..7b737eeb7d874 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.h +++ b/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace workflows_executions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExecutionsTracingConnection : public workflows_executions_v1::ExecutionsConnection { public: @@ -60,8 +58,6 @@ class ExecutionsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.cc b/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.cc index 93a22cff3b7b3..5d342290b4408 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace workflows_executions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - ExecutionsTracingStub::ExecutionsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -84,15 +82,9 @@ ExecutionsTracingStub::CancelExecution( child_->CancelExecution(context, options, request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeExecutionsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.h b/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.h index da82747917da8..39163a6891add 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.h +++ b/google/cloud/workflows/executions/v1/internal/executions_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace workflows_executions_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class ExecutionsTracingStub : public ExecutionsStub { public: ~ExecutionsTracingStub() override = default; @@ -65,8 +63,6 @@ class ExecutionsTracingStub : public ExecutionsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/workflows/quickstart/.bazelrc b/google/cloud/workflows/quickstart/.bazelrc index f8f4bb3e07a87..a0cd2dae58f1b 100644 --- a/google/cloud/workflows/quickstart/.bazelrc +++ b/google/cloud/workflows/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/workflows/v1/internal/workflows_auth_decorator.cc b/google/cloud/workflows/v1/internal/workflows_auth_decorator.cc index 72f872b1989b7..fe09ab5ae7331 100644 --- a/google/cloud/workflows/v1/internal/workflows_auth_decorator.cc +++ b/google/cloud/workflows/v1/internal/workflows_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/workflows/v1/workflows.proto #include "google/cloud/workflows/v1/internal/workflows_auth_decorator.h" -#include +#include "google/cloud/workflows/v1/workflows.grpc.pb.h" #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_auth_decorator.h b/google/cloud/workflows/v1/internal/workflows_auth_decorator.h index 43146227c08bc..818e3f6397d06 100644 --- a/google/cloud/workflows/v1/internal/workflows_auth_decorator.h +++ b/google/cloud/workflows/v1/internal/workflows_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/workflows/v1/internal/workflows_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_connection_impl.h b/google/cloud/workflows/v1/internal/workflows_connection_impl.h index a60b4d6815dfb..3cb2ab9922531 100644 --- a/google/cloud/workflows/v1/internal/workflows_connection_impl.h +++ b/google/cloud/workflows/v1/internal/workflows_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/workflows/v1/internal/workflows_logging_decorator.cc b/google/cloud/workflows/v1/internal/workflows_logging_decorator.cc index 1af33fa54b11d..4bdb4eef04e90 100644 --- a/google/cloud/workflows/v1/internal/workflows_logging_decorator.cc +++ b/google/cloud/workflows/v1/internal/workflows_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/workflows/v1/workflows.proto #include "google/cloud/workflows/v1/internal/workflows_logging_decorator.h" +#include "google/cloud/workflows/v1/workflows.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_logging_decorator.h b/google/cloud/workflows/v1/internal/workflows_logging_decorator.h index 04ddf2deb502d..772ecd532a1ae 100644 --- a/google/cloud/workflows/v1/internal/workflows_logging_decorator.h +++ b/google/cloud/workflows/v1/internal/workflows_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/workflows/v1/internal/workflows_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_metadata_decorator.cc b/google/cloud/workflows/v1/internal/workflows_metadata_decorator.cc index da9e975dac1e8..315caf5ecce25 100644 --- a/google/cloud/workflows/v1/internal/workflows_metadata_decorator.cc +++ b/google/cloud/workflows/v1/internal/workflows_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/workflows/v1/workflows.proto #include "google/cloud/workflows/v1/internal/workflows_metadata_decorator.h" +#include "google/cloud/workflows/v1/workflows.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 #include #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_metadata_decorator.h b/google/cloud/workflows/v1/internal/workflows_metadata_decorator.h index 77f22bd16eef8..1158a4986024f 100644 --- a/google/cloud/workflows/v1/internal/workflows_metadata_decorator.h +++ b/google/cloud/workflows/v1/internal/workflows_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/workflows/v1/internal/workflows_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_stub.cc b/google/cloud/workflows/v1/internal/workflows_stub.cc index 92188010f5d63..b9dd4f27eeefe 100644 --- a/google/cloud/workflows/v1/internal/workflows_stub.cc +++ b/google/cloud/workflows/v1/internal/workflows_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/workflows/v1/workflows.proto #include "google/cloud/workflows/v1/internal/workflows_stub.h" +#include "google/cloud/workflows/v1/workflows.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_stub.h b/google/cloud/workflows/v1/internal/workflows_stub.h index 5b52ec5d3cd3d..ad0ed5ae8e70e 100644 --- a/google/cloud/workflows/v1/internal/workflows_stub.h +++ b/google/cloud/workflows/v1/internal/workflows_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_V1_INTERNAL_WORKFLOWS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_V1_INTERNAL_WORKFLOWS_STUB_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/workflows/v1/workflows.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_stub_factory.cc b/google/cloud/workflows/v1/internal/workflows_stub_factory.cc index 18bc1b778b7ed..ecf1b40af361c 100644 --- a/google/cloud/workflows/v1/internal/workflows_stub_factory.cc +++ b/google/cloud/workflows/v1/internal/workflows_stub_factory.cc @@ -17,20 +17,20 @@ // source: google/cloud/workflows/v1/workflows.proto #include "google/cloud/workflows/v1/internal/workflows_stub_factory.h" +#include "google/cloud/location/locations.grpc.pb.h" #include "google/cloud/workflows/v1/internal/workflows_auth_decorator.h" #include "google/cloud/workflows/v1/internal/workflows_logging_decorator.h" #include "google/cloud/workflows/v1/internal/workflows_metadata_decorator.h" #include "google/cloud/workflows/v1/internal/workflows_stub.h" #include "google/cloud/workflows/v1/internal/workflows_tracing_stub.h" +#include "google/cloud/workflows/v1/workflows.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 -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc b/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc index 5b3d87458df14..28b733f151710 100644 --- a/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc +++ b/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace workflows_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WorkflowsTracingConnection::WorkflowsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -199,16 +197,12 @@ Status WorkflowsTracingConnection::DeleteOperation( return internal::EndSpan(*span, child_->DeleteOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWorkflowsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/workflows/v1/internal/workflows_tracing_connection.h b/google/cloud/workflows/v1/internal/workflows_tracing_connection.h index 325b589c97c15..e356559273eb1 100644 --- a/google/cloud/workflows/v1/internal/workflows_tracing_connection.h +++ b/google/cloud/workflows/v1/internal/workflows_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace workflows_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WorkflowsTracingConnection : public workflows_v1::WorkflowsConnection { public: ~WorkflowsTracingConnection() override = default; @@ -104,8 +102,6 @@ class WorkflowsTracingConnection : public workflows_v1::WorkflowsConnection { std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc b/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc index 0965f99fa0dd1..0e4c176aac6be 100644 --- a/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc +++ b/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace workflows_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WorkflowsTracingStub::WorkflowsTracingStub(std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -230,15 +228,9 @@ future WorkflowsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWorkflowsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/workflows/v1/internal/workflows_tracing_stub.h b/google/cloud/workflows/v1/internal/workflows_tracing_stub.h index 33fd816da5fd1..179c879e84319 100644 --- a/google/cloud/workflows/v1/internal/workflows_tracing_stub.h +++ b/google/cloud/workflows/v1/internal/workflows_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace workflows_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WorkflowsTracingStub : public WorkflowsStub { public: ~WorkflowsTracingStub() override = default; @@ -127,8 +125,6 @@ class WorkflowsTracingStub : public WorkflowsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/workflows/v1/workflows_client.h b/google/cloud/workflows/v1/workflows_client.h index af9b14ba62349..b618bf3e932f9 100644 --- a/google/cloud/workflows/v1/workflows_client.h +++ b/google/cloud/workflows/v1/workflows_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workflows/v1/workflows_connection.h b/google/cloud/workflows/v1/workflows_connection.h index 5744a4a0a78b9..5bef570d7dd96 100644 --- a/google/cloud/workflows/v1/workflows_connection.h +++ b/google/cloud/workflows/v1/workflows_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_V1_WORKFLOWS_CONNECTION_H #include "google/cloud/workflows/v1/internal/workflows_retry_traits.h" +#include "google/cloud/workflows/v1/workflows.pb.h" #include "google/cloud/workflows/v1/workflows_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/workflows/v1/workflows_connection_idempotency_policy.h b/google/cloud/workflows/v1/workflows_connection_idempotency_policy.h index e9fe229c99f3d..0d1500688a6d5 100644 --- a/google/cloud/workflows/v1/workflows_connection_idempotency_policy.h +++ b/google/cloud/workflows/v1/workflows_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_V1_WORKFLOWS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_V1_WORKFLOWS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/location/locations.grpc.pb.h" +#include "google/cloud/workflows/v1/workflows.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/workstations/BUILD.bazel b/google/cloud/workstations/BUILD.bazel index 92812cdbf3b8d..b7b5a95430f3f 100644 --- a/google/cloud/workstations/BUILD.bazel +++ b/google/cloud/workstations/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/workstations/v1:workstations_cc_grpc", + "@googleapis//google/cloud/workstations/v1:workstations_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/workstations/quickstart/.bazelrc b/google/cloud/workstations/quickstart/.bazelrc index 6777c6b4c95de..ec27511a60add 100644 --- a/google/cloud/workstations/quickstart/.bazelrc +++ b/google/cloud/workstations/quickstart/.bazelrc @@ -15,14 +15,14 @@ # Use host-OS-specific config lines from bazelrc files. build --enable_platform_specific_config=true -# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which -# disables C++14 features, even if the compilers defaults to C++ >= 14 -build:linux --cxxopt=-std=c++14 -build:macos --cxxopt=-std=c++14 -# Protobuf and gRPC require (or soon will require) C++14 to compile the "host" -# targets, such as protoc and the grpc plugin. -build:linux --host_cxxopt=-std=c++14 -build:macos --host_cxxopt=-std=c++14 + + +build:linux --cxxopt=-std=c++17 +build:macos --cxxopt=-std=c++17 + + +build:linux --host_cxxopt=-std=c++17 +build:macos --host_cxxopt=-std=c++17 # Do not create the convenience links. They are inconvenient when the build # runs inside a docker image or if one builds a quickstart and then builds @@ -31,3 +31,4 @@ build --experimental_convenience_symlinks=ignore #Our quickstarts do not yet support bzlmod build --noenable_bzlmod +build --enable_workspace diff --git a/google/cloud/workstations/v1/internal/workstations_auth_decorator.cc b/google/cloud/workstations/v1/internal/workstations_auth_decorator.cc index 130ae233577a1..d1425b0ddd21d 100644 --- a/google/cloud/workstations/v1/internal/workstations_auth_decorator.cc +++ b/google/cloud/workstations/v1/internal/workstations_auth_decorator.cc @@ -17,7 +17,7 @@ // source: google/cloud/workstations/v1/workstations.proto #include "google/cloud/workstations/v1/internal/workstations_auth_decorator.h" -#include +#include "google/cloud/workstations/v1/workstations.grpc.pb.h" #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_auth_decorator.h b/google/cloud/workstations/v1/internal/workstations_auth_decorator.h index d9775402cd1a5..b436090d27ae0 100644 --- a/google/cloud/workstations/v1/internal/workstations_auth_decorator.h +++ b/google/cloud/workstations/v1/internal/workstations_auth_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/workstations/v1/internal/workstations_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_connection_impl.h b/google/cloud/workstations/v1/internal/workstations_connection_impl.h index bcab4455fb5bc..a0eac1286aa15 100644 --- a/google/cloud/workstations/v1/internal/workstations_connection_impl.h +++ b/google/cloud/workstations/v1/internal/workstations_connection_impl.h @@ -32,7 +32,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/workstations/v1/internal/workstations_logging_decorator.cc b/google/cloud/workstations/v1/internal/workstations_logging_decorator.cc index fe7fa3303ee87..986b2acb82db7 100644 --- a/google/cloud/workstations/v1/internal/workstations_logging_decorator.cc +++ b/google/cloud/workstations/v1/internal/workstations_logging_decorator.cc @@ -17,9 +17,9 @@ // source: google/cloud/workstations/v1/workstations.proto #include "google/cloud/workstations/v1/internal/workstations_logging_decorator.h" +#include "google/cloud/workstations/v1/workstations.grpc.pb.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" -#include #include #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_logging_decorator.h b/google/cloud/workstations/v1/internal/workstations_logging_decorator.h index d601d33c4d93a..c640d52d273ec 100644 --- a/google/cloud/workstations/v1/internal/workstations_logging_decorator.h +++ b/google/cloud/workstations/v1/internal/workstations_logging_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/workstations/v1/internal/workstations_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_metadata_decorator.cc b/google/cloud/workstations/v1/internal/workstations_metadata_decorator.cc index 577cc13353044..4f03ba2b1d71f 100644 --- a/google/cloud/workstations/v1/internal/workstations_metadata_decorator.cc +++ b/google/cloud/workstations/v1/internal/workstations_metadata_decorator.cc @@ -17,12 +17,12 @@ // source: google/cloud/workstations/v1/workstations.proto #include "google/cloud/workstations/v1/internal/workstations_metadata_decorator.h" +#include "google/cloud/workstations/v1/workstations.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 #include #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_metadata_decorator.h b/google/cloud/workstations/v1/internal/workstations_metadata_decorator.h index 0bec415e3e417..ecdae48cdbe9b 100644 --- a/google/cloud/workstations/v1/internal/workstations_metadata_decorator.h +++ b/google/cloud/workstations/v1/internal/workstations_metadata_decorator.h @@ -22,7 +22,7 @@ #include "google/cloud/workstations/v1/internal/workstations_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_stub.cc b/google/cloud/workstations/v1/internal/workstations_stub.cc index c99b1da839ea1..756c32b538dbd 100644 --- a/google/cloud/workstations/v1/internal/workstations_stub.cc +++ b/google/cloud/workstations/v1/internal/workstations_stub.cc @@ -17,10 +17,10 @@ // source: google/cloud/workstations/v1/workstations.proto #include "google/cloud/workstations/v1/internal/workstations_stub.h" +#include "google/cloud/workstations/v1/workstations.grpc.pb.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_stub.h b/google/cloud/workstations/v1/internal/workstations_stub.h index eb598f16277f0..89ed8f337c24e 100644 --- a/google/cloud/workstations/v1/internal/workstations_stub.h +++ b/google/cloud/workstations/v1/internal/workstations_stub.h @@ -19,14 +19,14 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKSTATIONS_V1_INTERNAL_WORKSTATIONS_STUB_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKSTATIONS_V1_INTERNAL_WORKSTATIONS_STUB_H +#include "google/cloud/workstations/v1/workstations.grpc.pb.h" #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_stub_factory.cc b/google/cloud/workstations/v1/internal/workstations_stub_factory.cc index f0ef4131e6dbe..c191d6952f078 100644 --- a/google/cloud/workstations/v1/internal/workstations_stub_factory.cc +++ b/google/cloud/workstations/v1/internal/workstations_stub_factory.cc @@ -22,15 +22,15 @@ #include "google/cloud/workstations/v1/internal/workstations_metadata_decorator.h" #include "google/cloud/workstations/v1/internal/workstations_stub.h" #include "google/cloud/workstations/v1/internal/workstations_tracing_stub.h" +#include "google/cloud/workstations/v1/workstations.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 -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include #include diff --git a/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc b/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc index 57189684bc4c2..110a501e40933 100644 --- a/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc +++ b/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc @@ -27,8 +27,6 @@ namespace cloud { namespace workstations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WorkstationsTracingConnection::WorkstationsTracingConnection( std::shared_ptr child) : child_(std::move(child)) {} @@ -541,16 +539,12 @@ Status WorkstationsTracingConnection::CancelOperation( return internal::EndSpan(*span, child_->CancelOperation(request)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWorkstationsTracingConnection( std::shared_ptr conn) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY if (internal::TracingEnabled(conn->options())) { conn = std::make_shared(std::move(conn)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return conn; } diff --git a/google/cloud/workstations/v1/internal/workstations_tracing_connection.h b/google/cloud/workstations/v1/internal/workstations_tracing_connection.h index d66c537e5bc53..ad8b4a6be96af 100644 --- a/google/cloud/workstations/v1/internal/workstations_tracing_connection.h +++ b/google/cloud/workstations/v1/internal/workstations_tracing_connection.h @@ -28,8 +28,6 @@ namespace cloud { namespace workstations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WorkstationsTracingConnection : public workstations_v1::WorkstationsConnection { public: @@ -256,8 +254,6 @@ class WorkstationsTracingConnection std::shared_ptr child_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Conditionally applies the tracing decorator to the given connection. * diff --git a/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc b/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc index 9af897260429a..97d593a71c25d 100644 --- a/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc +++ b/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc @@ -26,8 +26,6 @@ namespace cloud { namespace workstations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - WorkstationsTracingStub::WorkstationsTracingStub( std::shared_ptr child) : child_(std::move(child)), propagator_(internal::MakePropagator()) {} @@ -574,15 +572,9 @@ future WorkstationsTracingStub::AsyncCancelOperation( return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - std::shared_ptr MakeWorkstationsTracingStub( std::shared_ptr stub) { -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY return std::make_shared(std::move(stub)); -#else - return stub; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/workstations/v1/internal/workstations_tracing_stub.h b/google/cloud/workstations/v1/internal/workstations_tracing_stub.h index 40a27f78db463..f2c1351d8208d 100644 --- a/google/cloud/workstations/v1/internal/workstations_tracing_stub.h +++ b/google/cloud/workstations/v1/internal/workstations_tracing_stub.h @@ -30,8 +30,6 @@ namespace cloud { namespace workstations_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN -#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - class WorkstationsTracingStub : public WorkstationsStub { public: ~WorkstationsTracingStub() override = default; @@ -273,8 +271,6 @@ class WorkstationsTracingStub : public WorkstationsStub { propagator_; }; -#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY - /** * Applies the tracing decorator to the given stub. * diff --git a/google/cloud/workstations/v1/workstations_client.h b/google/cloud/workstations/v1/workstations_client.h index fd61e4adcf87d..99b1ead23e8dc 100644 --- a/google/cloud/workstations/v1/workstations_client.h +++ b/google/cloud/workstations/v1/workstations_client.h @@ -26,7 +26,7 @@ #include "google/cloud/polling_policy.h" #include "google/cloud/status_or.h" #include "google/cloud/version.h" -#include +#include "google/longrunning/operations.grpc.pb.h" #include #include #include diff --git a/google/cloud/workstations/v1/workstations_connection.h b/google/cloud/workstations/v1/workstations_connection.h index 13bee4cc6a66d..02cc1d3532a38 100644 --- a/google/cloud/workstations/v1/workstations_connection.h +++ b/google/cloud/workstations/v1/workstations_connection.h @@ -20,6 +20,7 @@ #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKSTATIONS_V1_WORKSTATIONS_CONNECTION_H #include "google/cloud/workstations/v1/internal/workstations_retry_traits.h" +#include "google/cloud/workstations/v1/workstations.pb.h" #include "google/cloud/workstations/v1/workstations_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -30,8 +31,7 @@ #include "google/cloud/status_or.h" #include "google/cloud/stream_range.h" #include "google/cloud/version.h" -#include -#include +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/google/cloud/workstations/v1/workstations_connection_idempotency_policy.h b/google/cloud/workstations/v1/workstations_connection_idempotency_policy.h index 53effe4e3ee9b..0dcb30455e146 100644 --- a/google/cloud/workstations/v1/workstations_connection_idempotency_policy.h +++ b/google/cloud/workstations/v1/workstations_connection_idempotency_policy.h @@ -19,11 +19,11 @@ #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKSTATIONS_V1_WORKSTATIONS_CONNECTION_IDEMPOTENCY_POLICY_H #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKSTATIONS_V1_WORKSTATIONS_CONNECTION_IDEMPOTENCY_POLICY_H +#include "google/cloud/workstations/v1/workstations.grpc.pb.h" #include "google/cloud/idempotency.h" #include "google/cloud/version.h" -#include -#include -#include +#include "google/iam/v1/iam_policy.grpc.pb.h" +#include "google/longrunning/operations.grpc.pb.h" #include namespace google { diff --git a/protos/BUILD.bazel b/protos/BUILD.bazel index a63e71f57ffd6..63e2ffb14e350 100644 --- a/protos/BUILD.bazel +++ b/protos/BUILD.bazel @@ -16,13 +16,13 @@ package(default_visibility = ["//visibility:private"]) licenses(["notice"]) # Apache 2.0 -cc_library( - name = "system_includes", - includes = ["."], - visibility = [ - "//google/cloud/bigtable/test_proxy:__pkg__", - "//google/cloud/compute:__pkg__", - "//google/cloud/spanner:__subpackages__", - "//google/cloud/storage/tests:__pkg__", - ], -) +#cc_library( +# name = "system_includes", +# includes = ["."], +# visibility = [ +# "//google/cloud/bigtable/test_proxy:__pkg__", +# "//google/cloud/compute:__pkg__", +# "//google/cloud/spanner:__subpackages__", +# "//google/cloud/storage/tests:__pkg__", +# ], +#) diff --git a/protos/google/cloud/bigtable/test_proxy/BUILD.bazel b/protos/google/cloud/bigtable/test_proxy/BUILD.bazel index 4982da5c8a0ad..a046c420483cb 100644 --- a/protos/google/cloud/bigtable/test_proxy/BUILD.bazel +++ b/protos/google/cloud/bigtable/test_proxy/BUILD.bazel @@ -12,12 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load( - "@com_google_googleapis_imports//:imports.bzl", - "cc_grpc_library", - "cc_proto_library", -) -load("@rules_proto//proto:defs.bzl", "proto_library") +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") package(default_visibility = ["//visibility:private"]) @@ -29,11 +26,11 @@ proto_library( name = "test_proxy_proto", srcs = ["test_proxy.proto"], deps = [ - "@com_google_googleapis//google/api:client_proto", - "@com_google_googleapis//google/bigtable/v2:bigtable_proto", - "@com_google_googleapis//google/rpc:status_proto", "@com_google_protobuf//:descriptor_proto", "@com_google_protobuf//:duration_proto", + "@googleapis//google/api:client_proto", + "@googleapis//google/bigtable/v2:bigtable_proto", + "@googleapis//google/rpc:status_proto", ], ) diff --git a/protos/google/cloud/compute/BUILD.bazel b/protos/google/cloud/compute/BUILD.bazel index 1cc9073df5b2c..04e17e09fb1eb 100644 --- a/protos/google/cloud/compute/BUILD.bazel +++ b/protos/google/cloud/compute/BUILD.bazel @@ -12,11 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load( - "@com_google_googleapis_imports//:imports.bzl", - "cc_proto_library", -) -load("@rules_proto//proto:defs.bzl", "proto_library") +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") load("//google/cloud/compute:service_dirs.bzl", "operation_service_dirs", "service_dirs") package(default_visibility = ["//visibility:private"]) @@ -46,15 +43,15 @@ proto_library( "//google/cloud/compute:__pkg__", ], deps = [ - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/api:client_proto", - "@com_google_googleapis//google/api:field_behavior_proto", - "@com_google_googleapis//google/api:http_proto", - "@com_google_googleapis//google/api:resource_proto", - "@com_google_googleapis//google/api:routing_proto", - "@com_google_googleapis//google/cloud:extended_operations_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:empty_proto", + "@googleapis//google/api:annotations_proto", + "@googleapis//google/api:client_proto", + "@googleapis//google/api:field_behavior_proto", + "@googleapis//google/api:http_proto", + "@googleapis//google/api:resource_proto", + "@googleapis//google/api:routing_proto", + "@googleapis//google/cloud:extended_operations_proto", ], ) diff --git a/protos/google/cloud/compute/accelerator_types/v1/accelerator_types.proto b/protos/google/cloud/compute/accelerator_types/v1/accelerator_types.proto index faad6e0434a06..4b40c5cf95844 100644 --- a/protos/google/cloud/compute/accelerator_types/v1/accelerator_types.proto +++ b/protos/google/cloud/compute/accelerator_types/v1/accelerator_types.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/addresses/v1/addresses.proto b/protos/google/cloud/compute/addresses/v1/addresses.proto index e8e1cb6f61035..e19f409667cfe 100644 --- a/protos/google/cloud/compute/addresses/v1/addresses.proto +++ b/protos/google/cloud/compute/addresses/v1/addresses.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/autoscalers/v1/autoscalers.proto b/protos/google/cloud/compute/autoscalers/v1/autoscalers.proto index 309d60130af68..a7b1f509ba4f9 100644 --- a/protos/google/cloud/compute/autoscalers/v1/autoscalers.proto +++ b/protos/google/cloud/compute/autoscalers/v1/autoscalers.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/backend_buckets/v1/backend_buckets.proto b/protos/google/cloud/compute/backend_buckets/v1/backend_buckets.proto index 2ada33b21f1a2..a2c5833518853 100644 --- a/protos/google/cloud/compute/backend_buckets/v1/backend_buckets.proto +++ b/protos/google/cloud/compute/backend_buckets/v1/backend_buckets.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/backend_services/v1/backend_services.proto b/protos/google/cloud/compute/backend_services/v1/backend_services.proto index b60ad810e0f35..9ea86ac190e1d 100644 --- a/protos/google/cloud/compute/backend_services/v1/backend_services.proto +++ b/protos/google/cloud/compute/backend_services/v1/backend_services.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/disk_types/v1/disk_types.proto b/protos/google/cloud/compute/disk_types/v1/disk_types.proto index 106a8d6c89c51..c9ae7f045130e 100644 --- a/protos/google/cloud/compute/disk_types/v1/disk_types.proto +++ b/protos/google/cloud/compute/disk_types/v1/disk_types.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/disks/v1/disks.proto b/protos/google/cloud/compute/disks/v1/disks.proto index 1cce4db71ef50..1fc82311b5c79 100644 --- a/protos/google/cloud/compute/disks/v1/disks.proto +++ b/protos/google/cloud/compute/disks/v1/disks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.proto b/protos/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.proto index 2db68d691f14b..01153ee58514b 100644 --- a/protos/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.proto +++ b/protos/google/cloud/compute/external_vpn_gateways/v1/external_vpn_gateways.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/firewall_policies/v1/firewall_policies.proto b/protos/google/cloud/compute/firewall_policies/v1/firewall_policies.proto index 9180992f951bd..0c522ea5a0027 100644 --- a/protos/google/cloud/compute/firewall_policies/v1/firewall_policies.proto +++ b/protos/google/cloud/compute/firewall_policies/v1/firewall_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/firewalls/v1/firewalls.proto b/protos/google/cloud/compute/firewalls/v1/firewalls.proto index 793995121e6dd..ef3523b35ba1d 100644 --- a/protos/google/cloud/compute/firewalls/v1/firewalls.proto +++ b/protos/google/cloud/compute/firewalls/v1/firewalls.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/forwarding_rules/v1/forwarding_rules.proto b/protos/google/cloud/compute/forwarding_rules/v1/forwarding_rules.proto index a172a130ee193..7f89e23af5bdc 100644 --- a/protos/google/cloud/compute/forwarding_rules/v1/forwarding_rules.proto +++ b/protos/google/cloud/compute/forwarding_rules/v1/forwarding_rules.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/global_addresses/v1/global_addresses.proto b/protos/google/cloud/compute/global_addresses/v1/global_addresses.proto index fda0b5d844883..3b3c3ee0067df 100644 --- a/protos/google/cloud/compute/global_addresses/v1/global_addresses.proto +++ b/protos/google/cloud/compute/global_addresses/v1/global_addresses.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.proto b/protos/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.proto index 38aabb4b91138..ef02447ceeda0 100644 --- a/protos/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.proto +++ b/protos/google/cloud/compute/global_forwarding_rules/v1/global_forwarding_rules.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.proto b/protos/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.proto index fda81c87adf07..ec36a1259e5db 100644 --- a/protos/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.proto +++ b/protos/google/cloud/compute/global_network_endpoint_groups/v1/global_network_endpoint_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/global_operations/v1/global_operations.proto b/protos/google/cloud/compute/global_operations/v1/global_operations.proto index e4578754040b7..444be27258112 100644 --- a/protos/google/cloud/compute/global_operations/v1/global_operations.proto +++ b/protos/google/cloud/compute/global_operations/v1/global_operations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/global_organization_operations/v1/global_organization_operations.proto b/protos/google/cloud/compute/global_organization_operations/v1/global_organization_operations.proto index aa81f575f7d01..cef0db53b27b6 100644 --- a/protos/google/cloud/compute/global_organization_operations/v1/global_organization_operations.proto +++ b/protos/google/cloud/compute/global_organization_operations/v1/global_organization_operations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.proto b/protos/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.proto index ef2943c4f7d6d..5e9516821c728 100644 --- a/protos/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.proto +++ b/protos/google/cloud/compute/global_public_delegated_prefixes/v1/global_public_delegated_prefixes.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/health_checks/v1/health_checks.proto b/protos/google/cloud/compute/health_checks/v1/health_checks.proto index 782a2420a1fd1..b5e923a2e401d 100644 --- a/protos/google/cloud/compute/health_checks/v1/health_checks.proto +++ b/protos/google/cloud/compute/health_checks/v1/health_checks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/http_health_checks/v1/http_health_checks.proto b/protos/google/cloud/compute/http_health_checks/v1/http_health_checks.proto index 5585be894562c..7a1465990e447 100644 --- a/protos/google/cloud/compute/http_health_checks/v1/http_health_checks.proto +++ b/protos/google/cloud/compute/http_health_checks/v1/http_health_checks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/https_health_checks/v1/https_health_checks.proto b/protos/google/cloud/compute/https_health_checks/v1/https_health_checks.proto index 322ca2b22b735..dfd3ce4539043 100644 --- a/protos/google/cloud/compute/https_health_checks/v1/https_health_checks.proto +++ b/protos/google/cloud/compute/https_health_checks/v1/https_health_checks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/image_family_views/v1/image_family_views.proto b/protos/google/cloud/compute/image_family_views/v1/image_family_views.proto index 9c06598e71499..2514bdf3462bd 100644 --- a/protos/google/cloud/compute/image_family_views/v1/image_family_views.proto +++ b/protos/google/cloud/compute/image_family_views/v1/image_family_views.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/images/v1/images.proto b/protos/google/cloud/compute/images/v1/images.proto index dd0e733de3741..fe9f9ea106964 100644 --- a/protos/google/cloud/compute/images/v1/images.proto +++ b/protos/google/cloud/compute/images/v1/images.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.proto b/protos/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.proto index 5a2b1739b7cae..9a83b495bea0a 100644 --- a/protos/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.proto +++ b/protos/google/cloud/compute/instance_group_manager_resize_requests/v1/instance_group_manager_resize_requests.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instance_group_managers/v1/instance_group_managers.proto b/protos/google/cloud/compute/instance_group_managers/v1/instance_group_managers.proto index d649502cf0082..807423fa4697f 100644 --- a/protos/google/cloud/compute/instance_group_managers/v1/instance_group_managers.proto +++ b/protos/google/cloud/compute/instance_group_managers/v1/instance_group_managers.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instance_groups/v1/instance_groups.proto b/protos/google/cloud/compute/instance_groups/v1/instance_groups.proto index 09af07e2c771e..57954ae9aa17e 100644 --- a/protos/google/cloud/compute/instance_groups/v1/instance_groups.proto +++ b/protos/google/cloud/compute/instance_groups/v1/instance_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instance_settings/v1/instance_settings.proto b/protos/google/cloud/compute/instance_settings/v1/instance_settings.proto index 21d1c41677866..8200e6ea63144 100644 --- a/protos/google/cloud/compute/instance_settings/v1/instance_settings.proto +++ b/protos/google/cloud/compute/instance_settings/v1/instance_settings.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instance_templates/v1/instance_templates.proto b/protos/google/cloud/compute/instance_templates/v1/instance_templates.proto index f805f8b7b7660..0e0c496faca07 100644 --- a/protos/google/cloud/compute/instance_templates/v1/instance_templates.proto +++ b/protos/google/cloud/compute/instance_templates/v1/instance_templates.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instances/v1/instances.proto b/protos/google/cloud/compute/instances/v1/instances.proto index 86fc91efb903b..867e98b8acb17 100644 --- a/protos/google/cloud/compute/instances/v1/instances.proto +++ b/protos/google/cloud/compute/instances/v1/instances.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/instant_snapshots/v1/instant_snapshots.proto b/protos/google/cloud/compute/instant_snapshots/v1/instant_snapshots.proto index 1c84f08e03aa1..d00983c7c0855 100644 --- a/protos/google/cloud/compute/instant_snapshots/v1/instant_snapshots.proto +++ b/protos/google/cloud/compute/instant_snapshots/v1/instant_snapshots.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.proto b/protos/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.proto index 95bef67cebfc4..1514621095f04 100644 --- a/protos/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.proto +++ b/protos/google/cloud/compute/interconnect_attachment_groups/v1/interconnect_attachment_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.proto b/protos/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.proto index d222cdcbb9840..cb121e8522a1b 100644 --- a/protos/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.proto +++ b/protos/google/cloud/compute/interconnect_attachments/v1/interconnect_attachments.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/interconnect_groups/v1/interconnect_groups.proto b/protos/google/cloud/compute/interconnect_groups/v1/interconnect_groups.proto index ddc4d5fb00879..5ec007a7268d4 100644 --- a/protos/google/cloud/compute/interconnect_groups/v1/interconnect_groups.proto +++ b/protos/google/cloud/compute/interconnect_groups/v1/interconnect_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/interconnect_locations/v1/interconnect_locations.proto b/protos/google/cloud/compute/interconnect_locations/v1/interconnect_locations.proto index eeca89b4c528e..bd663b57be429 100644 --- a/protos/google/cloud/compute/interconnect_locations/v1/interconnect_locations.proto +++ b/protos/google/cloud/compute/interconnect_locations/v1/interconnect_locations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.proto b/protos/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.proto index fd70145d7e612..f6f1cede0ed9e 100644 --- a/protos/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.proto +++ b/protos/google/cloud/compute/interconnect_remote_locations/v1/interconnect_remote_locations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/interconnects/v1/interconnects.proto b/protos/google/cloud/compute/interconnects/v1/interconnects.proto index 482249198a8ca..2a32bff60ad65 100644 --- a/protos/google/cloud/compute/interconnects/v1/interconnects.proto +++ b/protos/google/cloud/compute/interconnects/v1/interconnects.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/license_codes/v1/license_codes.proto b/protos/google/cloud/compute/license_codes/v1/license_codes.proto index 6cd45c764a477..63caaff103d77 100644 --- a/protos/google/cloud/compute/license_codes/v1/license_codes.proto +++ b/protos/google/cloud/compute/license_codes/v1/license_codes.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/licenses/v1/licenses.proto b/protos/google/cloud/compute/licenses/v1/licenses.proto index d3cac01f37e30..bedb861ac9bfd 100644 --- a/protos/google/cloud/compute/licenses/v1/licenses.proto +++ b/protos/google/cloud/compute/licenses/v1/licenses.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/machine_images/v1/machine_images.proto b/protos/google/cloud/compute/machine_images/v1/machine_images.proto index 51831a427df4c..b18fafe56036d 100644 --- a/protos/google/cloud/compute/machine_images/v1/machine_images.proto +++ b/protos/google/cloud/compute/machine_images/v1/machine_images.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/machine_types/v1/machine_types.proto b/protos/google/cloud/compute/machine_types/v1/machine_types.proto index 767e0413c2b31..3e5809cc2cc2a 100644 --- a/protos/google/cloud/compute/machine_types/v1/machine_types.proto +++ b/protos/google/cloud/compute/machine_types/v1/machine_types.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/network_attachments/v1/network_attachments.proto b/protos/google/cloud/compute/network_attachments/v1/network_attachments.proto index 07cb84830c2a3..eb13576134a2b 100644 --- a/protos/google/cloud/compute/network_attachments/v1/network_attachments.proto +++ b/protos/google/cloud/compute/network_attachments/v1/network_attachments.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.proto b/protos/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.proto index 07885b8db38da..6ae797b0f9997 100644 --- a/protos/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.proto +++ b/protos/google/cloud/compute/network_edge_security_services/v1/network_edge_security_services.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.proto b/protos/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.proto index 3d8f773374d40..c69d798e6b195 100644 --- a/protos/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.proto +++ b/protos/google/cloud/compute/network_endpoint_groups/v1/network_endpoint_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.proto b/protos/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.proto index d7c109ced7397..d9800d433fd7a 100644 --- a/protos/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.proto +++ b/protos/google/cloud/compute/network_firewall_policies/v1/network_firewall_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/network_profiles/v1/network_profiles.proto b/protos/google/cloud/compute/network_profiles/v1/network_profiles.proto index 09a29d55d1ec6..0458edbf85fb7 100644 --- a/protos/google/cloud/compute/network_profiles/v1/network_profiles.proto +++ b/protos/google/cloud/compute/network_profiles/v1/network_profiles.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/networks/v1/networks.proto b/protos/google/cloud/compute/networks/v1/networks.proto index 514e0a1604f55..64747c1822aa4 100644 --- a/protos/google/cloud/compute/networks/v1/networks.proto +++ b/protos/google/cloud/compute/networks/v1/networks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/node_groups/v1/node_groups.proto b/protos/google/cloud/compute/node_groups/v1/node_groups.proto index acc9e57c57fd9..be723ebd50d27 100644 --- a/protos/google/cloud/compute/node_groups/v1/node_groups.proto +++ b/protos/google/cloud/compute/node_groups/v1/node_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/node_templates/v1/node_templates.proto b/protos/google/cloud/compute/node_templates/v1/node_templates.proto index 48203a5d09c1a..9a618afee05ee 100644 --- a/protos/google/cloud/compute/node_templates/v1/node_templates.proto +++ b/protos/google/cloud/compute/node_templates/v1/node_templates.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/node_types/v1/node_types.proto b/protos/google/cloud/compute/node_types/v1/node_types.proto index 1e71c980618c0..b3c698edbcabf 100644 --- a/protos/google/cloud/compute/node_types/v1/node_types.proto +++ b/protos/google/cloud/compute/node_types/v1/node_types.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.proto b/protos/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.proto index 3f4d65d7d8b38..6ebd952e70d40 100644 --- a/protos/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.proto +++ b/protos/google/cloud/compute/packet_mirrorings/v1/packet_mirrorings.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/projects/v1/projects.proto b/protos/google/cloud/compute/projects/v1/projects.proto index 0fb356401b82c..0a8c556d00e6e 100644 --- a/protos/google/cloud/compute/projects/v1/projects.proto +++ b/protos/google/cloud/compute/projects/v1/projects.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.proto b/protos/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.proto index 6368e50ea6728..1d0a6b807010d 100644 --- a/protos/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.proto +++ b/protos/google/cloud/compute/public_advertised_prefixes/v1/public_advertised_prefixes.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.proto b/protos/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.proto index 5334a1892b3c6..869926cc34a16 100644 --- a/protos/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.proto +++ b/protos/google/cloud/compute/public_delegated_prefixes/v1/public_delegated_prefixes.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_autoscalers/v1/region_autoscalers.proto b/protos/google/cloud/compute/region_autoscalers/v1/region_autoscalers.proto index 1e27595cc67ba..29025fcf1234c 100644 --- a/protos/google/cloud/compute/region_autoscalers/v1/region_autoscalers.proto +++ b/protos/google/cloud/compute/region_autoscalers/v1/region_autoscalers.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_backend_services/v1/region_backend_services.proto b/protos/google/cloud/compute/region_backend_services/v1/region_backend_services.proto index d360fcbd1b792..c231a31a994d9 100644 --- a/protos/google/cloud/compute/region_backend_services/v1/region_backend_services.proto +++ b/protos/google/cloud/compute/region_backend_services/v1/region_backend_services.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_commitments/v1/region_commitments.proto b/protos/google/cloud/compute/region_commitments/v1/region_commitments.proto index e19e3920e455c..375e3099a51c5 100644 --- a/protos/google/cloud/compute/region_commitments/v1/region_commitments.proto +++ b/protos/google/cloud/compute/region_commitments/v1/region_commitments.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_disk_types/v1/region_disk_types.proto b/protos/google/cloud/compute/region_disk_types/v1/region_disk_types.proto index 957820de6910c..7f67d43dbb0c0 100644 --- a/protos/google/cloud/compute/region_disk_types/v1/region_disk_types.proto +++ b/protos/google/cloud/compute/region_disk_types/v1/region_disk_types.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_disks/v1/region_disks.proto b/protos/google/cloud/compute/region_disks/v1/region_disks.proto index 89f7040761f77..27251d382c809 100644 --- a/protos/google/cloud/compute/region_disks/v1/region_disks.proto +++ b/protos/google/cloud/compute/region_disks/v1/region_disks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_health_check_services/v1/region_health_check_services.proto b/protos/google/cloud/compute/region_health_check_services/v1/region_health_check_services.proto index eef5382c0df41..d548427202c94 100644 --- a/protos/google/cloud/compute/region_health_check_services/v1/region_health_check_services.proto +++ b/protos/google/cloud/compute/region_health_check_services/v1/region_health_check_services.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_health_checks/v1/region_health_checks.proto b/protos/google/cloud/compute/region_health_checks/v1/region_health_checks.proto index d81f7e46b3430..eb8c5c6574cac 100644 --- a/protos/google/cloud/compute/region_health_checks/v1/region_health_checks.proto +++ b/protos/google/cloud/compute/region_health_checks/v1/region_health_checks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.proto b/protos/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.proto index b94f8c023e59b..dc6699871714f 100644 --- a/protos/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.proto +++ b/protos/google/cloud/compute/region_instance_group_managers/v1/region_instance_group_managers.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_instance_groups/v1/region_instance_groups.proto b/protos/google/cloud/compute/region_instance_groups/v1/region_instance_groups.proto index e43a8b7cd25ec..3ce68d4a42f18 100644 --- a/protos/google/cloud/compute/region_instance_groups/v1/region_instance_groups.proto +++ b/protos/google/cloud/compute/region_instance_groups/v1/region_instance_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_instance_templates/v1/region_instance_templates.proto b/protos/google/cloud/compute/region_instance_templates/v1/region_instance_templates.proto index de95949c7249a..40ea51258fbfd 100644 --- a/protos/google/cloud/compute/region_instance_templates/v1/region_instance_templates.proto +++ b/protos/google/cloud/compute/region_instance_templates/v1/region_instance_templates.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_instances/v1/region_instances.proto b/protos/google/cloud/compute/region_instances/v1/region_instances.proto index 5dd9760a5ebf2..fd781957987e6 100644 --- a/protos/google/cloud/compute/region_instances/v1/region_instances.proto +++ b/protos/google/cloud/compute/region_instances/v1/region_instances.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.proto b/protos/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.proto index 90c31f4f1e415..bb508dd167c97 100644 --- a/protos/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.proto +++ b/protos/google/cloud/compute/region_instant_snapshots/v1/region_instant_snapshots.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.proto b/protos/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.proto index e3d22f0ad96be..dd1eedc492cf5 100644 --- a/protos/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.proto +++ b/protos/google/cloud/compute/region_network_endpoint_groups/v1/region_network_endpoint_groups.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.proto b/protos/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.proto index f71b6ffcf963a..c131e132b9df6 100644 --- a/protos/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.proto +++ b/protos/google/cloud/compute/region_network_firewall_policies/v1/region_network_firewall_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.proto b/protos/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.proto index 4fbbe0f17d7ef..1ab1e6759bd02 100644 --- a/protos/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.proto +++ b/protos/google/cloud/compute/region_notification_endpoints/v1/region_notification_endpoints.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_operations/v1/region_operations.proto b/protos/google/cloud/compute/region_operations/v1/region_operations.proto index bb2bdd40ec995..adeb6dda2258c 100644 --- a/protos/google/cloud/compute/region_operations/v1/region_operations.proto +++ b/protos/google/cloud/compute/region_operations/v1/region_operations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_security_policies/v1/region_security_policies.proto b/protos/google/cloud/compute/region_security_policies/v1/region_security_policies.proto index b34f8150b05c6..765bd53e71620 100644 --- a/protos/google/cloud/compute/region_security_policies/v1/region_security_policies.proto +++ b/protos/google/cloud/compute/region_security_policies/v1/region_security_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.proto b/protos/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.proto index 349fd69ffae86..41699914944ed 100644 --- a/protos/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.proto +++ b/protos/google/cloud/compute/region_ssl_certificates/v1/region_ssl_certificates.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.proto b/protos/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.proto index 7d67fb665565d..028cf751e65ab 100644 --- a/protos/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.proto +++ b/protos/google/cloud/compute/region_ssl_policies/v1/region_ssl_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.proto b/protos/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.proto index ff826526871c3..8b7943e034e08 100644 --- a/protos/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.proto +++ b/protos/google/cloud/compute/region_target_http_proxies/v1/region_target_http_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.proto b/protos/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.proto index c5d7d8c3665b3..3fd6e98a23cdb 100644 --- a/protos/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.proto +++ b/protos/google/cloud/compute/region_target_https_proxies/v1/region_target_https_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.proto b/protos/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.proto index 951e134895ca0..db589fd9ad87a 100644 --- a/protos/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.proto +++ b/protos/google/cloud/compute/region_target_tcp_proxies/v1/region_target_tcp_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_url_maps/v1/region_url_maps.proto b/protos/google/cloud/compute/region_url_maps/v1/region_url_maps.proto index 0e51bfd54e03e..b91f5eb075470 100644 --- a/protos/google/cloud/compute/region_url_maps/v1/region_url_maps.proto +++ b/protos/google/cloud/compute/region_url_maps/v1/region_url_maps.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/region_zones/v1/region_zones.proto b/protos/google/cloud/compute/region_zones/v1/region_zones.proto index d329a37e0167a..210194f4e517d 100644 --- a/protos/google/cloud/compute/region_zones/v1/region_zones.proto +++ b/protos/google/cloud/compute/region_zones/v1/region_zones.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/regions/v1/regions.proto b/protos/google/cloud/compute/regions/v1/regions.proto index 6bd4a14dba03e..68d7af11251c3 100644 --- a/protos/google/cloud/compute/regions/v1/regions.proto +++ b/protos/google/cloud/compute/regions/v1/regions.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/reservation_blocks/v1/reservation_blocks.proto b/protos/google/cloud/compute/reservation_blocks/v1/reservation_blocks.proto index cc9751c635dfe..503cb9420e338 100644 --- a/protos/google/cloud/compute/reservation_blocks/v1/reservation_blocks.proto +++ b/protos/google/cloud/compute/reservation_blocks/v1/reservation_blocks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.proto b/protos/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.proto index 41c3f1737f563..8592e30e39c3e 100644 --- a/protos/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.proto +++ b/protos/google/cloud/compute/reservation_sub_blocks/v1/reservation_sub_blocks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/reservations/v1/reservations.proto b/protos/google/cloud/compute/reservations/v1/reservations.proto index 83cb5ff72e54f..5d76cff2e5e2c 100644 --- a/protos/google/cloud/compute/reservations/v1/reservations.proto +++ b/protos/google/cloud/compute/reservations/v1/reservations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/resource_policies/v1/resource_policies.proto b/protos/google/cloud/compute/resource_policies/v1/resource_policies.proto index e53820df7893b..35a0dc034e36f 100644 --- a/protos/google/cloud/compute/resource_policies/v1/resource_policies.proto +++ b/protos/google/cloud/compute/resource_policies/v1/resource_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/routers/v1/routers.proto b/protos/google/cloud/compute/routers/v1/routers.proto index 7de16e388ac56..9828d71b10de1 100644 --- a/protos/google/cloud/compute/routers/v1/routers.proto +++ b/protos/google/cloud/compute/routers/v1/routers.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/routes/v1/routes.proto b/protos/google/cloud/compute/routes/v1/routes.proto index cf93e620f7c48..22bdce53c75b5 100644 --- a/protos/google/cloud/compute/routes/v1/routes.proto +++ b/protos/google/cloud/compute/routes/v1/routes.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/security_policies/v1/security_policies.proto b/protos/google/cloud/compute/security_policies/v1/security_policies.proto index b102c34f8377b..409d6415550f0 100644 --- a/protos/google/cloud/compute/security_policies/v1/security_policies.proto +++ b/protos/google/cloud/compute/security_policies/v1/security_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/service_attachments/v1/service_attachments.proto b/protos/google/cloud/compute/service_attachments/v1/service_attachments.proto index 8fdbac437eb52..c114c9aba3cac 100644 --- a/protos/google/cloud/compute/service_attachments/v1/service_attachments.proto +++ b/protos/google/cloud/compute/service_attachments/v1/service_attachments.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/snapshot_settings/v1/snapshot_settings.proto b/protos/google/cloud/compute/snapshot_settings/v1/snapshot_settings.proto index c4bee3b515300..2cfecb42c42c5 100644 --- a/protos/google/cloud/compute/snapshot_settings/v1/snapshot_settings.proto +++ b/protos/google/cloud/compute/snapshot_settings/v1/snapshot_settings.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/snapshots/v1/snapshots.proto b/protos/google/cloud/compute/snapshots/v1/snapshots.proto index 378e48813b424..a9c597b74caa8 100644 --- a/protos/google/cloud/compute/snapshots/v1/snapshots.proto +++ b/protos/google/cloud/compute/snapshots/v1/snapshots.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/ssl_certificates/v1/ssl_certificates.proto b/protos/google/cloud/compute/ssl_certificates/v1/ssl_certificates.proto index 9ca395a3db734..85dd39105c83e 100644 --- a/protos/google/cloud/compute/ssl_certificates/v1/ssl_certificates.proto +++ b/protos/google/cloud/compute/ssl_certificates/v1/ssl_certificates.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/ssl_policies/v1/ssl_policies.proto b/protos/google/cloud/compute/ssl_policies/v1/ssl_policies.proto index 87a43fbcfef0f..cab21c39f6a11 100644 --- a/protos/google/cloud/compute/ssl_policies/v1/ssl_policies.proto +++ b/protos/google/cloud/compute/ssl_policies/v1/ssl_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/storage_pool_types/v1/storage_pool_types.proto b/protos/google/cloud/compute/storage_pool_types/v1/storage_pool_types.proto index 17c01fb1f393e..3378b5fd6f9a5 100644 --- a/protos/google/cloud/compute/storage_pool_types/v1/storage_pool_types.proto +++ b/protos/google/cloud/compute/storage_pool_types/v1/storage_pool_types.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/storage_pools/v1/storage_pools.proto b/protos/google/cloud/compute/storage_pools/v1/storage_pools.proto index 39ad1ecda73dc..2cdcf3019d8d8 100644 --- a/protos/google/cloud/compute/storage_pools/v1/storage_pools.proto +++ b/protos/google/cloud/compute/storage_pools/v1/storage_pools.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/subnetworks/v1/subnetworks.proto b/protos/google/cloud/compute/subnetworks/v1/subnetworks.proto index 70505d3f9dc8c..03d697d905025 100644 --- a/protos/google/cloud/compute/subnetworks/v1/subnetworks.proto +++ b/protos/google/cloud/compute/subnetworks/v1/subnetworks.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.proto b/protos/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.proto index d8ef6880fd95e..dff34ad9432a0 100644 --- a/protos/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.proto +++ b/protos/google/cloud/compute/target_grpc_proxies/v1/target_grpc_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_http_proxies/v1/target_http_proxies.proto b/protos/google/cloud/compute/target_http_proxies/v1/target_http_proxies.proto index 8194d3ec96112..8ab780c36b5de 100644 --- a/protos/google/cloud/compute/target_http_proxies/v1/target_http_proxies.proto +++ b/protos/google/cloud/compute/target_http_proxies/v1/target_http_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_https_proxies/v1/target_https_proxies.proto b/protos/google/cloud/compute/target_https_proxies/v1/target_https_proxies.proto index 1334a707928c8..c2d965ddb3632 100644 --- a/protos/google/cloud/compute/target_https_proxies/v1/target_https_proxies.proto +++ b/protos/google/cloud/compute/target_https_proxies/v1/target_https_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_instances/v1/target_instances.proto b/protos/google/cloud/compute/target_instances/v1/target_instances.proto index 7e226118e4ea2..a394f0b45c536 100644 --- a/protos/google/cloud/compute/target_instances/v1/target_instances.proto +++ b/protos/google/cloud/compute/target_instances/v1/target_instances.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_pools/v1/target_pools.proto b/protos/google/cloud/compute/target_pools/v1/target_pools.proto index e7ce776f66fec..69462dd9751df 100644 --- a/protos/google/cloud/compute/target_pools/v1/target_pools.proto +++ b/protos/google/cloud/compute/target_pools/v1/target_pools.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.proto b/protos/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.proto index bbae3e7783a0e..ba3dea18d4e69 100644 --- a/protos/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.proto +++ b/protos/google/cloud/compute/target_ssl_proxies/v1/target_ssl_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.proto b/protos/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.proto index dcd44b7dd5078..9df7ba52d9626 100644 --- a/protos/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.proto +++ b/protos/google/cloud/compute/target_tcp_proxies/v1/target_tcp_proxies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.proto b/protos/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.proto index e44b8be9a529c..e807c662ef0ad 100644 --- a/protos/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.proto +++ b/protos/google/cloud/compute/target_vpn_gateways/v1/target_vpn_gateways.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/url_maps/v1/url_maps.proto b/protos/google/cloud/compute/url_maps/v1/url_maps.proto index e35cf5d343b9f..250deb458bd88 100644 --- a/protos/google/cloud/compute/url_maps/v1/url_maps.proto +++ b/protos/google/cloud/compute/url_maps/v1/url_maps.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_000.proto b/protos/google/cloud/compute/v1/internal/common_000.proto index ad588be5b370a..11073aa52382c 100644 --- a/protos/google/cloud/compute/v1/internal/common_000.proto +++ b/protos/google/cloud/compute/v1/internal/common_000.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_001.proto b/protos/google/cloud/compute/v1/internal/common_001.proto index 3be2846e9e513..7b628616d8235 100644 --- a/protos/google/cloud/compute/v1/internal/common_001.proto +++ b/protos/google/cloud/compute/v1/internal/common_001.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_002.proto b/protos/google/cloud/compute/v1/internal/common_002.proto index b410a4f8cd838..f1d48c4ca8d53 100644 --- a/protos/google/cloud/compute/v1/internal/common_002.proto +++ b/protos/google/cloud/compute/v1/internal/common_002.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_003.proto b/protos/google/cloud/compute/v1/internal/common_003.proto index 29a9b5202a243..f7d4374dd073b 100644 --- a/protos/google/cloud/compute/v1/internal/common_003.proto +++ b/protos/google/cloud/compute/v1/internal/common_003.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_004.proto b/protos/google/cloud/compute/v1/internal/common_004.proto index b289ba4d92169..91ae0a18364d2 100644 --- a/protos/google/cloud/compute/v1/internal/common_004.proto +++ b/protos/google/cloud/compute/v1/internal/common_004.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_005.proto b/protos/google/cloud/compute/v1/internal/common_005.proto index 66ecef1b19351..6d152f115fbde 100644 --- a/protos/google/cloud/compute/v1/internal/common_005.proto +++ b/protos/google/cloud/compute/v1/internal/common_005.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_006.proto b/protos/google/cloud/compute/v1/internal/common_006.proto index 8294f4a158cbb..69512b634bdd1 100644 --- a/protos/google/cloud/compute/v1/internal/common_006.proto +++ b/protos/google/cloud/compute/v1/internal/common_006.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_007.proto b/protos/google/cloud/compute/v1/internal/common_007.proto index 31d3c6a309705..358491d84dc9a 100644 --- a/protos/google/cloud/compute/v1/internal/common_007.proto +++ b/protos/google/cloud/compute/v1/internal/common_007.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_008.proto b/protos/google/cloud/compute/v1/internal/common_008.proto index b3ae147416715..c93816df2c908 100644 --- a/protos/google/cloud/compute/v1/internal/common_008.proto +++ b/protos/google/cloud/compute/v1/internal/common_008.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_009.proto b/protos/google/cloud/compute/v1/internal/common_009.proto index 6cdec5148a0b0..fa1971fc9d481 100644 --- a/protos/google/cloud/compute/v1/internal/common_009.proto +++ b/protos/google/cloud/compute/v1/internal/common_009.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_010.proto b/protos/google/cloud/compute/v1/internal/common_010.proto index c1fe4b300ec64..1a94809d9a0b9 100644 --- a/protos/google/cloud/compute/v1/internal/common_010.proto +++ b/protos/google/cloud/compute/v1/internal/common_010.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_011.proto b/protos/google/cloud/compute/v1/internal/common_011.proto index 148328002fa3c..e75fa32fdb516 100644 --- a/protos/google/cloud/compute/v1/internal/common_011.proto +++ b/protos/google/cloud/compute/v1/internal/common_011.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_012.proto b/protos/google/cloud/compute/v1/internal/common_012.proto index 95a3f54c29b6d..66a0905e0837c 100644 --- a/protos/google/cloud/compute/v1/internal/common_012.proto +++ b/protos/google/cloud/compute/v1/internal/common_012.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_013.proto b/protos/google/cloud/compute/v1/internal/common_013.proto index 30128991e4628..6c3e34678af0c 100644 --- a/protos/google/cloud/compute/v1/internal/common_013.proto +++ b/protos/google/cloud/compute/v1/internal/common_013.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_014.proto b/protos/google/cloud/compute/v1/internal/common_014.proto index 0a4765e4fc4ad..5db4ab6e0d5ed 100644 --- a/protos/google/cloud/compute/v1/internal/common_014.proto +++ b/protos/google/cloud/compute/v1/internal/common_014.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_015.proto b/protos/google/cloud/compute/v1/internal/common_015.proto index 5f26a674eba95..2c4c98a446d1f 100644 --- a/protos/google/cloud/compute/v1/internal/common_015.proto +++ b/protos/google/cloud/compute/v1/internal/common_015.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_016.proto b/protos/google/cloud/compute/v1/internal/common_016.proto index 9827e4f86c8ee..14a930ba914aa 100644 --- a/protos/google/cloud/compute/v1/internal/common_016.proto +++ b/protos/google/cloud/compute/v1/internal/common_016.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_017.proto b/protos/google/cloud/compute/v1/internal/common_017.proto index 3a5b4f1e9cc97..0e4f8cf5a0f11 100644 --- a/protos/google/cloud/compute/v1/internal/common_017.proto +++ b/protos/google/cloud/compute/v1/internal/common_017.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_018.proto b/protos/google/cloud/compute/v1/internal/common_018.proto index 8fd41512567a3..5d7529b3019a0 100644 --- a/protos/google/cloud/compute/v1/internal/common_018.proto +++ b/protos/google/cloud/compute/v1/internal/common_018.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_019.proto b/protos/google/cloud/compute/v1/internal/common_019.proto index 26c6e5b795276..8395047ddf4bf 100644 --- a/protos/google/cloud/compute/v1/internal/common_019.proto +++ b/protos/google/cloud/compute/v1/internal/common_019.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_020.proto b/protos/google/cloud/compute/v1/internal/common_020.proto index aa363b527addc..690f70427522e 100644 --- a/protos/google/cloud/compute/v1/internal/common_020.proto +++ b/protos/google/cloud/compute/v1/internal/common_020.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_021.proto b/protos/google/cloud/compute/v1/internal/common_021.proto index b5c9951bb68f4..1f74c58fb74c7 100644 --- a/protos/google/cloud/compute/v1/internal/common_021.proto +++ b/protos/google/cloud/compute/v1/internal/common_021.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_022.proto b/protos/google/cloud/compute/v1/internal/common_022.proto index d98527ef0fd0b..e74657d17719f 100644 --- a/protos/google/cloud/compute/v1/internal/common_022.proto +++ b/protos/google/cloud/compute/v1/internal/common_022.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_023.proto b/protos/google/cloud/compute/v1/internal/common_023.proto index 1bdd148916f68..7b4ee84b295a1 100644 --- a/protos/google/cloud/compute/v1/internal/common_023.proto +++ b/protos/google/cloud/compute/v1/internal/common_023.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_024.proto b/protos/google/cloud/compute/v1/internal/common_024.proto index d9b97686a9fbd..0d96caf943174 100644 --- a/protos/google/cloud/compute/v1/internal/common_024.proto +++ b/protos/google/cloud/compute/v1/internal/common_024.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_025.proto b/protos/google/cloud/compute/v1/internal/common_025.proto index dd49b0e479cc4..9a444e9f23481 100644 --- a/protos/google/cloud/compute/v1/internal/common_025.proto +++ b/protos/google/cloud/compute/v1/internal/common_025.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_026.proto b/protos/google/cloud/compute/v1/internal/common_026.proto index 48e2c7316d2d6..9a39c68ed29d9 100644 --- a/protos/google/cloud/compute/v1/internal/common_026.proto +++ b/protos/google/cloud/compute/v1/internal/common_026.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_027.proto b/protos/google/cloud/compute/v1/internal/common_027.proto index e31eb781bbed4..85dfa5f4a68bc 100644 --- a/protos/google/cloud/compute/v1/internal/common_027.proto +++ b/protos/google/cloud/compute/v1/internal/common_027.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_028.proto b/protos/google/cloud/compute/v1/internal/common_028.proto index 1d537d0a6b7ec..da0f8be0120e8 100644 --- a/protos/google/cloud/compute/v1/internal/common_028.proto +++ b/protos/google/cloud/compute/v1/internal/common_028.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_029.proto b/protos/google/cloud/compute/v1/internal/common_029.proto index 3c36bd63640bb..7d47aa4227eba 100644 --- a/protos/google/cloud/compute/v1/internal/common_029.proto +++ b/protos/google/cloud/compute/v1/internal/common_029.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_030.proto b/protos/google/cloud/compute/v1/internal/common_030.proto index ee0f760b28879..afad0da2aadc0 100644 --- a/protos/google/cloud/compute/v1/internal/common_030.proto +++ b/protos/google/cloud/compute/v1/internal/common_030.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_031.proto b/protos/google/cloud/compute/v1/internal/common_031.proto index 23232fe16f676..0f91593bae417 100644 --- a/protos/google/cloud/compute/v1/internal/common_031.proto +++ b/protos/google/cloud/compute/v1/internal/common_031.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_032.proto b/protos/google/cloud/compute/v1/internal/common_032.proto index d6f4c787f9861..2ee6d27e27ba0 100644 --- a/protos/google/cloud/compute/v1/internal/common_032.proto +++ b/protos/google/cloud/compute/v1/internal/common_032.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_033.proto b/protos/google/cloud/compute/v1/internal/common_033.proto index f69f93773dc09..d37e111579d5c 100644 --- a/protos/google/cloud/compute/v1/internal/common_033.proto +++ b/protos/google/cloud/compute/v1/internal/common_033.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_034.proto b/protos/google/cloud/compute/v1/internal/common_034.proto index 1cda0a1e98565..8153ca51f2f75 100644 --- a/protos/google/cloud/compute/v1/internal/common_034.proto +++ b/protos/google/cloud/compute/v1/internal/common_034.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_035.proto b/protos/google/cloud/compute/v1/internal/common_035.proto index 1c78b96f427b9..0f8e4e230e8e1 100644 --- a/protos/google/cloud/compute/v1/internal/common_035.proto +++ b/protos/google/cloud/compute/v1/internal/common_035.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_036.proto b/protos/google/cloud/compute/v1/internal/common_036.proto index 0bdfdd71406f3..fa8eaf38a7ede 100644 --- a/protos/google/cloud/compute/v1/internal/common_036.proto +++ b/protos/google/cloud/compute/v1/internal/common_036.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_037.proto b/protos/google/cloud/compute/v1/internal/common_037.proto index da91e1d022f9b..2d06c9fa83468 100644 --- a/protos/google/cloud/compute/v1/internal/common_037.proto +++ b/protos/google/cloud/compute/v1/internal/common_037.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_038.proto b/protos/google/cloud/compute/v1/internal/common_038.proto index e81339ef5c6e9..8f9f41864ce97 100644 --- a/protos/google/cloud/compute/v1/internal/common_038.proto +++ b/protos/google/cloud/compute/v1/internal/common_038.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_039.proto b/protos/google/cloud/compute/v1/internal/common_039.proto index fd18a067f510d..0452b3f6de645 100644 --- a/protos/google/cloud/compute/v1/internal/common_039.proto +++ b/protos/google/cloud/compute/v1/internal/common_039.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_040.proto b/protos/google/cloud/compute/v1/internal/common_040.proto index 97a6763582326..92b2408a630f6 100644 --- a/protos/google/cloud/compute/v1/internal/common_040.proto +++ b/protos/google/cloud/compute/v1/internal/common_040.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_041.proto b/protos/google/cloud/compute/v1/internal/common_041.proto index b889b3f6af5dc..fed8754a4557e 100644 --- a/protos/google/cloud/compute/v1/internal/common_041.proto +++ b/protos/google/cloud/compute/v1/internal/common_041.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_042.proto b/protos/google/cloud/compute/v1/internal/common_042.proto index 66e54a43ca72f..89f712b505057 100644 --- a/protos/google/cloud/compute/v1/internal/common_042.proto +++ b/protos/google/cloud/compute/v1/internal/common_042.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_043.proto b/protos/google/cloud/compute/v1/internal/common_043.proto index ff5d5b754385f..23b356ac17f38 100644 --- a/protos/google/cloud/compute/v1/internal/common_043.proto +++ b/protos/google/cloud/compute/v1/internal/common_043.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_044.proto b/protos/google/cloud/compute/v1/internal/common_044.proto index 5bf2b27b7d767..e69ce7c0fdf81 100644 --- a/protos/google/cloud/compute/v1/internal/common_044.proto +++ b/protos/google/cloud/compute/v1/internal/common_044.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_045.proto b/protos/google/cloud/compute/v1/internal/common_045.proto index 79e0715d550ff..72c255facfbcb 100644 --- a/protos/google/cloud/compute/v1/internal/common_045.proto +++ b/protos/google/cloud/compute/v1/internal/common_045.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_046.proto b/protos/google/cloud/compute/v1/internal/common_046.proto index 86f9651b04cba..58403ab88c0a2 100644 --- a/protos/google/cloud/compute/v1/internal/common_046.proto +++ b/protos/google/cloud/compute/v1/internal/common_046.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_047.proto b/protos/google/cloud/compute/v1/internal/common_047.proto index baa5984d4ce31..755239e7ed713 100644 --- a/protos/google/cloud/compute/v1/internal/common_047.proto +++ b/protos/google/cloud/compute/v1/internal/common_047.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_048.proto b/protos/google/cloud/compute/v1/internal/common_048.proto index f0bc977764953..898ea946589c9 100644 --- a/protos/google/cloud/compute/v1/internal/common_048.proto +++ b/protos/google/cloud/compute/v1/internal/common_048.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_049.proto b/protos/google/cloud/compute/v1/internal/common_049.proto index 509424e219ef4..7a8e40d593794 100644 --- a/protos/google/cloud/compute/v1/internal/common_049.proto +++ b/protos/google/cloud/compute/v1/internal/common_049.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_050.proto b/protos/google/cloud/compute/v1/internal/common_050.proto index e8d3590ef5c83..d1b7c84dc7443 100644 --- a/protos/google/cloud/compute/v1/internal/common_050.proto +++ b/protos/google/cloud/compute/v1/internal/common_050.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_051.proto b/protos/google/cloud/compute/v1/internal/common_051.proto index bd830c16d99e7..5ca9408ad391d 100644 --- a/protos/google/cloud/compute/v1/internal/common_051.proto +++ b/protos/google/cloud/compute/v1/internal/common_051.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_052.proto b/protos/google/cloud/compute/v1/internal/common_052.proto index b295856eeddb6..4b6923db1c4dc 100644 --- a/protos/google/cloud/compute/v1/internal/common_052.proto +++ b/protos/google/cloud/compute/v1/internal/common_052.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_053.proto b/protos/google/cloud/compute/v1/internal/common_053.proto index 62caba69a32c6..ec1b5eef34d53 100644 --- a/protos/google/cloud/compute/v1/internal/common_053.proto +++ b/protos/google/cloud/compute/v1/internal/common_053.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_054.proto b/protos/google/cloud/compute/v1/internal/common_054.proto index 4ea70fddf54fd..d1e48a08cc616 100644 --- a/protos/google/cloud/compute/v1/internal/common_054.proto +++ b/protos/google/cloud/compute/v1/internal/common_054.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_055.proto b/protos/google/cloud/compute/v1/internal/common_055.proto index 193b3a31959cf..183cc6fb6d313 100644 --- a/protos/google/cloud/compute/v1/internal/common_055.proto +++ b/protos/google/cloud/compute/v1/internal/common_055.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_056.proto b/protos/google/cloud/compute/v1/internal/common_056.proto index 604ab784260d8..c160a065d89a7 100644 --- a/protos/google/cloud/compute/v1/internal/common_056.proto +++ b/protos/google/cloud/compute/v1/internal/common_056.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_057.proto b/protos/google/cloud/compute/v1/internal/common_057.proto index 7e9f6c151a592..7815e467ca652 100644 --- a/protos/google/cloud/compute/v1/internal/common_057.proto +++ b/protos/google/cloud/compute/v1/internal/common_057.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_058.proto b/protos/google/cloud/compute/v1/internal/common_058.proto index dbe3e1d6d44a8..1a36fa04e69c1 100644 --- a/protos/google/cloud/compute/v1/internal/common_058.proto +++ b/protos/google/cloud/compute/v1/internal/common_058.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_059.proto b/protos/google/cloud/compute/v1/internal/common_059.proto index 4d35b8515ccdd..b9718d6c3c9a4 100644 --- a/protos/google/cloud/compute/v1/internal/common_059.proto +++ b/protos/google/cloud/compute/v1/internal/common_059.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_060.proto b/protos/google/cloud/compute/v1/internal/common_060.proto index 7d52f07829641..852cf28719a20 100644 --- a/protos/google/cloud/compute/v1/internal/common_060.proto +++ b/protos/google/cloud/compute/v1/internal/common_060.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_061.proto b/protos/google/cloud/compute/v1/internal/common_061.proto index c747532857ec4..bb408ce0fc418 100644 --- a/protos/google/cloud/compute/v1/internal/common_061.proto +++ b/protos/google/cloud/compute/v1/internal/common_061.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_062.proto b/protos/google/cloud/compute/v1/internal/common_062.proto index 91bc8eb6a6bd5..215134625321e 100644 --- a/protos/google/cloud/compute/v1/internal/common_062.proto +++ b/protos/google/cloud/compute/v1/internal/common_062.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_063.proto b/protos/google/cloud/compute/v1/internal/common_063.proto index a7b000e904086..3435a5c5e82ed 100644 --- a/protos/google/cloud/compute/v1/internal/common_063.proto +++ b/protos/google/cloud/compute/v1/internal/common_063.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_064.proto b/protos/google/cloud/compute/v1/internal/common_064.proto index 7c315fe5a710b..419f8c306dc39 100644 --- a/protos/google/cloud/compute/v1/internal/common_064.proto +++ b/protos/google/cloud/compute/v1/internal/common_064.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_065.proto b/protos/google/cloud/compute/v1/internal/common_065.proto index 6969fabe3636e..f440af882aedf 100644 --- a/protos/google/cloud/compute/v1/internal/common_065.proto +++ b/protos/google/cloud/compute/v1/internal/common_065.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_066.proto b/protos/google/cloud/compute/v1/internal/common_066.proto index 51d0dda48e0e1..7459f82aa38a3 100644 --- a/protos/google/cloud/compute/v1/internal/common_066.proto +++ b/protos/google/cloud/compute/v1/internal/common_066.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_067.proto b/protos/google/cloud/compute/v1/internal/common_067.proto index 0d9564b6de4a2..b0cc565ca8a39 100644 --- a/protos/google/cloud/compute/v1/internal/common_067.proto +++ b/protos/google/cloud/compute/v1/internal/common_067.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_068.proto b/protos/google/cloud/compute/v1/internal/common_068.proto index 607312fab86fe..fe49ad24b1849 100644 --- a/protos/google/cloud/compute/v1/internal/common_068.proto +++ b/protos/google/cloud/compute/v1/internal/common_068.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_069.proto b/protos/google/cloud/compute/v1/internal/common_069.proto index 01c127dcf642a..cab47fddefa23 100644 --- a/protos/google/cloud/compute/v1/internal/common_069.proto +++ b/protos/google/cloud/compute/v1/internal/common_069.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_070.proto b/protos/google/cloud/compute/v1/internal/common_070.proto index 4b005f2a44dbd..a04e23464616a 100644 --- a/protos/google/cloud/compute/v1/internal/common_070.proto +++ b/protos/google/cloud/compute/v1/internal/common_070.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_071.proto b/protos/google/cloud/compute/v1/internal/common_071.proto index 3fea923fd3bb6..a3087646a3fd2 100644 --- a/protos/google/cloud/compute/v1/internal/common_071.proto +++ b/protos/google/cloud/compute/v1/internal/common_071.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_072.proto b/protos/google/cloud/compute/v1/internal/common_072.proto index 393eefb78c0bc..ef5ed4eb8e8af 100644 --- a/protos/google/cloud/compute/v1/internal/common_072.proto +++ b/protos/google/cloud/compute/v1/internal/common_072.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_073.proto b/protos/google/cloud/compute/v1/internal/common_073.proto index 596aa61d4cc79..382281b632d32 100644 --- a/protos/google/cloud/compute/v1/internal/common_073.proto +++ b/protos/google/cloud/compute/v1/internal/common_073.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_074.proto b/protos/google/cloud/compute/v1/internal/common_074.proto index 987dce8102f4c..bf239a033ec07 100644 --- a/protos/google/cloud/compute/v1/internal/common_074.proto +++ b/protos/google/cloud/compute/v1/internal/common_074.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_075.proto b/protos/google/cloud/compute/v1/internal/common_075.proto index 8e059bfa68617..9dbc8e4d9601f 100644 --- a/protos/google/cloud/compute/v1/internal/common_075.proto +++ b/protos/google/cloud/compute/v1/internal/common_075.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_076.proto b/protos/google/cloud/compute/v1/internal/common_076.proto index 5424ef727e7fc..2ef6db1fd5c39 100644 --- a/protos/google/cloud/compute/v1/internal/common_076.proto +++ b/protos/google/cloud/compute/v1/internal/common_076.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_077.proto b/protos/google/cloud/compute/v1/internal/common_077.proto index 679b73060f3bb..72aff546a26b8 100644 --- a/protos/google/cloud/compute/v1/internal/common_077.proto +++ b/protos/google/cloud/compute/v1/internal/common_077.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_078.proto b/protos/google/cloud/compute/v1/internal/common_078.proto index ce6a458831f67..65bebcfdfa5bc 100644 --- a/protos/google/cloud/compute/v1/internal/common_078.proto +++ b/protos/google/cloud/compute/v1/internal/common_078.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_079.proto b/protos/google/cloud/compute/v1/internal/common_079.proto index e85eee94f85aa..ac13fe4cde848 100644 --- a/protos/google/cloud/compute/v1/internal/common_079.proto +++ b/protos/google/cloud/compute/v1/internal/common_079.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_080.proto b/protos/google/cloud/compute/v1/internal/common_080.proto index f46c018790dc7..c7480058a0112 100644 --- a/protos/google/cloud/compute/v1/internal/common_080.proto +++ b/protos/google/cloud/compute/v1/internal/common_080.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_081.proto b/protos/google/cloud/compute/v1/internal/common_081.proto index ab6da77f9f370..09700e341b91f 100644 --- a/protos/google/cloud/compute/v1/internal/common_081.proto +++ b/protos/google/cloud/compute/v1/internal/common_081.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_082.proto b/protos/google/cloud/compute/v1/internal/common_082.proto index 2bdb1d81919b6..ae21276edd420 100644 --- a/protos/google/cloud/compute/v1/internal/common_082.proto +++ b/protos/google/cloud/compute/v1/internal/common_082.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_083.proto b/protos/google/cloud/compute/v1/internal/common_083.proto index d60b8a069b857..fd45a9ec8132e 100644 --- a/protos/google/cloud/compute/v1/internal/common_083.proto +++ b/protos/google/cloud/compute/v1/internal/common_083.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_084.proto b/protos/google/cloud/compute/v1/internal/common_084.proto index ba4d45023e3ee..2f3efcb6eb7e5 100644 --- a/protos/google/cloud/compute/v1/internal/common_084.proto +++ b/protos/google/cloud/compute/v1/internal/common_084.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_085.proto b/protos/google/cloud/compute/v1/internal/common_085.proto index 04d2ab7e7a84b..2e25202110962 100644 --- a/protos/google/cloud/compute/v1/internal/common_085.proto +++ b/protos/google/cloud/compute/v1/internal/common_085.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_086.proto b/protos/google/cloud/compute/v1/internal/common_086.proto index d8f25825fe0ea..c9115dfa34e5e 100644 --- a/protos/google/cloud/compute/v1/internal/common_086.proto +++ b/protos/google/cloud/compute/v1/internal/common_086.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_087.proto b/protos/google/cloud/compute/v1/internal/common_087.proto index 1124fc1ac1017..800f649a2092b 100644 --- a/protos/google/cloud/compute/v1/internal/common_087.proto +++ b/protos/google/cloud/compute/v1/internal/common_087.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_088.proto b/protos/google/cloud/compute/v1/internal/common_088.proto index 9e7d397aa11bb..5bfe4505a9dfa 100644 --- a/protos/google/cloud/compute/v1/internal/common_088.proto +++ b/protos/google/cloud/compute/v1/internal/common_088.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_089.proto b/protos/google/cloud/compute/v1/internal/common_089.proto index c6727a1969643..637aeddef35da 100644 --- a/protos/google/cloud/compute/v1/internal/common_089.proto +++ b/protos/google/cloud/compute/v1/internal/common_089.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_090.proto b/protos/google/cloud/compute/v1/internal/common_090.proto index d33a0972de0ee..ddca5b8e3229a 100644 --- a/protos/google/cloud/compute/v1/internal/common_090.proto +++ b/protos/google/cloud/compute/v1/internal/common_090.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_091.proto b/protos/google/cloud/compute/v1/internal/common_091.proto index 13bb1a2ede6a5..ac373605df45c 100644 --- a/protos/google/cloud/compute/v1/internal/common_091.proto +++ b/protos/google/cloud/compute/v1/internal/common_091.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_092.proto b/protos/google/cloud/compute/v1/internal/common_092.proto index 38d8258bc9696..6aacb38f78069 100644 --- a/protos/google/cloud/compute/v1/internal/common_092.proto +++ b/protos/google/cloud/compute/v1/internal/common_092.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_093.proto b/protos/google/cloud/compute/v1/internal/common_093.proto index c2b3d0ac56357..b96b352f247c6 100644 --- a/protos/google/cloud/compute/v1/internal/common_093.proto +++ b/protos/google/cloud/compute/v1/internal/common_093.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_094.proto b/protos/google/cloud/compute/v1/internal/common_094.proto index e045bb76cae1b..2544ac5251b48 100644 --- a/protos/google/cloud/compute/v1/internal/common_094.proto +++ b/protos/google/cloud/compute/v1/internal/common_094.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_095.proto b/protos/google/cloud/compute/v1/internal/common_095.proto index 3776710a658f7..0b355cd96a6e4 100644 --- a/protos/google/cloud/compute/v1/internal/common_095.proto +++ b/protos/google/cloud/compute/v1/internal/common_095.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_096.proto b/protos/google/cloud/compute/v1/internal/common_096.proto index a2e2a3cf08354..f5a47426b2129 100644 --- a/protos/google/cloud/compute/v1/internal/common_096.proto +++ b/protos/google/cloud/compute/v1/internal/common_096.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_097.proto b/protos/google/cloud/compute/v1/internal/common_097.proto index 2fd29d391ee31..24f9493afa147 100644 --- a/protos/google/cloud/compute/v1/internal/common_097.proto +++ b/protos/google/cloud/compute/v1/internal/common_097.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_098.proto b/protos/google/cloud/compute/v1/internal/common_098.proto index 3c065037e7bdf..6c9e723c17537 100644 --- a/protos/google/cloud/compute/v1/internal/common_098.proto +++ b/protos/google/cloud/compute/v1/internal/common_098.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_099.proto b/protos/google/cloud/compute/v1/internal/common_099.proto index 6b970b0032770..95ca799dd9f38 100644 --- a/protos/google/cloud/compute/v1/internal/common_099.proto +++ b/protos/google/cloud/compute/v1/internal/common_099.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_100.proto b/protos/google/cloud/compute/v1/internal/common_100.proto index db4a1084c75bf..4c51f86b8e51e 100644 --- a/protos/google/cloud/compute/v1/internal/common_100.proto +++ b/protos/google/cloud/compute/v1/internal/common_100.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_101.proto b/protos/google/cloud/compute/v1/internal/common_101.proto index 933fbf7a9f8b8..d95f8b1e02969 100644 --- a/protos/google/cloud/compute/v1/internal/common_101.proto +++ b/protos/google/cloud/compute/v1/internal/common_101.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_102.proto b/protos/google/cloud/compute/v1/internal/common_102.proto index c073885fcb430..b1786df985dc5 100644 --- a/protos/google/cloud/compute/v1/internal/common_102.proto +++ b/protos/google/cloud/compute/v1/internal/common_102.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_103.proto b/protos/google/cloud/compute/v1/internal/common_103.proto index a319f37322b14..18e906029a7e6 100644 --- a/protos/google/cloud/compute/v1/internal/common_103.proto +++ b/protos/google/cloud/compute/v1/internal/common_103.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_104.proto b/protos/google/cloud/compute/v1/internal/common_104.proto index b131ab224ce6b..d42397b9cb818 100644 --- a/protos/google/cloud/compute/v1/internal/common_104.proto +++ b/protos/google/cloud/compute/v1/internal/common_104.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_105.proto b/protos/google/cloud/compute/v1/internal/common_105.proto index f035346163da7..178637a08b9f5 100644 --- a/protos/google/cloud/compute/v1/internal/common_105.proto +++ b/protos/google/cloud/compute/v1/internal/common_105.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_106.proto b/protos/google/cloud/compute/v1/internal/common_106.proto index e60533470a9ec..2c679ca2d7690 100644 --- a/protos/google/cloud/compute/v1/internal/common_106.proto +++ b/protos/google/cloud/compute/v1/internal/common_106.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_107.proto b/protos/google/cloud/compute/v1/internal/common_107.proto index c2068fe6e1402..ae51f4c5c1f5d 100644 --- a/protos/google/cloud/compute/v1/internal/common_107.proto +++ b/protos/google/cloud/compute/v1/internal/common_107.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_108.proto b/protos/google/cloud/compute/v1/internal/common_108.proto index 7cd9759074b83..310287f636a29 100644 --- a/protos/google/cloud/compute/v1/internal/common_108.proto +++ b/protos/google/cloud/compute/v1/internal/common_108.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_109.proto b/protos/google/cloud/compute/v1/internal/common_109.proto index 53beefcc0f126..f4606dcb58ba5 100644 --- a/protos/google/cloud/compute/v1/internal/common_109.proto +++ b/protos/google/cloud/compute/v1/internal/common_109.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_110.proto b/protos/google/cloud/compute/v1/internal/common_110.proto index d952d2a56cc3a..62407abb54750 100644 --- a/protos/google/cloud/compute/v1/internal/common_110.proto +++ b/protos/google/cloud/compute/v1/internal/common_110.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_111.proto b/protos/google/cloud/compute/v1/internal/common_111.proto index 5de855c125b40..778b2994e6784 100644 --- a/protos/google/cloud/compute/v1/internal/common_111.proto +++ b/protos/google/cloud/compute/v1/internal/common_111.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_112.proto b/protos/google/cloud/compute/v1/internal/common_112.proto index 1974847f516ab..9d57835fcc71c 100644 --- a/protos/google/cloud/compute/v1/internal/common_112.proto +++ b/protos/google/cloud/compute/v1/internal/common_112.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_113.proto b/protos/google/cloud/compute/v1/internal/common_113.proto index 8b5798f818cdf..d63ff863d32b4 100644 --- a/protos/google/cloud/compute/v1/internal/common_113.proto +++ b/protos/google/cloud/compute/v1/internal/common_113.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_114.proto b/protos/google/cloud/compute/v1/internal/common_114.proto index 57e6391042e76..9807a97b1e985 100644 --- a/protos/google/cloud/compute/v1/internal/common_114.proto +++ b/protos/google/cloud/compute/v1/internal/common_114.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_115.proto b/protos/google/cloud/compute/v1/internal/common_115.proto index 5784637ef8167..3e03aea1f9ca2 100644 --- a/protos/google/cloud/compute/v1/internal/common_115.proto +++ b/protos/google/cloud/compute/v1/internal/common_115.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_116.proto b/protos/google/cloud/compute/v1/internal/common_116.proto index 00fe77c6b81dc..079aeb702830d 100644 --- a/protos/google/cloud/compute/v1/internal/common_116.proto +++ b/protos/google/cloud/compute/v1/internal/common_116.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_117.proto b/protos/google/cloud/compute/v1/internal/common_117.proto index f54378b473de6..1220286ba20fd 100644 --- a/protos/google/cloud/compute/v1/internal/common_117.proto +++ b/protos/google/cloud/compute/v1/internal/common_117.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_118.proto b/protos/google/cloud/compute/v1/internal/common_118.proto index 8b2ac9f9e8bf6..9116b89acb306 100644 --- a/protos/google/cloud/compute/v1/internal/common_118.proto +++ b/protos/google/cloud/compute/v1/internal/common_118.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_119.proto b/protos/google/cloud/compute/v1/internal/common_119.proto index 91728c332394f..e9ba2b46f3430 100644 --- a/protos/google/cloud/compute/v1/internal/common_119.proto +++ b/protos/google/cloud/compute/v1/internal/common_119.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_120.proto b/protos/google/cloud/compute/v1/internal/common_120.proto index 0c06ba2934485..e6fecfc74bc08 100644 --- a/protos/google/cloud/compute/v1/internal/common_120.proto +++ b/protos/google/cloud/compute/v1/internal/common_120.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_121.proto b/protos/google/cloud/compute/v1/internal/common_121.proto index 6cf78b6577257..00bbe00e6366d 100644 --- a/protos/google/cloud/compute/v1/internal/common_121.proto +++ b/protos/google/cloud/compute/v1/internal/common_121.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_122.proto b/protos/google/cloud/compute/v1/internal/common_122.proto index 3175ad3d728b0..fec9e8dfe019d 100644 --- a/protos/google/cloud/compute/v1/internal/common_122.proto +++ b/protos/google/cloud/compute/v1/internal/common_122.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_123.proto b/protos/google/cloud/compute/v1/internal/common_123.proto index aa27a05489f5c..ddc354e7d233d 100644 --- a/protos/google/cloud/compute/v1/internal/common_123.proto +++ b/protos/google/cloud/compute/v1/internal/common_123.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_124.proto b/protos/google/cloud/compute/v1/internal/common_124.proto index 3d282e17e1302..faa35c9e95a5d 100644 --- a/protos/google/cloud/compute/v1/internal/common_124.proto +++ b/protos/google/cloud/compute/v1/internal/common_124.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_125.proto b/protos/google/cloud/compute/v1/internal/common_125.proto index 058935fa219ba..f38802943b5ab 100644 --- a/protos/google/cloud/compute/v1/internal/common_125.proto +++ b/protos/google/cloud/compute/v1/internal/common_125.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_126.proto b/protos/google/cloud/compute/v1/internal/common_126.proto index 399326d70ec6f..bdea54765a2be 100644 --- a/protos/google/cloud/compute/v1/internal/common_126.proto +++ b/protos/google/cloud/compute/v1/internal/common_126.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_127.proto b/protos/google/cloud/compute/v1/internal/common_127.proto index 5e5f61e69a7d5..219d7a4482639 100644 --- a/protos/google/cloud/compute/v1/internal/common_127.proto +++ b/protos/google/cloud/compute/v1/internal/common_127.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_128.proto b/protos/google/cloud/compute/v1/internal/common_128.proto index f9ee06f972116..fc8b4c1424154 100644 --- a/protos/google/cloud/compute/v1/internal/common_128.proto +++ b/protos/google/cloud/compute/v1/internal/common_128.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_129.proto b/protos/google/cloud/compute/v1/internal/common_129.proto index 6115c6e3e653e..d365443d8f6aa 100644 --- a/protos/google/cloud/compute/v1/internal/common_129.proto +++ b/protos/google/cloud/compute/v1/internal/common_129.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_130.proto b/protos/google/cloud/compute/v1/internal/common_130.proto index 81c1be20e1289..4f4d1f5412e83 100644 --- a/protos/google/cloud/compute/v1/internal/common_130.proto +++ b/protos/google/cloud/compute/v1/internal/common_130.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_131.proto b/protos/google/cloud/compute/v1/internal/common_131.proto index 9af025b87d923..603a7d6856181 100644 --- a/protos/google/cloud/compute/v1/internal/common_131.proto +++ b/protos/google/cloud/compute/v1/internal/common_131.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_132.proto b/protos/google/cloud/compute/v1/internal/common_132.proto index d5dd91c318cbb..8081a2b513a28 100644 --- a/protos/google/cloud/compute/v1/internal/common_132.proto +++ b/protos/google/cloud/compute/v1/internal/common_132.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_133.proto b/protos/google/cloud/compute/v1/internal/common_133.proto index 8360d925bac99..1510039a6c15c 100644 --- a/protos/google/cloud/compute/v1/internal/common_133.proto +++ b/protos/google/cloud/compute/v1/internal/common_133.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_134.proto b/protos/google/cloud/compute/v1/internal/common_134.proto index c67e11fd13982..1aaf6cffce68c 100644 --- a/protos/google/cloud/compute/v1/internal/common_134.proto +++ b/protos/google/cloud/compute/v1/internal/common_134.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_135.proto b/protos/google/cloud/compute/v1/internal/common_135.proto index d08c32d1aa194..f56cd6b2f989b 100644 --- a/protos/google/cloud/compute/v1/internal/common_135.proto +++ b/protos/google/cloud/compute/v1/internal/common_135.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_136.proto b/protos/google/cloud/compute/v1/internal/common_136.proto index e385b2258e05a..cab0149ce4c84 100644 --- a/protos/google/cloud/compute/v1/internal/common_136.proto +++ b/protos/google/cloud/compute/v1/internal/common_136.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_137.proto b/protos/google/cloud/compute/v1/internal/common_137.proto index eaa234ecd0c4a..97e4a58d5dc2d 100644 --- a/protos/google/cloud/compute/v1/internal/common_137.proto +++ b/protos/google/cloud/compute/v1/internal/common_137.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_138.proto b/protos/google/cloud/compute/v1/internal/common_138.proto index 1ff96121b368e..27b559c823c5f 100644 --- a/protos/google/cloud/compute/v1/internal/common_138.proto +++ b/protos/google/cloud/compute/v1/internal/common_138.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_139.proto b/protos/google/cloud/compute/v1/internal/common_139.proto index 30b540cadc89d..9056b6cac9a9e 100644 --- a/protos/google/cloud/compute/v1/internal/common_139.proto +++ b/protos/google/cloud/compute/v1/internal/common_139.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_140.proto b/protos/google/cloud/compute/v1/internal/common_140.proto index c75e953b238b3..2719e51b3342f 100644 --- a/protos/google/cloud/compute/v1/internal/common_140.proto +++ b/protos/google/cloud/compute/v1/internal/common_140.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_141.proto b/protos/google/cloud/compute/v1/internal/common_141.proto index 21614b381d612..628e15634482c 100644 --- a/protos/google/cloud/compute/v1/internal/common_141.proto +++ b/protos/google/cloud/compute/v1/internal/common_141.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_142.proto b/protos/google/cloud/compute/v1/internal/common_142.proto index 45092eb4fadaf..b8861714cbaa6 100644 --- a/protos/google/cloud/compute/v1/internal/common_142.proto +++ b/protos/google/cloud/compute/v1/internal/common_142.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_143.proto b/protos/google/cloud/compute/v1/internal/common_143.proto index e2e27a7e39e22..483eddd431955 100644 --- a/protos/google/cloud/compute/v1/internal/common_143.proto +++ b/protos/google/cloud/compute/v1/internal/common_143.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_144.proto b/protos/google/cloud/compute/v1/internal/common_144.proto index 5c1c919e41ee1..f92cff8ffef5f 100644 --- a/protos/google/cloud/compute/v1/internal/common_144.proto +++ b/protos/google/cloud/compute/v1/internal/common_144.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_145.proto b/protos/google/cloud/compute/v1/internal/common_145.proto index af60b813289a0..c31c22fecaa69 100644 --- a/protos/google/cloud/compute/v1/internal/common_145.proto +++ b/protos/google/cloud/compute/v1/internal/common_145.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_146.proto b/protos/google/cloud/compute/v1/internal/common_146.proto index bbbfd03d17725..3ea339907d256 100644 --- a/protos/google/cloud/compute/v1/internal/common_146.proto +++ b/protos/google/cloud/compute/v1/internal/common_146.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_147.proto b/protos/google/cloud/compute/v1/internal/common_147.proto index b5743ecf02c92..a68f0df981612 100644 --- a/protos/google/cloud/compute/v1/internal/common_147.proto +++ b/protos/google/cloud/compute/v1/internal/common_147.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_148.proto b/protos/google/cloud/compute/v1/internal/common_148.proto index 98b86882fb028..53df1bbf830f0 100644 --- a/protos/google/cloud/compute/v1/internal/common_148.proto +++ b/protos/google/cloud/compute/v1/internal/common_148.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_149.proto b/protos/google/cloud/compute/v1/internal/common_149.proto index a0de9325ae4bc..b402e427e3144 100644 --- a/protos/google/cloud/compute/v1/internal/common_149.proto +++ b/protos/google/cloud/compute/v1/internal/common_149.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_150.proto b/protos/google/cloud/compute/v1/internal/common_150.proto index 0839cda71bd3b..24faaa8bd1810 100644 --- a/protos/google/cloud/compute/v1/internal/common_150.proto +++ b/protos/google/cloud/compute/v1/internal/common_150.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_151.proto b/protos/google/cloud/compute/v1/internal/common_151.proto index 858e1f568bb43..a6e12d8b83769 100644 --- a/protos/google/cloud/compute/v1/internal/common_151.proto +++ b/protos/google/cloud/compute/v1/internal/common_151.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/v1/internal/common_152.proto b/protos/google/cloud/compute/v1/internal/common_152.proto index 61a0049298125..0e511ac9f6256 100644 --- a/protos/google/cloud/compute/v1/internal/common_152.proto +++ b/protos/google/cloud/compute/v1/internal/common_152.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/vpn_gateways/v1/vpn_gateways.proto b/protos/google/cloud/compute/vpn_gateways/v1/vpn_gateways.proto index 06c14ad44d240..85154a5477899 100644 --- a/protos/google/cloud/compute/vpn_gateways/v1/vpn_gateways.proto +++ b/protos/google/cloud/compute/vpn_gateways/v1/vpn_gateways.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.proto b/protos/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.proto index ddcb628f185cd..6a57613cc80c8 100644 --- a/protos/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.proto +++ b/protos/google/cloud/compute/vpn_tunnels/v1/vpn_tunnels.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/zone_operations/v1/zone_operations.proto b/protos/google/cloud/compute/zone_operations/v1/zone_operations.proto index 56ec4eef45567..62f83957efbc5 100644 --- a/protos/google/cloud/compute/zone_operations/v1/zone_operations.proto +++ b/protos/google/cloud/compute/zone_operations/v1/zone_operations.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/compute/zones/v1/zones.proto b/protos/google/cloud/compute/zones/v1/zones.proto index 1140672ffc0d7..2495518db2f3f 100644 --- a/protos/google/cloud/compute/zones/v1/zones.proto +++ b/protos/google/cloud/compute/zones/v1/zones.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/protos/google/cloud/spanner/testing/BUILD.bazel b/protos/google/cloud/spanner/testing/BUILD.bazel index 59fd7848c02f9..fe4766481f59f 100644 --- a/protos/google/cloud/spanner/testing/BUILD.bazel +++ b/protos/google/cloud/spanner/testing/BUILD.bazel @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") + package(default_visibility = ["//visibility:private"]) licenses(["notice"]) # Apache 2.0 diff --git a/protos/google/cloud/storage/tests/BUILD.bazel b/protos/google/cloud/storage/tests/BUILD.bazel index f3f70add7cbf2..4bb25803c5928 100644 --- a/protos/google/cloud/storage/tests/BUILD.bazel +++ b/protos/google/cloud/storage/tests/BUILD.bazel @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") + package(default_visibility = ["//visibility:private"]) licenses(["notice"]) # Apache 2.0